From 2a81761f7f6b431eb946d0e143e88df74ffbf059 Mon Sep 17 00:00:00 2001 From: Eugeny Date: Mon, 13 Nov 2023 04:05:05 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=82=D0=B5=D0=BD=D1=82=20?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=B4=D0=BD=D1=8E=20=D1=80=D0=BE=D0=B6=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Overlays/ShowHungerIconsSystem.cs | 2 +- .../Overlays/ShowSecurityIconsSystem.cs | 2 +- .../Overlays/ShowThirstIconsSystem.cs | 2 +- .../SSDIndicator/SSDIndicatorSystem.cs | 5 +- Content.Client/StatusIcon/StatusIconSystem.cs | 5 +- .../Components/StatusIconComponent.cs | 2 +- Resources/Changelog/ChangelogADT.yml | 18 +- .../ADT/Clothing/Hardsuits/Hardsuits.ftl | 8 + .../Locale/ru-RU/ADT/Clothing/Head/hats.ftl | 20 ++ .../ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl | 10 +- .../Objects/Decoration/birthday_balloons.ftl | 47 +++++ .../ru-RU/ADT/Objects/Fan/plushie_aidan.ftl | 8 + .../structuries/furniture/furniture.ftl | 32 +++ .../catalog/fills/crates/fun-crates.ftl | 4 + .../entities/clothing/underwear/Bottom.ftl | 68 +++--- .../adt/entities/clothing/underwear/Socks.ftl | 28 +-- .../adt/entities/clothing/underwear/Top.ftl | 44 ++-- .../structures/wallmounts/signs/posters.ftl | 24 +++ .../ADT/Catalog/Fills/Crates/fun.yml | 43 ++++ .../ADT/Entities/Clothing/Back/backpacks.yml | 10 +- .../ADT/Entities/Clothing/Belt/belts.yml | 6 +- .../Entities/Clothing/Hands/djah_rings.yml | 4 +- .../ADT/Entities/Clothing/Head/Hats/hats.yml | 62 ++++++ .../{ => Hardsuits}/Cybersun.yml | 0 .../{ => Hardsuits}/MogesSpecOps.yml | 0 .../OuterClothing/{ => Hardsuits}/cerber.yml | 0 .../{ => Hardsuits}/fem_syndie.yml | 0 .../{ => Hardsuits}/paramedic.yml | 0 .../Hardsuits/pioneer_hardsuit.yml | 33 +++ .../{ => Hardsuits}/saibasain.yml | 0 .../{ => Hardsuits}/veteransechardsuit.yml | 0 .../Entities/Clothing/Underwear/Bottom.yml | 2 +- .../ADT/Entities/Clothing/Underwear/Socks.yml | 2 +- .../ADT/Entities/Clothing/Underwear/Top.yml | 2 +- .../Entities/Clothing/Uniforms/Jumpskirt.yml | 11 + .../ADT/Entities/Objects/Fun/athletics.yml | 24 +-- .../ADT/Entities/Objects/Fun/toys.yml | 22 +- .../ADT/Entities/Objects/Misc/Hyppo.yml | 1 + .../ADT/Entities/Objects/Misc/barspoon.yml | 1 + .../ADT/Entities/Objects/Misc/bath_broom.yml | 2 +- .../ADT/Entities/Objects/Misc/glass_jug.yml | 2 +- .../Objects/Misc/halloween_candy_bowl.yml | 2 +- .../ADT/Entities/Objects/Misc/iron_tray.yml | 2 +- .../ADT/Entities/Objects/Misc/jigger.yml | 2 + .../Entities/Objects/Misc/mixing_glass.yml | 2 +- .../Objects/Misc/new_recipes_book.yml | 4 + .../Objects/Specific/Medical/combathypo.yml | 1 + .../ADT/Entities/Objects/Specific/cross.yml | 6 +- .../Entities/Objects/Specific/cyberhypo.yml | 1 + .../ADT/Entities/Objects/Specific/perfume.yml | 3 +- .../ADT/Entities/Objects/Tools/Tools.yml | 3 + .../Entities/Objects/Tools/UrogCrowbar.yml | 2 +- .../Guns/Ammunition/Boxes/muchhurt.yml | 2 +- .../Guns/Ammunition/Magazines/dartgun.yml | 2 +- .../Guns/Ammunition/Speedloader/muchhurt.yml | 2 + .../Weapons/Guns/Battery/battery_gun.yml | 2 + .../Objects/Weapons/Guns/Revolvers/Unica.yml | 2 +- .../Objects/Weapons/Guns/Rifels/abakan.yml | 4 +- .../Objects/Weapons/Melee/AstraKnife.yml | 2 +- .../Objects/Weapons/Melee/KiiravaSword.yml | 2 +- .../Entities/Objects/Weapons/Melee/Sabre.yml | 4 +- .../Entities/Objects/Weapons/Melee/Swords.yml | 6 +- .../Objects/Weapons/Melee/bouquets.yml | 12 +- .../Objects/Weapons/Melee/folding_knife.yml | 2 +- .../Objects/Weapons/Melee/jaystunbaton.yml | 2 +- .../Objects/Weapons/Melee/pyotr_sabre.yml | 2 +- .../Objects/Weapons/Melee/warhammer.yml | 2 +- .../Structures/Furniture/blackchair.yml | 57 ++++++ .../Structures/Furniture/oneyearbirthday.yml | 143 +++++++++++++ .../Structures/Furniture/roundtable.yml | 140 +++++++++++++ .../Entities/Structures/Furniture/table.yml | 193 ++++++++++++++++++ .../Structures/Wallmount/Signs/posters.yml | 149 ++++++++++++++ .../Recipes/Construction/Graph/adtstool.yml | 56 +++++ .../Recipes/Construction/Graph/adttable.yml | 84 ++++++++ .../Recipes/Construction/Graph/discoball.yml | 27 +++ .../Recipes/Construction/Graph/fireplace.yml | 27 +++ .../Recipes/Construction/Graph/roundtable.yml | 69 +++++++ .../ADT/Recipes/Construction/furniture.yml | 170 +++++++++++++++ .../ADT/Roles/Jobs/Magistrate/Magistrate.yml | 2 + .../Catalog/Fills/Crates/security.yml | 2 +- .../Catalog/Fills/Items/toolboxes.yml | 6 +- .../Catalog/Fills/Lockers/heads.yml | 2 + .../Fills/Backpacks/StarterGear/backpack.yml | 7 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 10 +- .../Fills/Backpacks/StarterGear/satchel.yml | 14 +- .../Corvax/Catalog/Fills/Items/briefcases.yml | 4 +- .../Corvax/Roles/Jobs/Command/iaa.yml | 2 + .../Markers/Spawners/Random/posters.yml | 15 +- .../Consumable/Drinks/drinks_flasks.yml | 4 +- .../Objects/Specific/Janitorial/soap.yml | 1 + .../Entities/Objects/Tools/toolbox.yml | 2 +- .../Structures/Decoration/fireplace.yml | 3 + Resources/Prototypes/Reagents/cleaning.yml | 3 + .../pioneeragenthelmet.rsi/icon-flash.png | Bin 0 -> 499 bytes .../Hardsuits/pioneeragenthelmet.rsi/icon.png | Bin 0 -> 499 bytes .../pioneeragenthelmet.rsi/meta.json | 25 +++ .../off-equipped-HELMET.png | Bin 0 -> 1245 bytes .../on-equipped-HELMET.png | Bin 0 -> 1245 bytes .../bluebirthdaycap.rsi/equipped-HELMET.png | Bin 0 -> 413 bytes .../Head/Hats/bluebirthdaycap.rsi/icon.png | Bin 0 -> 426 bytes .../Head/Hats/bluebirthdaycap.rsi/meta.json | 18 ++ .../graybirthdaycap.rsi/equipped-HELMET.png | Bin 0 -> 377 bytes .../Head/Hats/graybirthdaycap.rsi/icon.png | Bin 0 -> 390 bytes .../Head/Hats/graybirthdaycap.rsi/meta.json | 18 ++ .../ntbirthdaycap.rsi/equipped-HELMET.png | Bin 0 -> 354 bytes .../Head/Hats/ntbirthdaycap.rsi/icon.png | Bin 0 -> 503 bytes .../Head/Hats/ntbirthdaycap.rsi/meta.json | 18 ++ .../pinkbirthdaycap.rsi/equipped-HELMET.png | Bin 0 -> 386 bytes .../Head/Hats/pinkbirthdaycap.rsi/icon.png | Bin 0 -> 418 bytes .../Head/Hats/pinkbirthdaycap.rsi/meta.json | 18 ++ .../syndiebirthdaycap.rsi/equipped-HELMET.png | Bin 0 -> 294 bytes .../Head/Hats/syndiebirthdaycap.rsi/icon.png | Bin 0 -> 482 bytes .../Head/Hats/syndiebirthdaycap.rsi/meta.json | 18 ++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 3891 bytes .../Hardsuits/pioneeragent.rsi/icon.png | Bin 0 -> 1264 bytes .../pioneeragent.rsi/inhand-left.png | Bin 0 -> 931 bytes .../pioneeragent.rsi/inhand-right.png | Bin 0 -> 893 bytes .../Hardsuits/pioneeragent.rsi/meta.json | 26 +++ .../equipped-INNERCLOTHING.png | Bin 0 -> 796 bytes .../Jumpskirt/captainswimsuit.rsi/icon.png | Bin 0 -> 362 bytes .../Jumpskirt/captainswimsuit.rsi/meta.json | 18 ++ .../Decoration/passthebanana.rsi/meta.json | 27 +++ .../passthebanana.rsi/passthebanana.png | Bin 0 -> 3862 bytes .../poster_oneyearbirthday.rsi/meta.json | 23 +++ .../poster_oneyearbirthday.rsi/poster1.png | Bin 0 -> 1307 bytes .../poster_oneyearbirthday.rsi/poster2.png | Bin 0 -> 1428 bytes .../poster_oneyearbirthday.rsi/poster3.png | Bin 0 -> 722 bytes .../poster_oneyearbirthday.rsi/poster4.png | Bin 0 -> 818 bytes .../triangles_birthday.rsi/meta.json | 29 +++ .../triangles_birthday.rsi/pbcenter.png | Bin 0 -> 689 bytes .../triangles_birthday.rsi/pbleft.png | Bin 0 -> 248 bytes .../triangles_birthday.rsi/pbright.png | Bin 0 -> 248 bytes .../triangles_birthday.rsi/rycenter.png | Bin 0 -> 673 bytes .../triangles_birthday.rsi/ryleft.png | Bin 0 -> 236 bytes .../triangles_birthday.rsi/ryright.png | Bin 0 -> 253 bytes .../ADT/Objects/Fun/toys.rsi/meta.json | 6 + .../Objects/Fun/toys.rsi/plushie_amira.png | Bin 0 -> 994 bytes .../ADT/Objects/Fun/toys.rsi/plushie_ovai.png | Bin 0 -> 950 bytes .../birthday_balloon.rsi/bal1-inhand-left.png | Bin 0 -> 629 bytes .../bal1-inhand-right.png | Bin 0 -> 603 bytes .../birthday_balloon.rsi/bal2-inhand-left.png | Bin 0 -> 634 bytes .../bal2-inhand-right.png | Bin 0 -> 614 bytes .../birthday_balloon.rsi/bal3-inhand-left.png | Bin 0 -> 653 bytes .../bal3-inhand-right.png | Bin 0 -> 617 bytes .../birthday_balloon.rsi/bal4-inhand-left.png | Bin 0 -> 656 bytes .../bal4-inhand-right.png | Bin 0 -> 625 bytes .../birthday_balloon.rsi/bal5-inhand-left.png | Bin 0 -> 675 bytes .../bal5-inhand-right.png | Bin 0 -> 642 bytes .../birthday_balloon.rsi/balloon1.png | Bin 0 -> 324 bytes .../birthday_balloon.rsi/balloon2.png | Bin 0 -> 339 bytes .../birthday_balloon.rsi/balloon3.png | Bin 0 -> 340 bytes .../birthday_balloon.rsi/balloon4.png | Bin 0 -> 342 bytes .../birthday_balloon.rsi/balloon5.png | Bin 0 -> 356 bytes .../Decoration/birthday_balloon.rsi/meta.json | 56 +++++ .../Decoration/discoball.rsi/discoball.png | Bin 0 -> 3772 bytes .../Decoration/discoball.rsi/meta.json | 22 ++ .../Furniture/pizzeria_stool.rsi/icon.png | Bin 0 -> 1152 bytes .../Furniture/pizzeria_stool.rsi/meta.json | 16 ++ .../Furniture/red_stool.rsi/icon.png | Bin 0 -> 1515 bytes .../Furniture/red_stool.rsi/meta.json | 16 ++ .../Furniture/red_wood_table.rsi/full.png | Bin 0 -> 431 bytes .../Furniture/red_wood_table.rsi/meta.json | 46 +++++ .../Furniture/red_wood_table.rsi/state_0.png | Bin 0 -> 660 bytes .../Furniture/red_wood_table.rsi/state_1.png | Bin 0 -> 314 bytes .../Furniture/red_wood_table.rsi/state_2.png | Bin 0 -> 660 bytes .../Furniture/red_wood_table.rsi/state_3.png | Bin 0 -> 314 bytes .../Furniture/red_wood_table.rsi/state_4.png | Bin 0 -> 318 bytes .../Furniture/red_wood_table.rsi/state_5.png | Bin 0 -> 355 bytes .../Furniture/red_wood_table.rsi/state_6.png | Bin 0 -> 318 bytes .../Furniture/red_wood_table.rsi/state_7.png | Bin 0 -> 255 bytes .../Furniture/roundtable.rsi/meta.json | 21 ++ .../Furniture/roundtable.rsi/round_glass.png | Bin 0 -> 562 bytes .../roundtable.rsi/round_plastic.png | Bin 0 -> 551 bytes .../Furniture/roundtable.rsi/round_wood.png | Bin 0 -> 455 bytes .../Furniture/white_stool.rsi/icon.png | Bin 0 -> 1704 bytes .../Furniture/white_stool.rsi/meta.json | 16 ++ .../Furniture/white_wood_table.rsi/full.png | Bin 0 -> 421 bytes .../Furniture/white_wood_table.rsi/meta.json | 46 +++++ .../white_wood_table.rsi/state_0.png | Bin 0 -> 708 bytes .../white_wood_table.rsi/state_1.png | Bin 0 -> 306 bytes .../white_wood_table.rsi/state_2.png | Bin 0 -> 708 bytes .../white_wood_table.rsi/state_3.png | Bin 0 -> 306 bytes .../white_wood_table.rsi/state_4.png | Bin 0 -> 312 bytes .../white_wood_table.rsi/state_5.png | Bin 0 -> 344 bytes .../white_wood_table.rsi/state_6.png | Bin 0 -> 312 bytes .../white_wood_table.rsi/state_7.png | Bin 0 -> 256 bytes .../Wallmounts/posters.rsi/meta.json | 6 + .../poster_adtlustuma_contraband.png | Bin 0 -> 1200 bytes .../poster_efficiencydiagram_legit.png | Bin 0 -> 621 bytes 189 files changed, 2143 insertions(+), 170 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Decoration/birthday_balloons.ftl rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/Cybersun.yml (100%) rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/MogesSpecOps.yml (100%) rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/cerber.yml (100%) rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/fem_syndie.yml (100%) rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/paramedic.yml (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/saibasain.yml (100%) rename Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/{ => Hardsuits}/veteransechardsuit.yml (100%) create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/oneyearbirthday.yml create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml create mode 100644 Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/adtstool.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/adttable.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/discoball.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/fireplace.yml create mode 100644 Resources/Prototypes/ADT/Recipes/Construction/Graph/roundtable.yml create mode 100644 Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/icon-flash.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/on-equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/meta.json create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/passthebanana.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster1.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster2.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster3.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster4.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbcenter.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbleft.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbright.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/rycenter.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/ryleft.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/ryright.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_amira.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_ovai.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal1-inhand-left.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal1-inhand-right.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal2-inhand-left.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal2-inhand-right.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal3-inhand-left.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal3-inhand-right.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal4-inhand-left.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal4-inhand-right.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal5-inhand-left.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal5-inhand-right.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon1.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon2.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon3.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon4.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon5.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Decoration/discoball.rsi/discoball.png create mode 100644 Resources/Textures/ADT/Structures/Decoration/discoball.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/pizzeria_stool.rsi/icon.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/pizzeria_stool.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_stool.rsi/icon.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_stool.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/full.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_0.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_1.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_2.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_3.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_4.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_5.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_6.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_7.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_glass.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_plastic.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_wood.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_stool.rsi/icon.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_stool.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/full.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/meta.json create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_0.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_1.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_2.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_3.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_4.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_5.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_6.png create mode 100644 Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_7.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster_adtlustuma_contraband.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster_efficiencydiagram_legit.png diff --git a/Content.Client/Overlays/ShowHungerIconsSystem.cs b/Content.Client/Overlays/ShowHungerIconsSystem.cs index 0182a08678b..27aaa1ef801 100644 --- a/Content.Client/Overlays/ShowHungerIconsSystem.cs +++ b/Content.Client/Overlays/ShowHungerIconsSystem.cs @@ -19,7 +19,7 @@ public override void Initialize() private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent hungerComponent, ref GetStatusIconsEvent args) { - if (!IsActive || args.InContainer) + if (!IsActive || args.InContainer || args.HasStealthComponent) return; var healthIcons = DecideHungerIcon(uid, hungerComponent); diff --git a/Content.Client/Overlays/ShowSecurityIconsSystem.cs b/Content.Client/Overlays/ShowSecurityIconsSystem.cs index cbf8044a60f..73cfa219e18 100644 --- a/Content.Client/Overlays/ShowSecurityIconsSystem.cs +++ b/Content.Client/Overlays/ShowSecurityIconsSystem.cs @@ -24,7 +24,7 @@ public override void Initialize() private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent @event) { - if (!IsActive || @event.InContainer) + if (!IsActive || @event.InContainer || @event.HasStealthComponent) { return; } diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs index 89bc5029ba9..fb6f9ddc089 100644 --- a/Content.Client/Overlays/ShowThirstIconsSystem.cs +++ b/Content.Client/Overlays/ShowThirstIconsSystem.cs @@ -19,7 +19,7 @@ public override void Initialize() private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent thirstComponent, ref GetStatusIconsEvent args) { - if (!IsActive || args.InContainer) + if (!IsActive || args.InContainer || args.HasStealthComponent) return; var healthIcons = DecideThirstIcon(uid, thirstComponent); diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs index f30d5650613..93a131a3166 100644 --- a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs +++ b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.CCVar; +using Content.Shared.CCVar; using Content.Shared.SSDIndicator; using Content.Shared.StatusIcon; using Content.Shared.StatusIcon.Components; @@ -26,7 +26,8 @@ private void OnGetStatusIcon(EntityUid uid, SSDIndicatorComponent component, ref { if (!component.IsSSD || !_cfg.GetCVar(CCVars.ICShowSSDIndicator) || - args.InContainer) + args.InContainer || + args.HasStealthComponent) return; args.StatusIcons.Add(_prototype.Index(component.Icon)); diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs index bd708b63d01..0a1cf9555be 100644 --- a/Content.Client/StatusIcon/StatusIconSystem.cs +++ b/Content.Client/StatusIcon/StatusIconSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.CCVar; using Content.Shared.StatusIcon; using Content.Shared.StatusIcon.Components; +using Content.Shared.Stealth.Components; using Robust.Client.Graphics; using Robust.Shared.Configuration; @@ -13,6 +14,7 @@ public sealed class StatusIconSystem : SharedStatusIconSystem { [Dependency] private readonly IConfigurationManager _configuration = default!; [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private readonly IEntityManager _entManager = default!; private bool _globalEnabled; private bool _localEnabled; @@ -63,7 +65,8 @@ public List GetStatusIcons(EntityUid uid, MetaDataComponent? met return list; var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0; - var ev = new GetStatusIconsEvent(list, inContainer); + var hasStealthComponent = _entManager.HasComponent(uid); + var ev = new GetStatusIconsEvent(list, inContainer, hasStealthComponent); RaiseLocalEvent(uid, ref ev); return ev.StatusIcons; } diff --git a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs index 9efe9731c8b..6a0e94ecea5 100644 --- a/Content.Shared/StatusIcon/Components/StatusIconComponent.cs +++ b/Content.Shared/StatusIcon/Components/StatusIconComponent.cs @@ -24,4 +24,4 @@ public sealed partial class StatusIconComponent : Component /// /// [ByRefEvent] -public record struct GetStatusIconsEvent(List StatusIcons, bool InContainer); +public record struct GetStatusIconsEvent(List StatusIcons, bool InContainer, bool HasStealthComponent); diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index cd6a47355c5..3745b6faf49 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -537,7 +537,7 @@ Entries: changes: - {message: Добавил отображение текста над головой при использовании LOOC чата., type: Add} - {message: Добавил локализацию некоторым мед. препаратам., type: Add} - id: 55603 #костыль отображения в Обновлениях + id: 55604 #костыль отображения в Обновлениях time: '2023-11-09T04:20:00.0000000+00:00' - author: Шрёдингер @@ -547,3 +547,19 @@ Entries: id: 55605 #костыль отображения в Обновлениях time: '2023-11-10T04:20:00.0000000+00:00' +- author: Петр Игнатьевич + changes: + - {message: Фикс размеров и вместимости некоторых вещей., type: Fix} + - {message: Фикс локализации белья., type: Fix} + - {message: Добавлены игрушки Амиры и Овая., type: Add} + - {message: Добавлен закрытый купальник капитана (Шиззи. господи..)., type: Add} + - {message: Добавлен диско-шар., type: Add} + - {message: Добавлен декор к предстоящему дню рождению сервера., type: Add} + - {message: Добавлен скафандр Агента "Пионер"., type: Add} + - {message: Убран КПК бригмедика из ящика с заказом экипировки бригмедика., type: Fix} + - {message: Добавлен плакат Pass the banana down., type: Add} + - {message: Добавлены круглые столики от Иллюми и крафт для них., type: Add} + - {message: Добавлены цветные деревянные столы и крафт для них и прочая мебель., type: Add} + - {message: Добавлена возможность постройки камина., type: Add} + id: 55606 #костыль отображения в Обновлениях + time: '2023-11-13T04:20:00.0000000+00:00' diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Hardsuits/Hardsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Hardsuits/Hardsuits.ftl index 1460096ce87..2b8d81371e4 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Hardsuits/Hardsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Hardsuits/Hardsuits.ftl @@ -45,3 +45,11 @@ ent-ADTClothingOuterParamedicVoidHardsuit = скафандр парамедик ent-ADTClothingHeadHelmetParamedicVoid = шлем скафандра парамедика .desc = Шлем улучшенной версии скафандра парамедика. Имеет встроенный фонарик и слабую степень защиты. .suffix = { "" } + +ent-ADTClothingOuterHardsuitPioneerAgent = боевой скафандр агента "Пионер" + .desc = Специальный защитный скафандр на основе скафандра командира отряда быстрого реагирования NanoTrasen. Создан в единственном экземпляре для специального агента КиберСан. + .suffix = { "" } + +ent-ADTClothingHeadHelmetHardsuitPioneerAgent = шлем скафандра агента "Пионер" + .desc = Хорошо защищенный шлем, созданный на основе шлема командира ОБР для специального агента КиберСан. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl index 52b43cb8b89..e85e4472449 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Head/hats.ftl @@ -64,3 +64,23 @@ ent-ADTClothingHeadPovar = Поварской колпак-берет шеф-п ent-ADTClothingHeadHelmetHungerGamesCapitols = Шлем Капитолия .desc = Шлем компании "Космических Голодных Игр". + +ent-ADTClothingHeadHatsNTCap = колпак NT + .desc = Сегодня официальный день, раз колпак теперь в твоих руках. + .suffix = { "День рождения сервера" } + +ent-ADTClothingHeadHatsBlueCap = синий колпак + .desc = Этой вечеринки не хватает синих волн! + .suffix = { "День рождения сервера" } + +ent-ADTClothingHeadHatsGrayCap = серый колпак + .desc = Они не знают на сколько сегодня ты сер на празднике. + .suffix = { "День рождения сервера" } + +ent-ADTClothingHeadHatsPinkCap = розовый колпак + .desc = Этот колпак носит милая мордочка! + .suffix = { "День рождения сервера" } + +ent-ADTClothingHeadHatsSyndieCap = синди колпак + .desc = Разве с таким колпаком нужно приглашение на праздник? + .suffix = { "День рождения сервера" } diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl index 2501b41ffdf..b51b94b30d3 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/jumpsuits.ftl @@ -193,32 +193,28 @@ ent-ADTJumpskirtSwimwearYellow = желтый купальник ent-ADTJumpsuitAnarchyTshirt = черная футболка с символикой анархизма .desc = "Анархия-мама сынов своих любит, Анархия-мама не продаст, Свинцовым дождём врага приголубит, Анархия-мама - за нас!" - .suffix = { "" } ent-ADTJumpsuitDenimPants = джинсовые штаны .desc = Брюки из джинсовой ткани. - .suffix = { "" } ent-ADTJumpsuitDenim = джинсовый комбинезон .desc = Классический джинсовый полукомбинезон на лямках. Производства компании "Modeling Agency Dar-Vaxed". - .suffix = { "" } ent-ADTJumpsuitCamouflageTshirt = камуфляжная футболка .desc = Обычные футболка и брюки зеленой камуфляжной расцветки. - .suffix = { "" } ent-ADTJumpsuitCamouflageTshirtDesert = пустынная камуфляжная футболка .desc = Обычные футболка и брюки пустынной камуфляжной расцветки. Верните себе 2003 год! - .suffix = { "" } ent-ADTJumpsuitSerious = серьезная форма .desc = Серая футболка, черные джинсы - выглядит серьезно, грубо и круто! - .suffix = { "" } ent-ADTJumpskirtBlackShortDress = чёрное короткое платье .desc = Легкое платье с открытой спиной из чёрной шелковой ткани с золотыми лентами, для элегантных распутных дам. Производство компании "Modeling Agency Dar-Vaxed". - .suffix = { "" } ent-ADTClothingUniformJumpsuitHungerGames = Комбинезон Капитолия .desc = Комбинезон компании "Космических Голодных Игр". + +ent-ADTSwimsuitCap = капитанский купальник + .desc = Только не выходите в этом перед проверяющими с ЦК. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/Objects/Decoration/birthday_balloons.ftl b/Resources/Locale/ru-RU/ADT/Objects/Decoration/birthday_balloons.ftl new file mode 100644 index 00000000000..2c669af5a13 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Decoration/birthday_balloons.ftl @@ -0,0 +1,47 @@ +ent-ADTBirthDayBalloon1 = воздушный шарик "1" + .desc = Часть комплекта шариков, посвященных дню рождения проекта. + .suffix = { "День рождения сервера" } + +ent-ADTBirthDayBalloon2 = воздушный шарик "Y" + .desc = Часть комплекта шариков, посвященных дню рождения проекта. + .suffix = { "День рождения сервера" } + +ent-ADTBirthDayBalloon3 = воздушный шарик "E" + .desc = Часть комплекта шариков, посвященных дню рождения проекта. + .suffix = { "День рождения сервера" } + +ent-ADTBirthDayBalloon4 = воздушный шарик "A" + .desc = Часть комплекта шариков, посвященных дню рождения проекта. + .suffix = { "День рождения сервера" } + +ent-ADTBirthDayBalloon5 = воздушный шарик "R" + .desc = Часть комплекта шариков, посвященных дню рождения проекта. + .suffix = { "День рождения сервера" } + +ent-ADTDiscoBall = диско-шар + .desc = Возвращает атмосферу вечеринок 2470-х. + .suffix = { "День рождения сервера" } + +ent-ADTBirhtdayTrianglesPB1 = сине-фиолетовые флажки + .desc = Украшение в виде флажков. + .suffix = { "День рождения сервера" } + +ent-ADTBirhtdayTrianglesPB2 = сине-фиолетовые флажки + .desc = Украшение в виде флажков. + .suffix = { "День рождения сервера" } + +ent-ADTBirhtdayTrianglesPB3 = сине-фиолетовые флажки + .desc = Украшение в виде флажков. + .suffix = { "День рождения сервера" } + +ent-ADTBirhtdayTrianglesRY1 = красно-желтые флажки + .desc = Украшение в виде флажков. + .suffix = { "День рождения сервера" } + +ent-ADTBirhtdayTrianglesRY2 = красно-желтые флажки + .desc = Украшение в виде флажков. + .suffix = { "День рождения сервера" } + +ent-ADTBirhtdayTrianglesRY3 = красно-желтые флажки + .desc = Украшение в виде флажков. + .suffix = { "День рождения сервера" } diff --git a/Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl b/Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl index 61f48525cb4..d094152889d 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl @@ -113,3 +113,11 @@ ent-ADTPlushieUma = Ума ent-ADTPlushieTimrika = Тимрика .desc = На вид мягкая, милая и шерстяная таяранка! Однако рисунки костей имеют свою историю. .suffix = { "" } + +ent-ADTPlushieAmira = Амира + .desc = На вид мягкая и милая научный руководитель. + .suffix = { "" } + +ent-ADTPlushieOvai = Овай + .desc = На вид мягкий и милый ящер-атмос. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ADT/Objects/structuries/furniture/furniture.ftl b/Resources/Locale/ru-RU/ADT/Objects/structuries/furniture/furniture.ftl index 6c549762ce7..11e2faa1908 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/structuries/furniture/furniture.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/structuries/furniture/furniture.ftl @@ -96,3 +96,35 @@ ent-ADTTableOktoberfestOrange = стол с оранжевой скатерть ent-ADTOktoberfestChair = роскошный праздничный стул .suffix = Октоберфест .desc = Комфортнейший стул для празндика пива. + +ent-ADTRoundTablePlastic = пластиковый круглый столик + .desc = Хорошо подойдет для маленького кафе. + .suffix = { "День рождения сервера" } + +ent-ADTRoundTableWood = деревянный круглый столик + .desc = Хорошо подойдет для маленького кафе. + .suffix = { "День рождения сервера" } + +ent-ADTRoundTableGlass = стеклянный круглый столик + .desc = Хорошо подойдет для маленького кафе. + .suffix = { "День рождения сервера" } + +ent-ADTPizzeriaStool = черный стул для пиццерии + .desc = Хорошо подойдет для маленького кафе. + .suffix = { "День рождения сервера" } + +ent-ADTRedStool = красный деревянный стул + .desc = Хорошо подойдет для маленького кафе. + .suffix = { "День рождения сервера" } + +ent-ADTWhiteStool = белый деревянный стул + .desc = Хорошо подойдет для маленького кафе. + .suffix = { "День рождения сервера" } + +ent-ADTRedTable = красный деревянный стол + .desc = Деревянный стол с красивой скатертью. + .suffix = { "День рождения сервера" } + +ent-ADTWhiteTable = белый деревянный стол + .desc = Деревянный стол с красивой скатертью. + .suffix = { "День рождения сервера" } diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl index 9be6db35856..c171c599057 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/fun-crates.ftl @@ -34,3 +34,7 @@ ent-CrateFunBikeHornImplants = ящик хонк-имплантов .desc = Тысяча гудков за день отпугнёт СБ на день! ent-CrateFunMysteryFigurines = ящик минифигурок Загадочные космонавты .desc = Коллекция из 10 коробок загадочных минифигурок. Дубликаты возврату не подлежат. + +ent-ADTCrateBirthdayParty = набор для дня рождения сервера + .desc = Набор к вечеринке, посвященной одному году "Времени Приключений". + .suffix = { "День рождения сервера" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Bottom.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Bottom.ftl index 2505a7b1f8a..f58020ddce7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Bottom.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Bottom.ftl @@ -1,34 +1,34 @@ -ent-ClothingUnderwearBottomBase = based underwearb - .desc = You should not see this. If you see it, let Neko Dar#8948 know. -ent-ClothingUnderwearBottomPantiesWhite = panties - .desc = Standard Nanotrasen underwear for station female employees. Painted white. -ent-ClothingUnderwearBottomBoxersWhite = boxers - .desc = Standard Nanotrasen underwear for station employees. Dyed white. -ent-ClothingUnderwearBottomBoxersCap = captain's boxers - .desc = Standard station captain's underwear. -ent-ClothingUnderwearBottomBoxersCE = chief engineer's boxers - .desc = Standard station chief engineer underwear. -ent-ClothingUnderwearBottomBoxersCMO = chief medical officer's boxers - .desc = Standard station chief physician's underwear. For some reason they smell like chloral hydrate... -ent-ClothingUnderwearBottomBoxersHOP = head of personnel's boxers - .desc = The standard underwear of the station's chief of staff. -ent-ClothingUnderwearBottomBoxersHOS = head of security's boxers - .desc = Standard station head of security underwear. -ent-ClothingUnderwearBottomBoxersQM = quartermaster's boxers - .desc = Standard station quartermaster underwear. -ent-ClothingUnderwearBottomBoxersRD = research director's boxers - .desc = Standard research director's underwear. -ent-ClothingUnderwearBottomPantiesCap = captain's panties - .desc = Standard station captain underwear. -ent-ClothingUnderwearBottomPantiesCE = chief engineer's panties - .desc = Standard station chief engineer underwear. -ent-ClothingUnderwearBottomPantiesCMO = chief medical officer's panties - .desc = Standard station chief physician's underwear. For some reason they smell like chloral hydrate... -ent-ClothingUnderwearBottomPantiesHOP = head of personnel's panties - .desc = The standard underwear of the station's chief of staff. -ent-ClothingUnderwearBottomPantiesHOS = head of security's panties - .desc = Standard station head of security underwear. -ent-ClothingUnderwearBottomPantiesQM = quartermaster's panties - .desc = Standard station quartermaster underwear. -ent-ClothingUnderwearBottomPantiesRD = research director's panties - .desc = Standard research director's underwear. +ent-ClothingUnderwearBottomBase = базовые трусы + .desc = Вы не должны видеть их. Если вы их видите - дайте знать Neko Dar#8948. +ent-ClothingUnderwearBottomPantiesWhite = трусики + .desc = Стандартное нижнее белье для работниц NanoTrasen. Белого цвета. +ent-ClothingUnderwearBottomBoxersWhite = боксеры + .desc = Стандартное нижнее белье для работников NanoTrasen. Белого цвета. +ent-ClothingUnderwearBottomBoxersCap = капитанские боксеры + .desc = Стандартные боксеры капитана. +ent-ClothingUnderwearBottomBoxersCE = боксеры старшего инженера + .desc = Стандартные боксеры старшого инженера. +ent-ClothingUnderwearBottomBoxersCMO = боксеры главного врача + .desc = Стандартные боксеры главного врача. Почему-то пахнут хлоральгидратом. +ent-ClothingUnderwearBottomBoxersHOP = боксеры главы персонала + .desc = Стандартные боксеры главы персонала. +ent-ClothingUnderwearBottomBoxersHOS = боксеры главы службы безопасности + .desc = Стандартные боксеры главы службы безованости. +ent-ClothingUnderwearBottomBoxersQM = боксеры квартермейстера + .desc = Стандартные боксеры квартермейстера. Из-за цвета являются предметом шуток среди командования. +ent-ClothingUnderwearBottomBoxersRD = боксеры научного руководителя + .desc = Стандартные боксеры научного руководителя. +ent-ClothingUnderwearBottomPantiesCap = трусики капитана + .desc = Стандартные трусики капитана. +ent-ClothingUnderwearBottomPantiesCE = трусики старшего инженера + .desc = Стандартные трусики старшего инженера. +ent-ClothingUnderwearBottomPantiesCMO = трусики главного врача + .desc = Стандартные трусики главного врача. Почему-то пахнут хлорьальгидратом. +ent-ClothingUnderwearBottomPantiesHOP = трусики главы персонала + .desc = Стандартные трусики главы персонала. +ent-ClothingUnderwearBottomPantiesHOS = трусики главы службы безопасности + .desc = Стандартные трусики главы службы безопасности. +ent-ClothingUnderwearBottomPantiesQM = трусики квартермейстера + .desc = Стандартные трусики квартермейстера. +ent-ClothingUnderwearBottomPantiesRD = трусики научного руководителя + .desc = Стандартные трусики научного руководителя. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Socks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Socks.ftl index d13b57838a9..ff2b5a0b57b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Socks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Socks.ftl @@ -1,14 +1,14 @@ -ent-ClothingUnderwearSocksBase = based socks - .desc = You should not see this. If you see it, let Neko Dar#8948 know. -ent-ClothingUnderwearSocksHigh = high socks - .desc = Nanotrasen high socks for station employees. Painted white. -ent-ClothingUnderSocksBee = bee socks - .desc = Make them loins buzz! -ent-ClothingUnderSocksCoder = coder socks - .desc = It's time to code sisters!!11! -ent-ClothingUnderwearSocksNormal = socks - .desc = Standard Nanotrasen socks for station employees. Dyed white. -ent-ClothingUnderwearSocksShort = short socks - .desc = Nanotrasen short socks for station employees. Dyed white. -ent-ClothingUnderwearSocksThigh = stockings - .desc = Standard Nanotrasen stockings for station employees. Dyed white. +ent-ClothingUnderwearSocksBase = носки + .desc = Стандартные носки для работников NanoTrasen. Белого цвета. +ent-ClothingUnderwearSocksHigh = высокие носки + .desc = Стандартные высокие носки для работников NanoTrasen. Белого цвета. +ent-ClothingUnderSocksBee = пчелиные носки + .desc = Заставьте их жужжать! +ent-ClothingUnderSocksCoder = чулки программиста + .desc = Время кодить, сестры!!11! +ent-ClothingUnderwearSocksNormal = носки + .desc = Стандартные носки для работников NanoTrasen. Белого цвета. +ent-ClothingUnderwearSocksShort = короткие носки + .desc = Стандартные короткие носки для работников NanoTrasen. Белого цвета. +ent-ClothingUnderwearSocksThigh = чулки + .desc = Стандартные чулки для работников NanoTrasen. Белого цвета. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Top.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Top.ftl index c548aa1b6ab..bd25d479dcc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Top.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/adt/entities/clothing/underwear/Top.ftl @@ -1,22 +1,22 @@ -ent-ClothingUnderwearTopBase = based underweart - .desc = You should not see this. If you see it, let Neko Dar#8948 know. -ent-ClothingUnderwearTopBraWhite = bra - .desc = Standard Nanotrasen bra for station staff. Painted white. -ent-ClothingUnderwearTopBraSports = sports bra - .desc = Sports bra. Painted white. -ent-ClothingUnderwearTopBraSportsAlternative = alternative sports bra - .desc = Sports bra. Alternate version. Painted white. -ent-ClothingUnderwearTopBraCap = captain's bra - .desc = Standard station captain's underwear. -ent-ClothingUnderwearTopBraCE = chief engineer's bra - .desc = Standard station chief engineer's underwear. -ent-ClothingUnderwearTopBraCMO = chief medical officer's bra - .desc = Standard underwear of the station chief medical officer. For some reason it smells like chloral hydrate... -ent-ClothingUnderwearTopBraHOP = head of personnel's bra - .desc = The standard underwear of the station's chief of staff. -ent-ClothingUnderwearTopBraHOS = head of security's bra - .desc = Standard underwear of the station's head of security. -ent-ClothingUnderwearTopBraQM = quartermaster's bra - .desc = Standard station quartermaster underwear. -ent-ClothingUnderwearTopBraRD = research director's bra - .desc = Standard research director's underwear. +ent-ClothingUnderwearTopBase = базовое нижнее белье + .desc = Вы не должны видеть этот предмет. Если увидели - дайте знать Neko Dar#8948. +ent-ClothingUnderwearTopBraWhite = бра + .desc = Стандартное бра для работниц NanoTrasen. Белого цвета. +ent-ClothingUnderwearTopBraSports = спортивное бра + .desc = Спортивное бра. Белого цвета. +ent-ClothingUnderwearTopBraSportsAlternative = альтернативное спортивное бра + .desc = Спортивное бра. Альтернативный вариант. Белого цвета. +ent-ClothingUnderwearTopBraCap = капитанское бра + .desc = Стандартное бра капитанов станций. +ent-ClothingUnderwearTopBraCE = бра старшего инженера + .desc = Стандартное бра старших инженеров. +ent-ClothingUnderwearTopBraCMO = бра главного врача + .desc = Стандартное бра главного врача. Почему-то пахнет хлоральгидратом. +ent-ClothingUnderwearTopBraHOP = бра главы персонала + .desc = Стандартное бра главы персонала. +ent-ClothingUnderwearTopBraHOS = бра главы службы безопасности + .desc = Стандартное бра главы службы безопасноти. Небронировано. +ent-ClothingUnderwearTopBraQM = бра квартермейстера + .desc = Стандартное бра квартермейстера. +ent-ClothingUnderwearTopBraRD = бра научного руководителя + .desc = Стандартное бра научного руководителя. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index cdc9d7bd6ed..fc0c606b475 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -266,4 +266,28 @@ ent-ADTPosterContrabandFearThem = Бойтесь их! .desc = Элитный отряд ядерных оперативников сожжёт вас до тла. Покинь NanoTrasen, пока не стало слишком поздно! ent-ADTPosterContrabandSilence = Не болтай! .desc = Синдикат предупреждает агентов-мимов, что за разглашение секретов вас будут жутко пытать. +ent-ADTPosterContrabandLustUma = Похотливая Ума + .desc = Плакат с вульпканинкой привлекательной внешности и в вызывающем костюме. +ent-ADTPosterOneYear1 = Один год! + .desc = Плакат посвящённый дню рождения сервера. + .suffix = { "День рождения сервера" } + +ent-ADTPosterOneYear2 = С днем рождения! + .desc = Плакат посвящённый дню рождения сервера. + .suffix = { "День рождения сервера" } + +ent-ADTPosterOneYear3 = странный плакат + .desc = На плакате изображён странный вокс, который что-то празднует. + .suffix = { "День рождения сервера" } + +ent-ADTPosterOneYear4 = странный плакат + .desc = На плакате изображенны странные заяц и медведь, которые что-то празднуют. + .suffix = { "День рождения сервера" } + +ent-ADTPosterPassTheBanana = "Передайте банан ниже!" + .desc = Голографический плакат с популярной шуткой среди сотрудников NT. + .suffix = { "День рождения сервера" } + +ent-ADTPosterLegitEfficiency = диаграмма трудовой эффективности + .desc = Центральное командование приводит статистику, где зарплаты сотрудников превышают более 2х процентов от общей прибыли с денег, которые приносит их труд и заявляет, что это самые неутешительные результаты за последние 120 лет. diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml index ebf7e366cae..25d1ac85635 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml @@ -31,3 +31,46 @@ - id: ADTPlushieAkula - id: ADTPlushiePrazat - id: ADTPlushieLo + +- type: entity + id: ADTCrateBirthdayParty + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: GlowstickBase + amount: 2 + - id: GlowstickBlue + amount: 2 + - id: GlowstickPurple + amount: 2 + - id: GlowstickRed + amount: 2 + - id: GlowstickYellow + amount: 2 + - id: FoodCakeBirthday + amount: 4 + - id: DrinkLean + amount: 4 + - id: KnifePlastic + amount: 2 + - id: ADTClothingHeadHatsNTCap + amount: 4 + - id: ADTClothingHeadHatsBlueCap + amount: 1 + - id: ADTClothingHeadHatsGrayCap + amount: 1 + - id: ADTClothingHeadHatsPinkCap + amount: 1 + - id: ADTClothingHeadHatsSyndieCap + amount: 1 + - id: ADTBirthDayBalloon1 + amount: 2 + - id: ADTBirthDayBalloon2 + amount: 2 + - id: ADTBirthDayBalloon3 + amount: 2 + - id: ADTBirthDayBalloon4 + amount: 2 + - id: ADTBirthDayBalloon5 + amount: 2 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index 8f14f04b130..b8bbdd60895 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -8,13 +8,14 @@ sprite: ADT/Clothing/Back/syndicate_bag.rsi state: icon - type: Item - size: 9999 + size: Huge - type: Clothing quickEquip: false slots: - back - type: Storage - maxItemSize: Ginormous + maxItemSize: Huge + maxTotalWeight: 28 - type: ContainerContainer containers: storagebase: !type:Container @@ -37,13 +38,14 @@ sprite: ADT/Clothing/Back/ussp_attaked_backpack.rsi state: icon - type: Item - size: 9999 + size: Huge - type: Clothing quickEquip: false slots: - back - type: Storage - maxItemSize: Ginormous + maxItemSize: Huge + maxTotalWeight: 36 - type: ContainerContainer containers: storagebase: !type:Container diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml index 663e0d1b7c7..6472b42a395 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml @@ -77,7 +77,7 @@ components: - type: Storage maxItemSize: Normal - maxTotalWeight: 0 + #maxTotalWeight: 0 maxSlots: 10 - type: StorageFill contents: @@ -118,7 +118,7 @@ components: - type: Storage maxItemSize: Normal - maxTotalWeight: 0 + #maxTotalWeight: 0 maxSlots: 10 - type: StorageFill contents: @@ -144,7 +144,7 @@ components: - type: Storage maxItemSize: Normal - maxTotalWeight: 0 + #maxTotalWeight: 0 maxSlots: 10 #By this ignore maxTotalWeight - type: StorageFill contents: diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml index 2599d3a7a8d..b574dd48d62 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/djah_rings.yml @@ -9,7 +9,7 @@ - type: Clothing sprite: ADT/Clothing/Hands/ring_urog.rsi - type: Item - size: 1 + size: Tiny - type: StaticPrice price: 1000 @@ -24,6 +24,6 @@ - type: Clothing sprite: ADT/Clothing/Hands/ring_yuna.rsi - type: Item - size: 1 + size: Tiny - type: StaticPrice price: 1000 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml index c5a470063d3..da58a013a36 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/hats.yml @@ -244,3 +244,65 @@ sprite: ADT/Clothing/Head/Hats/hat_povar.rsi - type: Clothing sprite: ADT/Clothing/Head/Hats/hat_povar.rsi + +#колпаки ко Дню Рождения + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsNTCap + name: NT birthday cap + description: NT birthday cap + suffix: One Year + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/ntbirthdaycap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/ntbirthdaycap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBlueCap + name: blue birthday cap + description: blue birthday cap + suffix: One Year + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bluebirthdaycap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bluebirthdaycap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsGrayCap + name: gray birthday cap + description: gray birthday cap + suffix: One Year + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/graybirthdaycap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/graybirthdaycap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsPinkCap + name: pink birthday cap + description: pink birthday cap + suffix: One Year + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsSyndieCap + name: syndie birthday cap + description: syndie birthday cap + suffix: One Year + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Cybersun.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/Cybersun.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Cybersun.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/Cybersun.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/MogesSpecOps.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/MogesSpecOps.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/MogesSpecOps.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/MogesSpecOps.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/cerber.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/cerber.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/cerber.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/cerber.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/fem_syndie.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/fem_syndie.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/fem_syndie.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/fem_syndie.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/paramedic.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/paramedic.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/paramedic.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/paramedic.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml new file mode 100644 index 00000000000..1d391b16cb0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/pioneer_hardsuit.yml @@ -0,0 +1,33 @@ +- type: entity + parent: ClothingOuterHardsuitSyndieCommander + id: ADTClothingOuterHardsuitPioneerAgent + name: agent "Pioneer" hardsuit + description: agent "Pioneer" hardsuit + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitPioneerAgent + +- type: entity + parent: ClothingHeadHelmetHardsuitSyndieCommander + id: ADTClothingHeadHelmetHardsuitPioneerAgent + noSpawn: true + name: agent "Pioneer" hardsuit helmet + description: agent "Pioneer" hardsuit helmet + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi + - type: PointLight # Corvax-Resprite + color: cyan + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/saibasain.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/saibasain.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/saibasain.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/saibasain.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/veteransechardsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/veteransechardsuit.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/veteransechardsuit.yml rename to Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/veteransechardsuit.yml diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml index 29068790b46..23e075c70c7 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Bottom.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: 1 + size: Tiny - type: Clothing slots: [underwearb] # - type: Tag diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml index 86a07ecb4e2..0db924fc821 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: 5 + size: Tiny - type: Clothing slots: [socks] # - type: Tag diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml index 2bd2fc0c4b7..249ee1df92a 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Top.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: 1 + size: Tiny - type: Clothing slots: [underweart] # - type: Tag diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index c0fbaef5979..088be38c93d 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -512,3 +512,14 @@ sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/shortdressblackgold.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTSwimsuitCap + name: captain swimsuit + description: Do not go to the auditor from CENTCOM in this + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/athletics.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/athletics.yml index 287b0504621..69773fe4f79 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/athletics.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/athletics.yml @@ -10,7 +10,7 @@ state: dumbbell2kg - type: Item sprite: ADT/Objects/Fun/dumbbell.rsi - size: 15 + size: Small - type: ItemCooldown - type: EmitEmoteOnUse #handler and component emote: WorkOut #emoteID @@ -28,7 +28,7 @@ state: dumbbell5kg - type: Item sprite: ADT/Objects/Fun/dumbbell.rsi - size: 20 + size: Small - type: ItemCooldown - type: EmitEmoteOnUse #handler and component emote: WorkOut #emoteID @@ -46,7 +46,7 @@ state: dumbbell8kg - type: Item sprite: ADT/Objects/Fun/dumbbell.rsi - size: 25 + size: Normal - type: ItemCooldown - type: EmitEmoteOnUse #handler and component emote: WorkOut #emoteID @@ -64,7 +64,7 @@ state: dumbbell10kg - type: Item sprite: ADT/Objects/Fun/dumbbell.rsi - size: 30 + size: Normal - type: ItemCooldown - type: EmitEmoteOnUse #handler and component emote: WorkOut #emoteID @@ -82,7 +82,7 @@ state: dumbbell15kg - type: Item sprite: ADT/Objects/Fun/dumbbell.rsi - size: 40 + size: Large - type: ItemCooldown - type: EmitEmoteOnUse #handler and component emote: WorkOut #emoteID @@ -100,7 +100,7 @@ state: dumbbell20kg - type: Item sprite: ADT/Objects/Fun/dumbbell.rsi - size: 50 + size: Large - type: ItemCooldown - type: EmitEmoteOnUse #handler and component emote: WorkOut #emoteID @@ -119,7 +119,7 @@ state: icon5 - type: Item sprite: ADT/Objects/Fun/kettlebell.rsi - size: 20 + size: Normal - type: ItemCooldown - type: EmitEmoteOnUse emote: WorkOut @@ -137,7 +137,7 @@ state: icon10 - type: Item sprite: ADT/Objects/Fun/kettlebell.rsi - size: 30 + size: Normal - type: ItemCooldown - type: EmitEmoteOnUse emote: WorkOut @@ -155,7 +155,7 @@ state: icon15 - type: Item sprite: ADT/Objects/Fun/kettlebell.rsi - size: 40 + size: Large - type: ItemCooldown - type: EmitEmoteOnUse emote: WorkOut @@ -173,7 +173,7 @@ state: icon20 - type: Item sprite: ADT/Objects/Fun/kettlebell.rsi - size: 50 + size: Large - type: ItemCooldown - type: EmitEmoteOnUse emote: WorkOut @@ -191,7 +191,7 @@ state: icon25 - type: Item sprite: ADT/Objects/Fun/kettlebell.rsi - size: 60 + size: Huge - type: ItemCooldown - type: EmitEmoteOnUse emote: WorkOut @@ -209,7 +209,7 @@ state: icon30 - type: Item sprite: ADT/Objects/Fun/kettlebell.rsi - size: 70 + size: Huge - type: ItemCooldown - type: EmitEmoteOnUse emote: WorkOut diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index c578cceff20..fafd3845b4e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -78,7 +78,7 @@ types: Blunt: 0 - type: Item - size: 10 + size: Small sprite: Objects/Fun/toys.rsi heldPrefix: garbagerama - type: ItemCooldown @@ -373,3 +373,23 @@ - type: Sprite sprite: ADT/Objects/Fun/toys.rsi state: plushie_timrika + +- type: entity + parent: BasePlushie + id: ADTPlushieAmira + name: Amira plushie + description: It looks like a soft and cute research director. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_amira + +- type: entity + parent: BasePlushie + id: ADTPlushieOvai + name: Ovai plushie + description: It looks like a soft and cute atmos. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_ovai diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml index b9c5ebb798f..ae5bab86dd0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/Hyppo.yml @@ -9,6 +9,7 @@ state: hypo - type: Item sprite: ADT/Objects/Misc/Hyppo.rsi + size: Small - type: SolutionContainerManager solutions: hypospray: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/barspoon.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/barspoon.yml index 03ef87465af..2291b5c20ef 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/barspoon.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/barspoon.yml @@ -11,6 +11,7 @@ state: barspoon - type: Item heldPrefix: spoon + size: Tiny - type: Utensil types: - Spoon diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/bath_broom.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/bath_broom.yml index da0adb07125..f719a3c88a2 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/bath_broom.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/bath_broom.yml @@ -10,7 +10,7 @@ - type: StaminaDamageOnHit damage: 10 - type: Item - size: 5 + size: Small sprite: ADT/Objects/Misc/bathbroom.rsi - type: MeleeWeapon damage: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml index 5e50288159c..c88bb3281d9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/glass_jug.yml @@ -15,7 +15,7 @@ - state: icon-front map: [ "enum.SolutionContainerLayers.Overlay" ] - type: Item - size: 15 + size: Normal - type: Appearance - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/halloween_candy_bowl.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/halloween_candy_bowl.yml index fd36ff4462b..470c386b678 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/halloween_candy_bowl.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/halloween_candy_bowl.yml @@ -22,7 +22,7 @@ maxFillLevels: 4 fillBaseName: icon - type: Item - size: 50 + size: Huge - type: entity name: halloween candy bowl diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/iron_tray.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/iron_tray.yml index 90a71ea48f9..27a75f37dfe 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/iron_tray.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/iron_tray.yml @@ -15,7 +15,7 @@ # - Food # - Drink - type: Item - size: 300 + size: Ginormous - type: ItemCooldown - type: MeleeWeapon damage: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml index aaf66665676..7607bcd5706 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/jigger.yml @@ -10,6 +10,8 @@ maxVol: 5 - type: Drink isOpen: true + - type: Item + size: Small - type: FitsInDispenser solution: drink - type: DrawableSolution diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml index 9f4fa41c0e5..dea2b84aca7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/mixing_glass.yml @@ -15,7 +15,7 @@ visible: false - state: mixing_glass-front - type: Item - size: 10 + size: Small sprite: ADT/Objects/Misc/mixing_glass.rsi - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/new_recipes_book.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/new_recipes_book.yml index 5d72f2c9151..d4a58b188bd 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/new_recipes_book.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/new_recipes_book.yml @@ -11,6 +11,8 @@ - type: Tag tags: - Book + - type: Item + size: Small - type: GuideHelp openOnActivation: true guides: @@ -29,6 +31,8 @@ - type: Tag tags: - Book + - type: Item + size: Small - type: GuideHelp openOnActivation: true guides: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/combathypo.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/combathypo.yml index cddafac2b35..e8a1a46ea8b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/combathypo.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/combathypo.yml @@ -9,6 +9,7 @@ state: icon - type: Item sprite: ADT/Objects/Specific/Medical/adt_combathypo.rsi + size: Normal - type: SolutionContainerManager solutions: hypospray: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/cross.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/cross.yml index de672b2b4b2..3b25464da3c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/cross.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/cross.yml @@ -30,7 +30,7 @@ state: icon scale: 0.5 , 0.5 - type: Item - size: 5 + size: Small sprite: ADT/Objects/Specific/Chapel/woodencross.rsi - type: MeleeWeapon damage: @@ -48,7 +48,7 @@ state: icon scale: 0.5 , 0.5 - type: Item - size: 5 + size: Small sprite: ADT/Objects/Specific/Chapel/silvercross.rsi - type: entity @@ -62,5 +62,5 @@ state: icon scale: 0.5 , 0.5 - type: Item - size: 5 + size: Small sprite: ADT/Objects/Specific/Chapel/goldencross.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml index 0832091b525..05cc38023f1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/cyberhypo.yml @@ -9,6 +9,7 @@ state: hypo - type: Item sprite: ADT/Objects/Specific/cyberhypo.rsi + size: Small - type: SolutionContainerManager solutions: hypospray: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/perfume.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/perfume.yml index b2cc2991e0d..a98224e1082 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/perfume.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/perfume.yml @@ -20,6 +20,7 @@ state: perfume - type: Item sprite: ADT/Objects/Specific/perfume_lilac.rsi + size: Small - type: Spray transferAmount: 3 @@ -41,7 +42,7 @@ maxItemSize: Small - type: Item sprite: ADT/Objects/Specific/perfume_lilac_box.rsi - size: 5 + size: Normal heldPrefix: box - type: StorageFill contents: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml index bcb54644787..085bff7d8bc 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml @@ -105,6 +105,7 @@ map: [ "light" ] - type: Item sprite: ADT/Objects/Misc/Lights/golden_candlestick.rsi + size: Normal #- type: PointLight # enabled: false # mask: /Textures/Effects/LightMasks/cone.png @@ -138,6 +139,7 @@ map: [ "light" ] - type: Item sprite: ADT/Objects/Misc/Lights/silver_candlestick.rsi + size: Normal - type: PointLight netsync: false enabled: false @@ -165,6 +167,7 @@ map: [ "light" ] - type: Item sprite: ADT/Objects/Misc/Lights/scull_lamp.rsi + size: Normal - type: PointLight netsync: false enabled: false diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml index c16a8c743ed..414140ac33f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/UrogCrowbar.yml @@ -11,7 +11,7 @@ state: gold-icon - type: Item sprite: ADT/Memes/gold-crowbar.rsi - size: 10 + size: Normal heldPrefix: gold - type: loadout diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/muchhurt.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/muchhurt.yml index d943b83667d..510fe150b9c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/muchhurt.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Boxes/muchhurt.yml @@ -11,7 +11,7 @@ proto: Cartridge357 capacity: 60 - type: Item - size: 5 + size: Small - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/dartgun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/dartgun.yml index e74fe691b46..9abd219d0b1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/dartgun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Magazines/dartgun.yml @@ -15,7 +15,7 @@ proto: Syringecartridge capacity: 8 - type: Item - size: 3 + size: Tiny - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/muchhurt.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/muchhurt.yml index a58d152d4bf..5cc4017d073 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/muchhurt.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Speedloader/muchhurt.yml @@ -18,6 +18,8 @@ containers: ballistic-ammo: !type:Container ents: [] + - type: Item + size: Small - type: entity id: SpeedLoader357 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index 26a7a59ce5a..d1d8182d100 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -43,3 +43,5 @@ - HighRiskItem - type: StaticPrice price: 7500 + - type: Item + size: Normal diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml index a434e5ddf80..75ac57c7b11 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Revolvers/Unica.yml @@ -8,7 +8,7 @@ - type: Sprite state: icon - type: Item - size: 10 + size: Small - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi quickEquip: false diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml index a195de4b531..1b6ffc4a764 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml @@ -58,7 +58,7 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - type: Item - size: 50 + size: Large - type: entity name: AN-97 @@ -120,4 +120,4 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg - type: Item - size: 50 + size: Large diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml index d9d74ae5972..9555953d6e2 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/AstraKnife.yml @@ -23,7 +23,7 @@ types: Slash: 10 - type: Item - size: 10 + size: Small sprite: ADT/Objects/Weapons/Melee/astra-knife.rsi - type: DisarmMalus malus: 0.225 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml index ec5a4bbc2bc..71e5aaf494b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/KiiravaSword.yml @@ -17,6 +17,6 @@ types: Slash: 25 - type: Item - size: 15 + size: Large sprite: ADT/Objects/Weapons/Melee/kiirava-sword.rsi - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml index 4c571846cab..577fac536b8 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Sabre.yml @@ -18,7 +18,7 @@ Cellular: 50 Radiation: 50 - type: Item - size: 15 + size: Huge sprite: ADT/Objects/Weapons/Melee/supreme-commander-sabre.rsi - type: DisarmMalus @@ -43,6 +43,6 @@ Radiation: 15 Blunt: -1 - type: Item - size: 15 + size: Huge sprite: ADT/Objects/Weapons/Melee/supreme-sabre.rsi - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml index d53ab7c9ba4..1d2fbabf595 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/Swords.yml @@ -17,7 +17,7 @@ types: Slash: 25 - type: Item - size: 15 + size: Huge sprite: ADT/Objects/Weapons/Melee/murasama.rsi - type: DisarmMalus @@ -46,7 +46,7 @@ types: Blunt: 1 - type: Item - size: 15 + size: Huge - type: DisarmMalus - type: Reflect enabled: true @@ -96,7 +96,7 @@ Blunt: 10 Structural: 35 - type: Item - size: 20 + size: Huge - type: DisarmMalus - type: Clothing quickEquip: false diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/bouquets.yml index c37d236c8b8..ff320403519 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/bouquets.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/bouquets.yml @@ -15,7 +15,7 @@ types: Slash: 1 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/white_bouquet.rsi - type: DisarmMalus @@ -35,7 +35,7 @@ types: Slash: 1 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/rose_bouquet.rsi - type: DisarmMalus @@ -55,7 +55,7 @@ types: Slash: 1 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/yellow_bouquet.rsi - type: DisarmMalus @@ -75,7 +75,7 @@ types: Slash: 1 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/bouquet_with_beer.rsi - type: DisarmMalus @@ -95,7 +95,7 @@ types: Slash: 1 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/black_bouquet.rsi - type: DisarmMalus @@ -115,6 +115,6 @@ types: Slash: 1 - type: Item - size: 15 + size: Normal sprite: ADT/Objects/Weapons/Melee/liliac_bouquet.rsi - type: DisarmMalus diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml index d6a31376304..2a42a55be17 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/folding_knife.yml @@ -30,7 +30,7 @@ types: Slash: 10 - type: Item - size: 5 + size: Small sprite: ADT/Objects/Weapons/Melee/folding_knife.rsi - type: UseDelay delay: 1.0 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/jaystunbaton.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/jaystunbaton.yml index b739dfa4817..08473764f49 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/jaystunbaton.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/jaystunbaton.yml @@ -27,7 +27,7 @@ - type: ItemCooldown - type: Item heldPrefix: off - size: 20 + size: Normal - type: Clothing sprite: ADT/Objects/Weapons/Melee/jaystunbaton.rsi quickEquip: false diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml index 97ab0033aa4..88e50fad3b0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/pyotr_sabre.yml @@ -20,7 +20,7 @@ reflectProb: .5 spread: 90 - type: Item - size: 15 + size: Huge sprite: ADT/Objects/Weapons/Melee/pyotr_sabre.rsi - type: DisarmMalus - type: Tag diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml index 0847db32bbd..4e14b3b63b5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/warhammer.yml @@ -42,7 +42,7 @@ Blunt: 20 - type: GunRequiresWield - type: Item - size: 150 + size: Ginormous - type: DisarmMalus - type: Tool qualities: diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml index e9397eadea8..9e948bfab10 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/blackchair.yml @@ -94,3 +94,60 @@ - type: Sprite sprite: ADT/Structures/Furniture/spider_stool.rsi #спрайт от Умы state: icon + +- type: entity + name: pizzeria chair + id: ADTPizzeriaStool + parent: SeatBase + description: It looks spooky. + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Rotatable + - type: Sprite + sprite: ADT/Structures/Furniture/pizzeria_stool.rsi #спрайт от Иллюми + state: icon + - type: Construction + graph: ADTStool + node: pizzeriaStool + +- type: entity + name: red stool + id: ADTRedStool + parent: SeatBase + description: It looks spooky. + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Rotatable + - type: Sprite + sprite: ADT/Structures/Furniture/red_stool.rsi #спрайт от Овая + state: icon + - type: Construction + graph: ADTStool + node: redStool + +- type: entity + name: white stool + id: ADTWhiteStool + parent: SeatBase + description: It looks spooky. + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Rotatable + - type: Sprite + sprite: ADT/Structures/Furniture/white_stool.rsi #спрайт от Овая + state: icon + - type: Construction + graph: ADTStool + node: whiteStool diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/oneyearbirthday.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/oneyearbirthday.yml new file mode 100644 index 00000000000..5c2fca03aa8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/oneyearbirthday.yml @@ -0,0 +1,143 @@ +- type: entity + parent: BaseItem + id: ADTBirthDayBalloon1 + name: birthday balloon 1 + description: birthday balloon 1 + components: + - type: Sprite + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + state: balloon1 + - type: Item + heldPrefix: bal1 + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + size: Small + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + +- type: entity + parent: BaseItem + id: ADTBirthDayBalloon2 + name: birthday balloon 2 + description: birthday balloon 2 + components: + - type: Sprite + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + state: balloon2 + - type: Item + heldPrefix: bal2 + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + size: Small + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + +- type: entity + parent: BaseItem + id: ADTBirthDayBalloon3 + name: birthday balloon 3 + description: birthday balloon 3 + components: + - type: Sprite + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + state: balloon3 + - type: Item + heldPrefix: bal3 + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + size: Small + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + +- type: entity + parent: BaseItem + id: ADTBirthDayBalloon4 + name: birthday balloon 4 + description: birthday balloon 4 + components: + - type: Sprite + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + state: balloon4 + - type: Item + heldPrefix: bal4 + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + size: Small + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + +- type: entity + parent: BaseItem + id: ADTBirthDayBalloon5 + name: birthday balloon 5 + description: birthday balloon 5 + components: + - type: Sprite + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + state: balloon5 + - type: Item + heldPrefix: bal5 + sprite: ADT/Structures/Decoration/birthday_balloon.rsi + size: Small + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + +- type: entity + id: ADTDiscoBall + parent: BaseStructureDynamic + name: disco ball + description: disco ball + suffix: One Year + #abstract: true + components: + - type: Transform + noRot: true + - type: InteractionOutline + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.1 + density: 190 + mask: + - Impassable + - type: Sprite + drawdepth: Overdoors + #offset: "0.0,0.3" + sprite: ADT/Structures/Decoration/discoball.rsi + state: discoball + noRot: true + - type: Anchorable + - type: PointLight + radius: 8 + energy: 4 + - type: RgbLightController + layers: [ 0 ] + - type: Pullable + - type: Damageable + damageContainer: Inorganic # The pot. Not the plant. Or is it plastic? + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: ADTDiscoBallGraph + node: discoBall diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml new file mode 100644 index 00000000000..fa2fd94069d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/roundtable.yml @@ -0,0 +1,140 @@ +- type: entity + id: ADTRoundTablePlastic + parent: BaseStructure + name: plastic round table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PlaceableSurface + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.5,-0.5,0.5,0.5" + density: 55 + mask: # tables should collide with other tables + - TableMask + layer: + - TableLayer + - type: Sprite + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_plastic + - type: Icon + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_plastic + - type: Climbable + - type: Bonkable + bonkDamage: + types: + Blunt: 4 + bonkSound: !type:SoundCollectionSpecifier + collection: TrayHit + - type: Clickable + - type: Construction + graph: ADTRoundTable + node: plasticRoundTable + - type: Anchorable + - type: Rotatable + - type: InteractionOutline + - type: Physics + bodyType: Static + +- type: entity + id: ADTRoundTableWood + parent: ADTRoundTablePlastic + name: wood round table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Sprite + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_wood + - type: Icon + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_wood + - type: Construction + graph: ADTRoundTable + node: woodRoundTable + +- type: entity + id: ADTRoundTableGlass + parent: ADTRoundTablePlastic + name: glass round table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: GlassTable + climberDamage: + types: + Slash: 30 + tableDamage: + types: + Blunt: 100 + tableMassLimit: 60 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/glass_break2.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Sprite + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_glass + - type: Icon + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_glass + - type: Construction + graph: ADTRoundTable + node: glassRoundTable diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml new file mode 100644 index 00000000000..acc883fdcc8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/table.yml @@ -0,0 +1,193 @@ +- type: entity + id: ADTRedTable + parent: TableBase + name: wood red table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: Sprite + sprite: ADT/Structures/Furniture/red_wood_table.rsi + - type: Icon + sprite: ADT/Structures/Furniture/red_wood_table.rsi + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden + - type: Construction + graph: ADTTable + node: redWoodTable + +- type: entity + id: ADTWhiteTable + parent: TableBase + name: wood white table + description: Do not apply fire to this. Rumour says it burns easily. + suffix: One Year + components: + - type: Sprite + sprite: ADT/Structures/Furniture/white_wood_table.rsi + - type: Icon + sprite: ADT/Structures/Furniture/white_wood_table.rsi + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/woodhit.ogg + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden + - type: Construction + graph: ADTTable + node: whiteWoodTable + +- type: entity + id: ADTRedWoodTableFrame + # BaseStructure and not BaseTable, since these shouldn't be climbable/placeable. + parent: BaseStructure + name: table frame + description: Pieces of metal that make the frame of a table. + components: + - type: Sprite + sprite: Structures/Furniture/Tables/frame.rsi + - type: Icon + sprite: Structures/Furniture/Tables/frame.rsi + state: full + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.40,-0.30,0.40,0.45" + density: 80 + mask: + - TableMask + layer: + - TableLayer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: IconSmooth + key: state + base: state_ + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: ADTTable + node: redWoodTableFrame + +- type: entity + id: ADTWhiteWoodTableFrame + # BaseStructure and not BaseTable, since these shouldn't be climbable/placeable. + parent: BaseStructure + name: table frame + description: Pieces of metal that make the frame of a table. + components: + - type: Sprite + sprite: Structures/Furniture/Tables/frame.rsi + - type: Icon + sprite: Structures/Furniture/Tables/frame.rsi + state: full + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.40,-0.30,0.40,0.45" + density: 80 + mask: + - TableMask + layer: + - TableLayer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: IconSmooth + key: state + base: state_ + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:SpawnEntitiesBehavior + spawn: + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: ADTTable + node: whiteWoodTableFrame diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index c5e2a4953b2..698adb6ebec 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -67,6 +67,15 @@ - type: Sprite state: poster_adtsilence_contraband #Спрайт от Иллюми +- type: entity + parent: PosterBase + id: ADTPosterContrabandLustUma + name: Lusty Uma + description: "A poster with vulpcanine women of attractive appearance and in a provocative suit." + components: + - type: Sprite + state: poster_adtlustuma_contraband #Спрайт от Празата + #картины - type: entity @@ -337,3 +346,143 @@ - type: Sprite sprite: ADT/Objects/Decoration/triangles_halloween.rsi state: HPHW4 + +#плакаты ко дню рождения + +- type: entity + parent: PosterBase + id: ADTPosterOneYear1 + name: One Year! + description: One Year! + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_oneyearbirthday.rsi + state: poster1 + +- type: entity + parent: PosterBase + id: ADTPosterOneYear2 + name: Birthday! + description: Birthday! + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_oneyearbirthday.rsi + state: poster2 + +- type: entity + parent: PosterBase + id: ADTPosterOneYear3 + name: strange birthday poster + description: strange birthday poster + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_oneyearbirthday.rsi + state: poster3 + +- type: entity + parent: PosterBase + id: ADTPosterOneYear4 + name: strange birthday poster + description: strange birthday poster + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_oneyearbirthday.rsi + state: poster4 + +- type: entity + parent: PosterBase + id: ADTPosterPassTheBanana + name: "Pass the banana down" + description: "Pass the banana down" + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/passthebanana.rsi + state: passthebanana + - type: PointLight + radius: 3 + energy: 2 + color: cyan + +#постер от Иллюми про производительность + +- type: entity + parent: PosterBase + id: ADTPosterLegitEfficiency + name: diagram of efficiency + description: diagram of efficiency + components: + - type: Sprite + state: poster_efficiencydiagram_legit #Спрайт от Иллюми + +#флажки от Овая + +- type: entity + parent: PosterBase + id: ADTBirhtdayTrianglesPB1 + name: purple-blue triangles left + description: purple-blue triangles left + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/triangles_birthday.rsi + state: pbleft + +- type: entity + parent: PosterBase + id: ADTBirhtdayTrianglesPB2 + name: purple-blue triangles center + description: purple-blue triangles center + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/triangles_birthday.rsi + state: pbcenter + +- type: entity + parent: PosterBase + id: ADTBirhtdayTrianglesPB3 + name: purple-blue triangles right + description: purple-blue triangles right + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/triangles_birthday.rsi + state: pbright + +- type: entity + parent: PosterBase + id: ADTBirhtdayTrianglesRY1 + name: red-yellow triangles left + description: red-yellow triangles left + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/triangles_birthday.rsi + state: ryleft + +- type: entity + parent: PosterBase + id: ADTBirhtdayTrianglesRY2 + name: red-yellow triangles center + description: red-yellow triangles center + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/triangles_birthday.rsi + state: rycenter + +- type: entity + parent: PosterBase + id: ADTBirhtdayTrianglesRY3 + name: red-yellow triangles right + description: red-yellow triangles right + suffix: One Year + components: + - type: Sprite + sprite: ADT/Objects/Decoration/triangles_birthday.rsi + state: ryright diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/adtstool.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/adtstool.yml new file mode 100644 index 00000000000..d03b491679e --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/adtstool.yml @@ -0,0 +1,56 @@ +- type: constructionGraph + id: ADTStool + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: pizzeriaStool + steps: + - material: WoodPlank + amount: 2 + doAfter: 1 + - to: redStool + steps: + - material: WoodPlank + amount: 2 + doAfter: 1 + - to: whiteStool + steps: + - material: WoodPlank + amount: 2 + doAfter: 1 + + - node: pizzeriaStool + entity: ADTPizzeriaStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + steps: + - tool: Screwing + doAfter: 2 + + - node: redStool + entity: ADTRedStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + steps: + - tool: Screwing + doAfter: 2 + + - node: whiteStool + entity: ADTWhiteStool + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + steps: + - tool: Screwing + doAfter: 2 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/adttable.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/adttable.yml new file mode 100644 index 00000000000..944158ba005 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/adttable.yml @@ -0,0 +1,84 @@ +- type: constructionGraph + id: ADTTable + start: start + graph: + - node: start + actions: + - !type:DeleteEntity {} + edges: + - to: redWoodTableFrame + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: MetalRod + amount: 2 + doAfter: 1 + - to: whiteWoodTableFrame + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: MetalRod + amount: 2 + doAfter: 1 + + - node: whiteWoodTableFrame + entity: ADTWhiteWoodTableFrame + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: PartRodMetal + amount: 2 + steps: + - tool: Anchoring + doAfter: 1 + + - to: whiteWoodTable + steps: + - material: WoodPlank + amount: 1 + doAfter: 1 + + - node: redWoodTableFrame + entity: ADTRedWoodTableFrame + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: PartRodMetal + amount: 2 + steps: + - tool: Anchoring + doAfter: 1 + + - to: redWoodTable + steps: + - material: WoodPlank + amount: 1 + doAfter: 1 + + - node: whiteWoodTable + entity: ADTWhiteTable + edges: + - to: whiteWoodTableFrame + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: redWoodTable + entity: ADTRedTable + edges: + - to: redWoodTableFrame + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Prying + doAfter: 1 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/discoball.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/discoball.yml new file mode 100644 index 00000000000..ccd524d2388 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/discoball.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: ADTDiscoBallGraph + start: start + graph: + - node: start + edges: + - to: discoBall + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Steel + amount: 10 + doAfter: 5 + + - node: discoBall + entity: ADTDiscoBall + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 10 + - !type:DeleteEntity {} + steps: + - tool: Welding + doAfter: 5 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/fireplace.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/fireplace.yml new file mode 100644 index 00000000000..f144d3ad362 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/fireplace.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: ADTFireplace + start: start + graph: + - node: start + edges: + - to: fireplace + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Steel + amount: 15 + doAfter: 5 + + - node: fireplace + entity: Fireplace + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 15 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 5 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/roundtable.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/roundtable.yml new file mode 100644 index 00000000000..7935689dd0e --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/roundtable.yml @@ -0,0 +1,69 @@ +- type: constructionGraph + id: ADTRoundTable + start: start + graph: + - node: start + edges: + - to: plasticRoundTable + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Plastic + amount: 4 + doAfter: 4 + - to: woodRoundTable + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 4 + doAfter: 4 + - to: glassRoundTable + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Glass + amount: 4 + doAfter: 4 + + - node: plasticRoundTable + entity: ADTRoundTablePlastic + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 4 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 4 + + - node: woodRoundTable + entity: ADTRoundTableWood + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 4 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 4 + + - node: glassRoundTable + entity: ADTRoundTableGlass + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetGlass1 + amount: 4 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 4 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml b/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml index 428cd1a53ef..ef13011d772 100644 --- a/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml @@ -374,3 +374,173 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked + +- type: construction + name: disco ball + id: ADTDiscoBallRecipe + graph: ADTDiscoBallGraph + startNode: start + targetNode: discoBall + category: construction-category-furniture + description: Lets fall in 2470. + icon: + sprite: ADT/Structures/Decoration/discoball.rsi + state: discoball + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: plastic round table + id: ADTRoundTablePlasticRecipe + graph: ADTRoundTable + startNode: start + targetNode: plasticRoundTable + category: construction-category-furniture + description: Lets fall in 2470. + icon: + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_plastic + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: wood round table + id: ADTRoundTableWoodRecipe + graph: ADTRoundTable + startNode: start + targetNode: woodRoundTable + category: construction-category-furniture + description: Lets fall in 2470. + icon: + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_wood + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: glass round table + id: ADTRoundTableGlassRecipe + graph: ADTRoundTable + startNode: start + targetNode: glassRoundTable + category: construction-category-furniture + description: Lets fall in 2470. + icon: + sprite: ADT/Structures/Furniture/roundtable.rsi + state: round_glass + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: pizza stool + id: ADTPizzeriaStoolRecipe + graph: ADTStool + startNode: start + targetNode: pizzeriaStool + category: construction-category-furniture + description: You can sit on this. + icon: + sprite: ADT/Structures/Furniture/pizzeria_stool.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: white stool + id: ADTWhiteStoolRecipe + graph: ADTStool + startNode: start + targetNode: whiteStool + category: construction-category-furniture + description: You can sit on this. + icon: + sprite: ADT/Structures/Furniture/white_stool.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: red stool + id: ADTRedStoolRecipe + graph: ADTStool + startNode: start + targetNode: redStool + category: construction-category-furniture + description: You can sit on this. + icon: + sprite: ADT/Structures/Furniture/red_stool.rsi + state: icon + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: white wood table + id: ADTWhiteTableRecipe + graph: ADTTable + startNode: start + targetNode: whiteWoodTable + category: construction-category-furniture + description: A square piece of glass, standing on four metal legs. + icon: + sprite: ADT/Structures/Furniture/white_wood_table.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: red wood table + id: ADTRedTableRecipe + graph: ADTTable + startNode: start + targetNode: redWoodTable + category: construction-category-furniture + description: A square piece of glass, standing on four metal legs. + icon: + sprite: ADT/Structures/Furniture/red_wood_table.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: fireplace + id: ADTFireplaceRecipe + graph: ADTFireplace + startNode: start + targetNode: fireplace + category: construction-category-furniture + description: A place that has fire. Cozy! + icon: + sprite: Structures/Decoration/fireplace.rsi + state: fireplace + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml b/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml index 893f0a8f5b6..17ca3b3da81 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml @@ -50,6 +50,8 @@ innerClothingSkirt: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL satchel: ClothingBackpackSatchelIAAFilled duffelbag: ClothingBackpackDuffelIAAFilled + #inhand: + # - BriefcaseIAAFilled diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index cd9f155ede8..e193c8e207d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -113,7 +113,7 @@ components: - type: StorageFill contents: - - id: BrigmedicPDA + #- id: BrigmedicPDA - id: ClothingHeadHatBeretSecurityMedic - id: ClothingHeadHatBeretBrigmedic - id: ClothingBackpackDuffelBrigmedic diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 0296f89bf69..73fd371956c 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -4,13 +4,9 @@ parent: ToolboxEmergency suffix: Filled components: - - type: Storage - maxItemSize: Ginormous - maxTotalWeight: 0 - maxSlots: 50 #By this ignore maxTotalWeight - type: StorageFill contents: - - id: MiniFireExtinguisher + #- id: MiniFireExtinguisher - id: CrowbarRed - id: ClothingMaskBreath amount: 2 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 2714f6506b4..6e66a687780 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -67,6 +67,7 @@ # Sirena-Underwear-Start - id: ADTUnderwearBoxCap # Sirena-Underwear-End + - id: ADTSwimsuitCap - type: entity id: LockerCaptainFilled @@ -109,6 +110,7 @@ - id: ClothingOuterCoatCaptain # Corvax-Resprite-End - id: ADTClothingEyesHudAdvanced #ADT mods + - id: ADTSwimsuitCap - type: entity id: LockerHeadOfPersonnelFilled diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 45a845aefde..d3a4cd9da53 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -3,13 +3,12 @@ parent: ClothingBackpack id: ClothingBackpackIAAFilled components: - - type: Storage - maxItemSize: Huge - maxTotalWeight: 9000 + #- type: Storage + # maxItemSize: Huge + # maxTotalWeight: 9000 - type: StorageFill contents: - id: BoxSurvival - - id: BriefcaseIAAFilled - type: entity noSpawn: true diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 40b663c9644..88cc0476345 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -3,14 +3,14 @@ parent: ClothingBackpackDuffel id: ClothingBackpackDuffelIAAFilled components: - - type: Storage - maxItemSize: Huge - maxTotalWeight: 0 - maxSlots: 50 #By this ignore maxTotalWeight + #- type: Storage + # maxItemSize: Huge + # maxTotalWeight: 0 + # maxSlots: 50 #By this ignore maxTotalWeight - type: StorageFill contents: - id: BoxSurvival - - id: BriefcaseIAAFilled + #- id: BriefcaseIAAFilled - type: entity noSpawn: true diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml index db931a365c2..76fd9fd2564 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -3,22 +3,22 @@ parent: ClothingBackpackSatchel id: ClothingBackpackSatchelIAAFilled components: - - type: Storage - maxItemSize: Huge - maxTotalWeight: 9000 + #- type: Storage + # maxItemSize: Huge + # maxTotalWeight: 9000 - type: StorageFill contents: - id: BoxSurvival - - id: BriefcaseIAAFilled + #- id: BriefcaseIAAFilled - type: entity noSpawn: true parent: ClothingBackpackSatchelMedical id: ClothingBackpackSatchelPsychologistFilled components: - - type: Storage - maxItemSize: Huge - maxTotalWeight: 9000 + #- type: Storage + # maxItemSize: Huge + # maxTotalWeight: 9000 - type: StorageFill contents: - id: BoxSurvivalMedical diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Items/briefcases.yml index 7bd849ac890..f631631df22 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Items/briefcases.yml @@ -3,8 +3,8 @@ parent: BriefcaseBrown suffix: IAA components: - - type: Item - size: Huge + #- type: Item + # size: Huge - type: StorageFill contents: - id: Paper diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index 9d326dd9707..b4f061845d1 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -38,3 +38,5 @@ innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack satchel: ClothingBackpackSatchelIAAFilled duffelbag: ClothingBackpackDuffelIAAFilled + inhand: + - BriefcaseIAAFilled diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 181b375240b..af6109257fc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -95,6 +95,7 @@ - ADTPosterContrabandLustTayaran # Спрайт от Празата - ADTPosterContrabandFearThem # Спрайт от Иллюми - ADTPosterContrabandSilence # Спрайт от Иллюми + - ADTPosterContrabandLustUma chance: 1 - type: entity @@ -152,8 +153,20 @@ - PosterLegitPeriodicTable - PosterLegitRenault - PosterLegitNTTGC + - ADTPosterLegitEfficiency + #- ADTPosterLegitGreatFood #спрайт от Празата + #- ADTPosterLegitTurnOnSensors #спрайт от Празата + #- ADTPosterLegitOktoberfest #спрайт от Празата + #- ADTPosterLegitOktoberfest2 #спрайт от Празата + chance: 0.3 + rarePrototypes: #временная мера на момент дня рожденья проекта + - ADTPosterOneYear1 #спрайт от Умы + - ADTPosterOneYear2 #спрайт от Умы + - ADTPosterOneYear3 #спрайт от Умы + - ADTPosterOneYear4 #спрайт от Умы - ADTPosterLegitGreatFood #спрайт от Празата - ADTPosterLegitTurnOnSensors #спрайт от Празата - ADTPosterLegitOktoberfest #спрайт от Празата - ADTPosterLegitOktoberfest2 #спрайт от Празата - chance: 1 + - ADTPosterPassTheBanana #спрайт от Уолтера + rareChance: 0.7 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 339802e28f8..57491c74a4a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -5,7 +5,7 @@ components: - type: Drink - type: Item - size: 8 + size: Normal - type: SolutionContainerManager solutions: drink: @@ -101,7 +101,7 @@ description: Keeping your drinks at the perfect temperature since 1892. components: - type: Item - size: 10 + size: Normal - type: SolutionContainerManager solutions: drink: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index 07ca776207f..3cf2b7f7953 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -66,6 +66,7 @@ - clean - type: Food solution: soap + - type: BadFood - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index f4149b5a6a1..b9b47b100ee 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -8,7 +8,7 @@ sound: path: /Audio/Items/toolbox_drop.ogg - type: Storage - maxSlots: 7 + maxSlots: 8 maxItemSize: Normal maxTotalWeight: 14 - type: Item diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml index 03851318e1f..99d6d1b7fa8 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml @@ -32,3 +32,6 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Construction + graph: ADTFireplace + node: fireplace diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index e4ea12307d3..0063367b77d 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -52,9 +52,11 @@ Food: effects: - !type:ChemVomit + probability: 0.20 Drink: effects: - !type:ChemVomit + probability: 0.20 - type: reagent id: SoapyWater @@ -73,6 +75,7 @@ - !type:ChemVomit thirstAmount: -10.0 hungerAmount: -10.0 + probability: 0.20 plantMetabolism: - !type:PlantAdjustWater amount: .8 diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/icon-flash.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/icon-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..864673bb7d6e1a85309ec58b79f49e66dde6fc68 GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!hCELf$B+p3WC_;A2_ijBfd&^E1ige=hQQSJio(PR*B?_uk^r0V`KF zEpI7>lZ@i}@#zseYt(K`-#x3|u;%x_)`xd>4cq3&+Zpch-hceV|BL!9nR6V?Yj(dU~hl$M|?o>f`4?kx9Z?Z`i`*LlY#n-bPUS4f4xo>}B zYDN8XD|uh k>wwY0mm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!0MT5-*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..864673bb7d6e1a85309ec58b79f49e66dde6fc68 GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!hCELf$B+p3WC_;A2_ijBfd&^E1ige=hQQSJio(PR*B?_uk^r0V`KF zEpI7>lZ@i}@#zseYt(K`-#x3|u;%x_)`xd>4cq3&+Zpch-hceV|BL!9nR6V?Yj(dU~hl$M|?o>f`4?kx9Z?Z`i`*LlY#n-bPUS4f4xo>}B zYDN8XD|uh k>wwY0mm1-j=IhI#1!QvoF$i1=o(!TqUHx3vIVCg!0MT5-*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/meta.json new file mode 100644 index 00000000000..95b3d23b9e2 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:shi_zzy для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/off-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..610181aa192acddfbeef51c8935b0b57d168adbf GIT binary patch literal 1245 zcmV<31S0#1P)ovU7Kcd){tf+Fa!(foMe05CL z{;BO(9BgXh{{J4QEO3LxvKzcx^y)y?I(~oni?^h{k&DpfrsA8{@A#}MxC6}_i={;h zak|-NG)Y%x=WuG>Y5g-CYfCvx)B0vO)01+SpM1Tko0U~hw2%I?frNnyi9l!i6vGwiqyx{3@ zPOfxqQ$3G?&1(ItYG@p4YLZxMy2sjwn%YW?`Fw~(LojVWYuJ+dqhD<>O7)uW&6hlp z2p8XODCBd%Ys39^@y?Xu=4dRqr|Y-!@o>fMO>_@|lK zZh7t=$-PE{to18kPE6#Yx>b5UcNLq3eG372yJ6uJMl8UKJ$AnAJa0kOE)4&%a zuBb+EaG}dy{A>W5-qb4fEiA`uYxZSwy;*ArlLJA%KK;7`o%12S7KI>mJ|Gq`OP&p@ ztuOY7&-SnNup_<|P;_Y&x&#*XtekYf;pF~1ON)>;F|#P9rEY`(^mm@a_(~m828LlB zcFDFgGbI$^ZX7?`k6N2UetxSL1>bkU7d;x2wV@8S@G$0L2O_GfP`Wx7mS{}wxrM5@ z)xMXs$9@a2Z-^xYZ&HBy_&0uc++^6KP6UVm5g-CYfCvx)B0vO)01+SpM1Tko0U|&I zhyW2F0{;mDe*#{dl2NU5up0mX01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjf)zVP~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/on-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/pioneeragenthelmet.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..610181aa192acddfbeef51c8935b0b57d168adbf GIT binary patch literal 1245 zcmV<31S0#1P)ovU7Kcd){tf+Fa!(foMe05CL z{;BO(9BgXh{{J4QEO3LxvKzcx^y)y?I(~oni?^h{k&DpfrsA8{@A#}MxC6}_i={;h zak|-NG)Y%x=WuG>Y5g-CYfCvx)B0vO)01+SpM1Tko0U~hw2%I?frNnyi9l!i6vGwiqyx{3@ zPOfxqQ$3G?&1(ItYG@p4YLZxMy2sjwn%YW?`Fw~(LojVWYuJ+dqhD<>O7)uW&6hlp z2p8XODCBd%Ys39^@y?Xu=4dRqr|Y-!@o>fMO>_@|lK zZh7t=$-PE{to18kPE6#Yx>b5UcNLq3eG372yJ6uJMl8UKJ$AnAJa0kOE)4&%a zuBb+EaG}dy{A>W5-qb4fEiA`uYxZSwy;*ArlLJA%KK;7`o%12S7KI>mJ|Gq`OP&p@ ztuOY7&-SnNup_<|P;_Y&x&#*XtekYf;pF~1ON)>;F|#P9rEY`(^mm@a_(~m828LlB zcFDFgGbI$^ZX7?`k6N2UetxSL1>bkU7d;x2wV@8S@G$0L2O_GfP`Wx7mS{}wxrM5@ z)xMXs$9@a2Z-^xYZ&HBy_&0uc++^6KP6UVm5g-CYfCvx)B0vO)01+SpM1Tko0U|&I zhyW2F0{;mDe*#{dl2NU5up0mX01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjf)zVP~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..5d5c74b8a63e8e10637ed88f891fd5a88c8c3fc8 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|TR} zr;B4q#hkad484v7h_pTwPPX+uaB`1Q!qNoArX7t3c5sO+-0(@1bSq%&d%zddE-m1w zldCJ_wqfJ+?1lLq3m)u|5dQdomP3L?x!%ijQw8+qi+sEOIeb>j@#ZC)Ri8{gbj^Ib z)N^*-1OI=XS^6r8)2=?(B4^HiDWST`niUr_maJMOcAoj~iFDZwdc&G5$#p?z3NiJZZ|#EtmBb=Zj3+`Q@+C}Qx*fQ$*%GnK z|NFt+*0-&0-JY=IXm3ODy1#XC`CoUOpR%O;b@kml_g+5z>ACj4#t*-J`g?2cKZD!q v5Wkmc>B8A8PKlExfX?7cjqptK^<~fkvN<5`Vz?AM8N~8*^>bP0l+XkKs&cOz literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2a16ce8f9123031f04b5b320842ec1cf276232ca GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D{0fq~J< z)5S3)qV;Wz&hr^(#aD@xnKB7|n|6AA_IsXtqQ*x!OLm@D^mV-3c&C=v zg~{vPUgJl4D}+wmt-3r^RHS5~#pZn9uJcavXsvKPbkTE0AS7fz4a z=U+MnI;{Lz`=G3G?tzH^dp#U_4DII5-}-L)Is1dw&Ch3ZACagImJo4p*>EjsbKFLb zdLVf)id*Sb?eZNiDqme%j$b!t*ux@Z$zbAp`E>9bhoJnmN1uM&H>2i+?SYt+P8<`h z1rC@OJ&(D1>$=b(M~;PAfop|6u72`gXujIfJqG@vT8Y3Q=1Yz6O!M_+&;qi7p$i6= Qf+vG$Pgg&ebxsLQ07NpeJ^%m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/meta.json new file mode 100644 index 00000000000..2a64dca8466 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bluebirthdaycap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:dion_clawed для Время Приключений MRP сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..51b35857876b15d2de5451c161483e8881b7eaf2 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%s0|TR= zr;B4q#hkad4D(tHL|PttPPu1lqW98*dHMsHIY-SuSnl9lD!uy|i{HjiT}l&$l&`t` z+@E&Q>~qDU+3E}D73=-~`scgx!(%hjybI1fEtK(p9wGfl&_DU$_sQf7&O!`FEyW+l+``XW{74PT!7WTfXim5W$th=A(d5oTJ z;aizdZjJ4XPj?;_>N970>bLON`rlt37alR-ne=6kXoaW!dUxA6Bh}2?W~~BS-tX4i zAE+_+Pi)oC-DjEM7VZAU!Yj2TN6z<{AW)1iHNrE^*Ox&H$mW2mxfDDZ#PW3Yb6Mw< G&;$Tc%a<4c literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e6892e55aaec5219a86cc354c8f9a7f35566bee1 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D{0fq_xZ z)5S3)qV;Xq?%q}d0U5vRj4HbugOjut$-G*iBeg+zMPmFDb$R{|>&~*4Cn>4)JU<)} z_uybNd%f&u8}GB<&&ED^Y$5jcYpCM0D_X58M>x%aue=4e_B;<5plg`b> z3 gFEzq5&DWPf3&;kB92i^*o(!TrUHx3vIVCg!06adSR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/meta.json new file mode 100644 index 00000000000..2a64dca8466 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/graybirthdaycap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:dion_clawed для Время Приключений MRP сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..b1b240baf40024ffeb359279b2d15d47365dfd78 GIT binary patch literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sQ1F+h zi(^Q|oVT|&<{mZ>X?YmzRxsOeQtggL_6rhg?n+#cTf=M9|IkeJwzr~oN5c|>xgJJ; z>X$OSl4jib*wYc6%b(4ymj@*_wP=Ay7Vilyu(+f zY4si1q?-#fIac4Oy>aSv*kj|$H7A!(tJrz)X#CVItFKwM$b9BG>MNPIk7-@et~pod zu6g`=_O8iO%aRvNWAI(~^@q;kr*}$JXaD1$vFoSrmrv2BnPFBn^!{Qgym|Q7ABiAu hpcr3jglC$sFM}44%>h+&DR?r7<>~6@vd$@?2>=e;mlXg2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/ntbirthdaycap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2296ad092c7aeac94082ba7786b437d46f9666ed GIT binary patch literal 503 zcmVPMZm@SUi&reLdAzzri2Yq^hAUW5#rS!Dxp}WB!jT} z-)M|BDRk;UqKlluyoDYWi@?!F6H0!;3cN%{E8AY^x;RRYR=GVuVh z0?n#>kQj}fxts-<+w5QcvZUagK;#4QwkTb^JKl=Q&AnBCf*yH2epR}I-Oxd}lK_>%-LsjnsdP5? z0P|34eHE*5c?P+dI&rg4vSOK9pD)+RTM5|X;bnktNx*rrkb}VxHzD^x)IWXz*NLsw t;v9t?YDc+owsWE^7&l#*+LG@`mJ&O z=ju;z*57;|I&JB#ZF}vlPtN0OS1O%YGaJy*Tg)5uu6E9ujp+YHS2 z{7su@M*ja9eG}+v2>4O{Y~8Wn$IeWO?bl{0Ew%lvSW=qHrTF{zpQ@NipX;v8zHl_- z+;4qj-l^rxcIC`y`%BFqg_|#aF4Ok>F59?j)w1``OIIHcUZ(Q% zvgi8en@e_Pe3EUwa#DZk^!QsgF#8xHR`E~HT46SM9qSXI7+-3HXPU1sgBFm@0abG; Qcru9P>FVdQ&MBb@00B9oBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8267a703324bc59cfebfb05587908919e598e957 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D{0fq~J= z)5S3)qV;Xq?!3bWJT^<`a%e1OtUNbo{)zUKFLM-sw(|U3R^!ol=2BdV&H=uS%d>~;XvBwA75M?LRUtwkd>IdkAE%qH=Zxc^c%e# z@~ZrooNGGU`0va1+X>bhn-s(htp0LTmb<-by2p6%?)liso((0x?3P4cuw3A?PlY>@ zapx0%$62g9ne~6Y4`rG$b3b4EL$_!DtSgj$e3m?8^YYM|hABc$93H;PN-|f>&+fHb zdeZnNyXSJdr7Z<}?}@YWl{{g1FlY9YlW7Zr<((XEy}k0J_%ib$^~j!yOL-Y>CSEU% z{qjbdW1_;bh%W)ULLXN@`7dOD`ov!OD+~^2fI-Wb8sVAd>&u`8WCKGL3@!yv2GO3b KelF{r5}E*;=&#cN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/meta.json new file mode 100644 index 00000000000..2a64dca8466 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/pinkbirthdaycap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:dion_clawed для Время Приключений MRP сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..60faff67d0fd63e35fd00c852c4ebb65a0eda637 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9Gmi6G3l!hU%sP;j58 zi(^Q|oVPbO@*XzeaS5Dsd&j4+TW6dzRCyPCyX4ZDsNlVDnam}i>nKEFS@ zUlC{z1jsF{lCsx+dFkHbl&TM{%bw;p-;GsvI=*iz-{iNplh;qR(5-N(QF}Q_KjA*N z&H1OA2enJyet!Kn{LJI)e46`HcHh*i-);vpjA6%W@tCG%8++U;Zv(~nQX@Rme0>?T WfNTz^noGfxK`c*KKbLh*2~7YwV02sn literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2a704bc3f787e2bea5bb4b6f5f0adff9ccf995c5 GIT binary patch literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D{0fq}8g z)5S3)qV;W*eGLA016h zHrl&CcqF-lQ}IK|f4L$Xo|#j!e3#fQ@>tt>rO4{9yW*K8A)7bl)JPvU{Ix^iiG$Pf zJ7-S`J+}C^?xF92W%pXvbMKWkxY~Z8yTSMGl3Vikze?1^ym;CWX20^=fsEEIdEY*t zWSR|>EA}~%R~J#g;Cn&rhq48>)tf74A4y=zc@-bJ-62nGkBmo$)Iw|axtxAtb69-7 zT9w4AT#8~`EGqYzsll2%hh0dircXJ++@lnVTf+7` z9S=OOmLT--PSH+*2ocuR+sb!sk&b;}wx5Y%ALEtZYs15H7wQ0`hA%b3GtJkRK?}$R V#tIl*3Z4w2Jzf1=);T3K0RZp@#!CPI literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/meta.json new file mode 100644 index 00000000000..2a64dca8466 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/syndiebirthdaycap.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:dion_clawed для Время Приключений MRP сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5435b23a41f0c53da9760be8f6c1df6bc1b69afa GIT binary patch literal 3891 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 By(Rzv literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/pioneeragent.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1db9c7f166b74ea6a42763f734e04298663158e4 GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVAk?lWPe3~62U=+MQ-$4-2gH?cK#o_R*+?z~&x&&_y)eSLLvdD=4-;@m~I zztjA^>R9v}qny*z_%*%XFAcYT`DtJOw0pL%uU-0jyw+>)DbWdLbKM#~TT5-beDzw7 zN22nSFDatRQ@%UDYTP$l|Jd=E|@B zD3o&NMd&()m9?)TZtuA~St&O^Yf|VwpN0D0RiA!ws$aN(^~0BJuP^el(xNN#G(~5f z=&oAn|7z;5(&F$}TJ^P3iz7_j_W%F0Bvku)z>%66KP+9&w3p~arM_(aH;L(+h!Wez z=iX8!g4VZ9Z++gSxi#A1`o!1RBNrUg4hEb%>W=qcUYs4B)q1_oN>%Gy_Jw_-Wl}ui z{2#ci41b6vgUmhr&PgiAK&Z`Q3`o|1O1q)f?x?>Tqr-!O^qY#-$Qo!GYaXENKV zvaL)7pDtxu?a%(V!6ZO#y7L;Fk_ppSq(t>?+$(qZt5`!o4)dKe6OLbq>()PBvu<0% zoE`O_-^F~p9UUpMW6Kgz0gHUmrdY-a(^WpiJGjWl&kFdlXTgdkx()LWrb-vE=H9g8 zKmOD|@q*%xDz+PQ**JEe{n;S+gMBVzPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0+&fdK~#8N?V3+( z6G0fp--IgEVik&5DoSz_3tB~J4n+|0;!$!DKY)1f;K2_e9z1yR6ngUJ7bwN6f~bWS z3JQ^mN)aKg_%D@=KFiE9-KMQGyEB{8=Lf^&eY3mIJAX1+cwZre5JCtc`;?0Aoq2Ni zoT^V$r2R?BjfV@~&+*~;gDEwAWl~!rFXoq|aqmsk7(~6gsqCKY7p|TCphhZJH?2Bs z__evGsOtW|sE^%I>+5UMQ@>?cE-7q(^swQ__xjQx?Dl*geWwWk-+z9Qt}Kg^Uow2* zZPLSrKL#_k#lC~w&c7SZ6VUndRL+dwmkoKJHrVjT;N!Q)TLudoejj$6fJURCn$0G} zQo*A`*JVi6{@pl|HrVi6B=_NdZF|vA|HR>2$!TF0000!lvI6;>1s;*b3=DjSL74G){)!Z!;8RZ*$B+p3x0m*I9dZz1eK1*}X_;Wonv`5! zos?{AY46*$Z1P8Lv7eBBGg;?aQ|qFqN-hWI_fA@^ex_~8OzyJp&50J}YBOgW7#x#G zHc@Nd>vAw6=8WOycS)%WXKTOSnqFijJMpBvltib_{uX27*D>YM+8^^8&RvgR65&|j zoV?>)dfK(xl~NvZ_g|Dh+mRg21LkI2UAE%n@z)PmNSs--KUU`WBo$A?3ieYoU*~13 zHqPGrVUg)!|0{>{{@wohG;`Zw)!zr7ZTL{Nd=;aX`9j+{S9mYf3*S2IS;~33Vu#@| v3EKypes8P%dY|1@0(zJ)HNrE^*Ox&H$mRfI5V#aP8AN%y`njxgN@xNACtZ+R literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi/meta.json new file mode 100644 index 00000000000..3748d813089 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/captainswimsuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:shi_zzy для Время Приключений MRP Сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/meta.json new file mode 100644 index 00000000000..4d0b75f57e7 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:yamato_no_orochi8 для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "passthebanana", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/passthebanana.png b/Resources/Textures/ADT/Objects/Decoration/passthebanana.rsi/passthebanana.png new file mode 100644 index 0000000000000000000000000000000000000000..e34a6bc5970b37cca8a1c2cbe078f48d82525070 GIT binary patch literal 3862 zcmZ8kdpr~F_umXlVpwx2%r&CogWP2*W7YR7jv1+ zB~)&SBG+o8i`&Fz=DWV%*YBU-^Lm}5ec5BLD!1R@qxyoQw7Q>HBY( z>;&u#K6o+{+CTejb4{4OFoh7(<1YhLUb0ZC*t1Gum$!J7YJ`f9NILNG^Q)%2r4uZ( zOPG~4W#=kk0z!%?Rbq%ddLyE6%3hXd{LoNz{nPjJ?VneF6%G}(={`(&^NX^M`!M>Z zs9>wrggz7XYvww&$W*5h$J$tHjiUG9{ru!%hYx4p0PtuO<4s=eP)g8+SWTMzzf3iqPm742GRcF7FekYe%lk$8CXfdzbXI{le}QCfAsU z`hg~%&pe_II9AvYsT*dt4^1~2 zr1zriE)=?_N9rXU5)ifDYZfSJQ!(qwYP*4xdb=*^eyKuv?YsY#bR&qXSskU!;eJzZ z+$=rHF!f4-C}V$TjgLKU>-sT)Vn2h8Ra%=WKicD&wt_i55#3BW*|m!kZ5$syi5-$G z&SJy1uwmD-p2yrD`R0H5KHbCBXQ!;s)4NZS9#=fPkYD2;ZxIz0^|EI9YI&gG-+VM7 z7g@viHga-u#~?&*>t>#`s;*zcSAmOn7{5(^>HK!GHGfvay&qT1vop+l8hO1DVO5A*ZvY_Bq%W;RZ$Lw;Vww z-ejreji2G49a7vcD#L)59Rtl>nLc1?|r3kw-SiC ziSBB>oubk+^aj}CdTdIp*;6NH^y9fe6{issHZHI*RoMgKWi)nuY{OW(y$au&)f|Uc zgmoI{K*{V%;97niS6TDp&eYRxC`8uCVrd~Me-p)*@@hT%wK)^jO3mCbt8A(J8tSfE z7q2+daAeFuK91qKkU?5j&ulG~w6P57V4Et9w) zj#fEL-G?v)Cj@wR7l~yffsdADNp0<0M=oIvf&9B!0~|h$rw*9J+F7Y@ z9DblINb*??&$3B_A{rqwrg6l+q~yiFVLIZN6BX^00d-Y~%cHapZ@0&$)ojRBRf+HL z@<){@lxw5yD*}2EVesha=z_Z?6JAIi1jF0sXX*B?l@f>C7mVG;j$F8Ldh6PiVtw{M z!s;3tI&tT8#-<{SK1XcUGwmZg(i48fnTbQXVon4Ehuw0d-~1j&bQNIM%IA{azw@>> z@Vf!}dE_LlHO(x1fA&tVeyp*=^Cenv&sGfE{cQaWp?cr8%$OAAR+m=R%LRn`VWEM8 z=k~5POfkaMgo%$FwOa4_#r-_qH1TS1di!z?CS=C0N~6TzAWSJ~Bx*VD{Al?8THTb= zcEnWTD-4IvMJAfra!Z>yJheP2@-SV2d101Ph~MOZ0&dOFFkr#7_2HBx=5pq>v(nwc z=k}Uqp8WkxqmaIJw6Z6% zyx}-M;)biohN770$R}Lo8#90@YKzi|xTD8SV)tUnKh4K&sA0hJ^76lCbJG=?>bgq$L1b& zehD36d!7dVX*K@8FgE0kG9DyFMy!HAYY}p5JKe1_=*Z3jM+}|!={RUj;L@&F;Jq_c9q$u0rA{BM+=<<-r;cZILa%xeG=YqprKmKI z14-PKO3mADxOt0136b)WXk`HVcE89Z29|WSa_+s{2<=wx{Bf~_NYkwKroIok+492} z#hJOjztY*>k|vCWUWc{AnVp96uXpn2&O6Edgdbes>StQKA8xJy&EQOh7ZOQ|i}Azq zilKEcC@kX&DLp+sqSUh|`VJom8}Ihy0*De9zf~`GslieH{>1~J$I09WeU7BNr$;uX zr?1(@BUQ1(F7EJqCNoXGymm;gtrgY^Vc&JVDPW_LY~}jBs$3SO*+t+|96v}`dd(j% zEbba_Wf5|LS1bKJyXl)LdA_V@9{k-iG5RY2mRw3*UaTeEmC@!dC%Wr3G!JGkgw)F3 zt6kNKB20*#?1CzW{B~9cH=eQqGkv}aBZ+8!3HJ)=`_C!Iyqm_ubG5X^Q^e6oB*yF0 z%7ehO6IvbUh3=GvPnF+Hw&ey59VqzH1Wx)ZqZ{1ZSk_B+LxO~Axr2oAzxpj91?+1axg$s%2o_o z`J4mFKv4NLQzU@_kFi_?Lgiv#C(w$!RA~gAIi|s7PxkC#MD0+gg%akT~O$MNv^v zm5QMpb9d!$o+gsLgRl1Yvp0?L<;_33!Gw$-Xl-@10&!bMN5|eTsgp?9Xl%W9{M;(0%F%bBQh*l0UQYfVE3_jK)zCeAd_au;Ff~#+p9J5{gLst zJV)sV-G#gCO=B4x0$2B9z{eezE6WCZ<>yr8cV0ng?>;iE0ezz^AZ5K!3^oR^L*No& z<|UVRiC!n)O!CH!fGw>CQO`S=TD*+2r$$M!NXt6+cEFluK`_uz*wcS=C2ULjIS!eA z8=pD|v157z-X%>;wj2AHrPi+?Yw!i>BO;r<3*aBq@eLO%jM}zX>&(qq611n)ngw)* zBtwe&aX*xlrk=>|MtfOAB7GHN68@xM&cwmx5?wFaIrgv;N;+2aP545 zRWkD0?C;*NN97#Cop>L{#J-KdkAdYb2xFEFs;N_4VZGG-W=bl&j7J1dm!yjUNW2jZ zRF@vL5+`jS#Q_8{X)mSp%n@qu63q+K<2Ru`gQvpq1m{Bc;jcI0gjq#h zwl5wb$pU(k@Okj8vv`8M=$#Z#3WpH30Xk>1-*y?32cO>nUBDBDAQ3E}eb-m;OAg^u zIj_+FNPr>S!UpINPxXe8caorH9V;R4^M4jxjGBu4e=WsI`@ez%#ZH-{kJJwbe{uN# z&o1%5&YvR|zg~&eR}ditfxOm1%|Kq|jqF9SfZ6iir{>@QUKH7ObArehUPMG|4y}=d z-2pn!@85-I-QET>x|}9iK;v_eHZ%(us*CN0KHl90VFNe*mm*EX@p#)m=^^Kiy=n(= zX*EEYXLy;`s<3qs^ShVq5}3T$Y2KA^gRsj55Q{FXgA@*!Fpel6Ze4|p z%y*hA46Q=Qk9N<#zB&ibO5O&Oai0tNASi)Swcu3jyyfadULTsP-JAD5z7f_fHUv^NFraPvXKL2gWo7~hi&=PWT zVpU5so5AMf$+sRqNfF$kH5iwHT*eBS_#S=4X{*|WR7T$)b+c>FG}(g9|4#EoM+ zz-B38rDVKTnt&Cce;2IYpknM36z!xFu%*Di7Z3TPUdJmd@vykTGU45;xBWe+OUpl6 z!q1>t3PGo>g}*$26Xw#S51t9yJt|(EUWEUQ;#lq@H$W9YG;Gf@_7OGUIT`Tn($;46 z&0O%`a>?|)rCh6)-6C>Cw~JH^JKAbJN;I{kD1>#Q2H)EM2d?|E^I+4p_ifLq;@LG* z%V0Eic4Jk-XktU=zTmuS%qeq)K}duSo$)`^eTT(&omd@uA2;u88; zUCk8rp#BhU;{fvD+Mq4y9%N}D J{lpTT^dGP9SZx3R literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/meta.json new file mode 100644 index 00000000000..69810a18d1c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:uma_eso_stabler для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "poster1" + }, + { + "name": "poster2" + }, + { + "name": "poster3" + }, + { + "name": "poster4" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster1.png b/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster1.png new file mode 100644 index 0000000000000000000000000000000000000000..8401cb45447ce2ae9cfc0897bd49188348aa80e8 GIT binary patch literal 1307 zcmV+$1?2jPP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1h7d&K~z{r?V@xD!z;bRoK{3*ER-5@#l9lgazx`ObYW8DrlaG46WcaevM|-#zy`-@Su7-khZT zhjn*%$F*8b>z$pQTBf$QKW)=m`_lT-(o&`$D}awLFT-(T#1W@Ch(Z^LfhfpnJKWBj z_I7~>yU>1Yw*<>Rie|oYAQ|-)$=xnYTB3 zd(8@f3&oKuB|n1jq{9^_d2OE>`2~%7ey7dIFj|ZN!59#B%LKqPq;uUpK}4RGQD90s z-`q^V$e3}Sf^&Bw(9Wz8-~!yW?n;gzVqHFhn0fsktgZ@3?Kc1wgw(^P98(g3R)XHn ztN_#@&zHMS0BB$0Oy>x=Sn5$=#zTT&1QLR_vrGU=9z9nR(sXww0xqh3*L2>~z00WA z3uZi-LxPeM!B%m9Bs9AusS*&90TItx%6Hy;5DSwJO~S8B=fqLZT9i^Zj!` z&rw3DAOsAZvlK9X!NCDPM!CTAXM}c-$LN7XV3Q#1W(Dx<3qPUJ$Sa8F2fjz`&k{~g z{wUuMI5Tw}Llf6^e01(>jJ)-gnJdwn{O~G9-@A&9oA&+D43jeK)-7|MD27_6t*zBC zefE%≤`O`yI{?-Y*TQU%G~o>JglHyj%F^VEW1x>F?psGA$DT)93A1d+_4Wx7uEq zcm#glQy?#ou4v!<_#sWj>WM{dA3R9;EhdhE>I27cad|`QS!Ruq<3*Ssu4=ti)#kmU4m7uA;YvAzpL0=>V2~5OXaIAcnNpTMy^1w` zWv+l}XI2g{1E_@5`ZTx0CXd0iRrhrc#fKuqi^&KV=lmNT$jkzAAPVcUP9%#Kkt=TD z)P>J<%=hoY@KaBsl=E=*{dafzX#EfMq9WoH5ODSh@0dLT3@wRARZ9ps-un#B96OAu zPd>%^hQZ%=-wd9+cTDS4#qj@n59l2rAvMm;Zcfi$#_;SSPCj~EIA8!c5~YgBGEE6c z5GvujZ^SIKrXepL?nZC6&60}Hg_n+FYVauLzW6|-*9emy;M}AD8LfF0VwCyn+f1Z$O&k2msLws-htzfpg5+|AT}N3{Fcq(D%kg9PU4l>7Hp# zLz*i>#0ade{$V1(-$>N7Y-3g-8hxUaEFQuuY^%^{nn}9(!gPvMV_oVw^9ERN6yQtl z$9y-)qlL@QeDkaIe}O#$6rz?#X2pl3o(PUOPc?#3FuNA#5~P&4T$=sutPOyK(aM43 zfsv$_d4}_?$lVe|8geQ1VPe*3XPKet>grP3Wu;Loxzai8yItLO1b4ate*wH$#7sFj Rj&A?}002ovPDHLkV1i{DXe|H$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster2.png b/Resources/Textures/ADT/Objects/Decoration/poster_oneyearbirthday.rsi/poster2.png new file mode 100644 index 0000000000000000000000000000000000000000..e87c4c0d6a6fbcfdb05dac9c51eb442d9fe0ed96 GIT binary patch literal 1428 zcmV;F1#9|=P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1u02HK~z{r?Nx7R zRb?3eopbKp?$z9Mw*F{Hq-M5iW?4a)`9U!IAlUq}C<3jBAQYky>`NpBNuvlQQzXg= z89^zPu2J}*oJqC*IMix$t5qzgXPfu#?%Z=uzu$B2xlZYOAKH&??|Gm1d7tO^{CkHf z{O{rDPfJTn?E60I>+4M@XfI5brI@Un>P^PwXOnG=jQEIShq5}fx3@c)iX4YJ55eI< z>_kRu==UKsTwjmjJ|DSd0p&3!j^_|OFaS4n;q9Ai_loOIBCILniuaprKfLiMLX^Ba9h${|aOux;0Ux-$=;)rGs}xcSWyd3l);I0%u+dP`pa4uQRY@lU~X2eS`~kC z%1_SpW7N_=(O%?3VY|o6RMAA4!}NlbX=Mtc5d>xsbO=>*nVx zWLSdc2xC1VS8bV|m4DOmgsz$+L4<_!j~&PK{Y{pYnRKpEY}~mV<=TpVZHa&5OQ#?K zqyD9UV8#W0NAOPwnI~G05sy?wGsMFTlb?Fo+rT)VUEb8vzD-l)3N@*+S zXo!v3cyg4QG5WXgS!INhg|*{GqG#=IT!F=#_-0tNyko?bdSxsbP02JJDJ~MQ#^Q`J zy-n8)nqtUW+bmP2Xa;Y0DhB0%j=eI5I#ws&B%`%^*8o?IZH3&9r;~=|9r^IKKWBtf zR0(K2)O<x<3XfB?;A#MtXl}Huf_7>()+-E~#s5Bvjj5pPXw%mu}c#tJRws z(jE2E@>f>cs^D}#1vw>8@m_x$GQ~X49b^l6YqpCGm1IPFrPH!R!7Ikz+$Myn> zES*`@bY`{JYEQbgH(u&Gf{u<38w#5Ottrx1N=V0LGSc((?BDkKzFaQ&BO}QN$6f@I i%@n3Eg(>`J0R90P4)BTPdXaPh0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0%u7?K~z{r<(IKe z8$l3;7ib(2WTdN7Ml{qG6{%cUqN8!BcmXOa4}hXPLF9@yMXJaR9g-!eOoiN}p+S^X zCt(p3HwgT%=U>L_yY%J%PJZ+%o zIPUd&g<1<8xcGM=Rymj5OSjwE6>FZxQ^WQ9{X(r(=_`>E2XXW?CI^0;ybMNSZ%pfM%~W+EU0bK(Hk z;KYQYZ7U+_fKHwe0TIyR$9p0s*MN4qauVX06>)Wv`?fzxgW!Zvwrw#c2f{H^`wQVL ztAz$9h*cbz90*8=DZa7s-`nV6V;)$=fysfggnD@R;08a(zF(H41G)})q9X=z-4o^v z9j|;0J?e<<9Az%g$L`Cwn)`e1d=DG*fH_0Qmp%nE4?u>WqrnnXB{iYniDhR^ORmNbRxd8NYWtby?3`fIWr@(dIYa!_Xlc%f@ zErQQgK8CuqVr2+(yvMZt%H_CPO0p>e;CCnYr$HYPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0>?>2K~z{r?Up}i z6hRcmM^oGx!E*yPl3-yiSP1?pER-c6hNL(#5XC~f6e+E&?1dDu(nx%iV(~Ikr^NeIz4?_8)3$7?xxx5kSWFr?ciHm-_%C(z|4m14-ze;R1xCkK#GvKg11jpv*00u0`PK*u#v%KOL7Z} z5EOvoOOmgu*L$x=WC5cD!R?lO^D$AcKkS%UK0yH}z9>4A8NdiZ1i|e?2?e-#X-W(6 z;T3@PaqT;R2xh{S0RkbV+7L9GORCknV`jrSL_nYnjxA#m5?>btFQdJ^1vAUX)q;S< zxIc3}_ckn)0fJV<%HQv2t9(V(-;U25k9;EP&~WyFSQR5(&YKzst>^6V_!!6#|vMcW+x$i zfXYWESP##8H}v=~1Tz2z3oq2!PY<=hC!Nl5Jwk-66`N8gA<|oE-qnF&@bgm6j}_F7 zeH!LbXba@3rEi0e6^P)`Oc7((fMjj$n(;>A$0~x$Z$emz!UC3;H;p$6zZaQ-E8D3) w2WUQmM={2{6w2b_Z}80J=UqnsIb@Xj4O1G1TG1NHb^rhX07*qoM6N<$g5`f}x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/meta.json new file mode 100644 index 00000000000..0e8618fa14c --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:m1and1b для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pbleft" + }, + { + "name": "pbcenter" + }, + { + "name": "pbright" + }, + { + "name": "ryleft" + }, + { + "name": "rycenter" + }, + { + "name": "ryright" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbcenter.png b/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbcenter.png new file mode 100644 index 0000000000000000000000000000000000000000..560defcd6b96c3516d079ea506b97e0591974840 GIT binary patch literal 689 zcmV;i0#5yjP)Px%Ye_^wR9J=Wlf7#bVI0Rl&v7p%7mJrtwb&q1t){w&lN8*7v|#PfVmHw#pjlkq z-E{U3aI&MI&^^?xC=IoUf;K9Rn3VL6_Fi}%humG0SR7ov&vyLYzTYp;K}JSKM#le+ zn44Wvx&eiPMKn1o*lH03k}!}c)oXhFX62uj&&@9NjtDSJ4b#*(6`bQ&{;P6bpC|-z z|KU@%9@whrI2?cU3V@^-4-3Q8&@_+|qEI5`pQ7ewm(VoOjl5&n>?_+-6Z#NQ9p(V44~LK_HPA z#)vj{26~l(l6y&9Y2Q#+C$57J-+peVqMgz-I)JY0qTT7JqT}GX9(KV7Aet(2d39Wz z-@T?zS`z@A87uKbyQg#sx^4h)a1aq~>@c!&7ti(B1KOPq$5ua!(H9fx!Q^<$Z(;~b zK!gC8*?bP5ijI>u`#~T)&trLU5@0|8z@=S6FLQ2$erjTW_vWutw4)wrz{#ctR9Ksexfa*a6tW0 zDfE-1l`!nS)~MjieE{Lh{nS0s`wRL-{EgU!vb3Ct7pBDNDbp~-u%JXlMn*tR X#9S=wxdE4l00000NkvXXu0mjf;A}z$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbleft.png b/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/pbleft.png new file mode 100644 index 0000000000000000000000000000000000000000..8e33e5ef0b735c16bebbe8353f2c0570d21ace4c GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}n><|{Ln2z= zUNYo5a5U*KdNRpx;%jr2z)!N$8{fakk+^XQs&R@K-lf@}Ov2{&smrR1d zob^)6X0qoyXfFLXccRsnm^E|c9Yi7@eZMi~uQtQJkcP~;Gq;?INphc)Ud=9GukNPf z5S99NkFGz1%$sACL5vJc$-Wn#+>tkDxc1ZU9XmtcXYK~?H!JRThF%CYv24C~p(E_V v*I!pU*f+#wbg3P$TA1<|{Ln2z= zUNq!7WFT_vW4(&*qZRA|C7+b?;udhk+V&oQ@hI=$U1f`~f}*T@3CyC+rP>|MlOt>P z>neVzea|{2=+*t1I?>Dm&xCVA%YBR0Z4%<&`SdVto7*QD7n8nv*6p%Z;lv6H=~EIP z6Ar(;W!o)t|Hr>gvF9EwVQvnb_?=z7X{*_(SHGDK-2S4-(%0>~hv{5rq0&Vrd#;N2 v`}hA!Wo$6<>=9PgTe~DWM4f)h%Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/rycenter.png b/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/rycenter.png new file mode 100644 index 0000000000000000000000000000000000000000..746e2debf4c825e8f79e1a45c515574f69f080a9 GIT binary patch literal 673 zcmV;S0$%-zP)Px%TS-JgR9J=WlRaxwVHk$5_vCzpp3sj$1EHx}A*3P>j!KaZ0b3n(2wfZ;{R#dA z$F7P$KbbVV`#kq^-!~j6C@3f> z_}>v5>useQP^nlfIRkNAnI#A$VIWZ|9(uXE{ZHZ>>+Sf60K?QUO^qu}mrtMPl4pr5*8Mtm{V(Ih;7at<- z-u|W*=Hp}bOqVdRuKA+v+&@qr`JbwmUR zfLHVL0IF)+*|0YniBr#`xjzdqVE~}ptFgUvSvWf(tA_`wS*^z6IRk)b?$2VGK7L?j z8UsfHhKMl;f%Z{LzS1Ac`iQ==N$@rk{z-mCGVMo)Su#1(+s^V%^L@id8C!{&0v@Dv9Z( zd}Ka-1}^@JFKw_h+?`Cv7WbI(@y-A&h@( z5r*URK>QcvP5g}{g))p-C{NO!vPvZ}Z74NSP*6}%a2CG-3?L`2cm3x|00000NkvXX Hu0mjf5?3zb literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/ryleft.png b/Resources/Textures/ADT/Objects/Decoration/triangles_birthday.rsi/ryleft.png new file mode 100644 index 0000000000000000000000000000000000000000..129405c21b8d81296f6f24917782f3f3a9462327 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%RF5iLn2z= zUNYo5BeU9G7lDr=atAt;#LVOl-1^M6+vWBVCr`mmW^4zKopLOQv)wR% zChO8EzslWSElk~2ysy>Zjp6J#-!dtt2i~k}E+1MWmM-ot*Z%kpqt7vMPx#w@E}nR9J=W(J>0bKoEuDf3p$ADgisu!c%wwFA+S57s)B?V<~om*x049h=>G) zB#?zjB(afz*sq22b+gTTvjaj1@$Xa+ECHD28Hwk&W%=M)L$p~d8wK3)J>xp^+r;x( z?Y5-Gu%FCSWFsAL>lTrv!!@&!uZq;sWJ2%$I91t1%Qw3>!x9m=k^NR zibAEvSPT3rP*l~=!r^^_zSb%=hQ8KT?=OT9LI{8tzSlVevNYuL00000NkvXXu0mjf DwIy#K literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 3241bb20b1a..2ec435fc28b 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -93,6 +93,12 @@ }, { "name": "plushie_timrika" + }, + { + "name": "plushie_amira" + }, + { + "name": "plushie_ovai" } ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_amira.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_amira.png new file mode 100644 index 0000000000000000000000000000000000000000..71fd63de223b4e124dfe4346b5bf9cf57e9eab3b GIT binary patch literal 994 zcmV<810DQ{P)Px&oJmAMR9J=WmQQFLRT#j36K7_ZeUm2RrtD=>K_d}Mseh3i+=Eb&l+Zs4(qaz@ zEv3>!PX$4|Hs;pSm>%@tB{>u<9wLE74^b!;60Cu+3r)ag4}#rpTX%M6=S_AzY-hUD zHoLPVJ&1lV?3?d>@B4o5+xNb2;D7lyNnw80-)Y;PZXA~8{D|ZHjhp`3@~XeKyy`!0 z8`rNI*D%%hJb#vpr1~s=|M^#6*AtQXwdGacwkw#*T{f((Rs*5Co~GXVf7&G{jOZC9}E3W*1|Siew2mTO)4iUp9ranrBfzYBmY*Dy}MOnukT zmiFC1be)0B7jGkkfe;1&!C9#98bXYN7;oAIz?~%4A=ESt?_qFF(?Y$jC)nKF#C0Vm zHp1M~oEX0yb30vRz#rHfd3PKK*R7MR-ND30S090y<{tj8Rd)uU^^OO-Km7g(V;{VW zaPOh38oH`6`r%;?961tiH{AdLNGZeMj^kjv9)~@kWlZPE2uXVwzJE)2ufXgb)ZJ zuq=!BUO2S2?0!X)3Fxeh>0+L7RfVNj4uoVz%LnjE0d9Bli2(6J8a zJqlW)dF8(S<#MP$Iy1s+sVo4WeSJ2vCa}|c6zp32#?%&I_~3D+TK$Xrrq-b0^;We05W#rc>Hkm2KVT1@ea?rY Q1poj507*qoM6N<$g5;d&00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_ovai.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_ovai.png new file mode 100644 index 0000000000000000000000000000000000000000..7b0a187e68480a34176cefb34dc875160a7068b8 GIT binary patch literal 950 zcmV;n14;aeP)Px&a7jc#R9J=Wm0f64cNoThX-(2BNt1(}?o1nI*@qu=-MWpT%m$%suw9Hz=1tkn zE`;F(@kXIHf(|AK8$%eBv74$X zNs=NF0U$-A!sqo0kxLk;0*+6@2Dwc6dK0QC&#QjaBhPu z0mi*7M(R8OHF!oUAPT^n$MF-75RIjxFolrOrc&m>uE`V*~g!MoI_FI%I|lr z?@V$DMgGA~uPx6LUfXmA8d_70 z&MgDN7m_ei=g}WLaFasE%UkiS>7k%ZF@JrcwHBBKs>y?)5W!HWzTp1%0h*Enta2j& zVE)b5>7+8@!B7ZY*DWEsrrBa=|M=CFv+zGQVRm0T9s9qukpt+uZg*n$Fv{d%@%+(W zT&?D&4y;dH69BKBNOSq)lf2R(Zp}~sknBGRK!5ThAnk_V*@0)beIoebTgtc6TdFXd8^O9wIlgkE|V0B!P&6<7Q2ovZt3 zJ9ipUDo`#J$&HUL?^lo;AN808(ib!viAh>Zp1z!s}l z`vgpcKWE_nch+qzH+S>16U+g1QYmCvrhQRjb|%Nv*!H@CdylCM9~ohKdK!SY z!p8yVKj@@x)bErySb@M2F7v32Xn%*^oD^cQqq z{tECD-ZUWY-MNwG)-freHDY`aq z1z`5S--yIEl07|QtJ7>1d#bJ_s6L5NZPg+ov5gcpm7=EBC9iv`7GSw0$A{{QTtPiN Y1`*1PE29CzS^xk507*qoM6N<$g1p4JSpWb4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal1-inhand-left.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal1-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2593f1c6a591f233afce6aef70e7da62b768ec0e GIT binary patch literal 629 zcmV-*0*d{KP)RCt{2nz2d)F&xIfI|OSdp&&}F1qUbhdw>oOK7f;M&UJ8f z=+GCCg5X>zzJNjpAHY}WP+FwDp&U3BhhiKw(wjTQ82!6q|2s;joBtYoJz@|BG>JpbCe@rTQ#r0ce-I3IL);9Z{o> z_x==h+m{V9O2AS6MT*Y9gR05~6=P}hMCrkG}a#B?W;5PwJO<#rLgc|G-p{tP{T24Hc- zfaDF2myhc)u`&g0!Cn9X@^?V9@~EmGU$g4y`!`M6>TOSF*3h5f=Jk}?X8N4cJ3{qi zgR)??%Uw164gkCJ*0{R9qoyib&pOUEn2Bqhr|$y0JDY4ttIz{*u)oEYbdOG_PyfWTp4{q5ClOG1VIplwS{`jZ2KkTlm$}^A#x<4STH^79+GmsYgp=fXxF09I|-N57- z==rl$x5o4UJl!8Vbs$RLtJ~$SVt4~guss8Gg9O0y2AIgTXCSNFVOBkIGh_povcO6P zWaSZH)MF(8S$PC<=|#xuVl>wmur38bb^$h7re?0EfglKiAP9mW2)X7HTb?hA(p*_P P00000NkvXXu0mjf{aX{E literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal1-inhand-right.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal1-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..41811e0b4360f0279b1d433fd16c919999943447 GIT binary patch literal 603 zcmV-h0;K(kP)|+VAf}6#+K_54xw~BA_gfT9zVDxZzPppV4>)o% zhc5WO{Bqd$s&#kp`nciMn++N)UnyYL8aex}kDD-h|23dp>^lHpn|0V`9joCI^RA_> z31Rj68qh5D+?x#Z4aS-6{-(1D0KeY7Lx5o~3;@7txO9W+#^dzf9q&AP0~xUE=xVrh z1M3Ex^mz388qk>3GUMzTgX|i>ucO{Xy27J3Pz59fHWBi$_f0lSJ*T|M0RV2cpE|$& zFnSL@3|kS(o7|s?MpvZheR+M?cG>eoxZb20AceG=5O@{1I6sl8BQ^pXaD8%!x68KAmvfIYl7U+hDGA-ivY#bfd9g&};t$wj%@dk!xe zZ_M3%qTs3k)qMlrc-03>_-d1=UE$ABd{*muU; zq1Twy^ypJiePS#lU!vv!Em2hkvhqZ(09AbhvhqYWKvmy>mi-B;4^6c^q*WzKRvuaf pqN1`awHyKjK@bE%5ClOak{@=|G$GV!kc$8S002ovPDHLkV1f{l4a@)l literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal2-inhand-left.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal2-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e539ec40025de64751df0bd07eb197e9d9f7f14f GIT binary patch literal 634 zcmV-=0)_pFP)%=VMq)%i2+Fw(=2SYeOhaOAb*fLNDBX8 zQw6I)Z0!7mty5bk%|a>(3xcK!gdj``v!dcCx_6cxe5Vo}@65b?^Jba3z=2buD?UNb zKeq__Y`qnZsA>y?_0N5TgHUg3zKw7YYX96{tIvWK0M+(107R7l0MPk8M(@41cM!rs zsC(}{bbgPqsGIh~f)ar8U1L6|i?i|4Z~Fuxo%}jIHryou;N~+yR0(i#Hb(pv1DFM2 z7t;3eSG=SL0Mo}0Y8_Bav6SZb8zKY%l6eqzVf8o_-HCaz7Mz6)H|PS}!Gp$Fjl>Xa?%9{qmb zsbydVSAt;WP4M7x<>?E8AP9mW2!bFSEZk#e%Xj%U`r(}iki7vW*q#CEfe6bRV8VuH zfER!kN(^s+iEW;NMUTQRP&44>HYsKG2AJ678OQ?NACT1>V8ZAbK$1z9e<-?Im07!i zK}U_eOt;4L07Nf=W_kmR{g6Be^u1cOJx%cjm>_!w=mrUZ=M6AXXwN`ix5KP{_c1cXiGOv1=(E{08Y% zoC@ud&5w||vvXVmPErIx?IIKjq=Oo)P2=UyUC#LaCNatTK6&%r9o#*@nNvD?#|!-6 z_anpoc@tCb1#2*^uE89de$?%`lR)pk1yFjb4*+&m2LSZfWmqFi+9D*?8(M%$w-Y?n ztj&L2leq{$e7(^_0Knbn6n0fdvo?pjbc3L>;XRK_KzzMN3jhGd%EA1r2>@`HZV*^H zwv%2Qy`cs8e*Y*bi#C**8ky*1h|tT_0d`e~v2wB##EJchkX3Kwm#lOFSA<_yv8J$Xk>izai@>xB0Kj$YlBbT`U@pMz z%@t1_ax)kV3fcZl6#eCyhrn4=^e!L>f*=TjAP9muJCbi3i}nq0%9m_EK(KGX9GbpX z*Fy8BC3XQs`v%OR>02WU{dF1pd9xx`0Yv)-b}#=YU+zNyVtfO;c<#~-@)`F|rt^)G z=3!&yz=jTB%EdEq7?Z~db*v5$?i)Ca$6>WewJR*zH(mE5FiMGAP9mW2;wC90WOadLAJ-qZ zMjin0@$d-XI|#F&pV#keJpedoAkF4W3>F${RVhq*dqv z*mQa2FSYo-pQ>qKg|r00%AerEla{Y92!bF8f*=Tju&_|KnQfot+h~WjAHenom|%Mb zs2d_IZ-5CKo&j0__TB@B;SDhHpJyQKQJ4j42J9c+IZ?d5H literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal3-inhand-right.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal3-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..36ed87945aaf975f0a2143265e27906627841328 GIT binary patch literal 617 zcmV-v0+#)WP)Y}@lu<45nt0(6Tt1^{_;4%W^f-Rxsz^|UR5U%ie6 zXq6kwKTT!@ByPU(d3gu`S{DHj*SmEDIINuk0DQf^EraUD)yMO4-bM7L+yWPJlVvqm zgX&0qYA0TDCrm`IV+Y*6KO~095(X&)lUczrQ9!NI5Y_8>1bAEN4BrSv^lp8Vt#X4I zi!lJ;>}Lo-@3-$quj^v?iC`?o|27(3k)rpyd8h5M=S1jwcdY$$=59wwftervLoQE1;r~s;c1AOu8`63?yj%?omkH_P) zb|&=w#?>FN2^GG9)tKw~!a}G6RQm>2<4tA-DW^@~5m4zHc)Y&|eWUeNQPsWye(ViW zM(9`czJsau4Rnh&HcXZP{EedQe4bE!V=N;d-3$dqRTs$06SxCZ`37X=30weGz5y-$ z392tmwY;QNB}!HvIt7BFvMse70fHb1f*=TjAa;^p=GH*ygVVO-00000NkvXXu0mjf D(X|kS literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal4-inhand-left.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal4-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..531b91fea4ec8ebef26e7e3fc556c1883e9a4b93 GIT binary patch literal 656 zcmV;B0&o3^P)6<|aOai-Ql* z7pSXSw?a4TAktSTx&%9^(Irqiv>gK1L2sy~QEUDia`AjqD9L}%Jw5l{kn;oo9EUCV zeC#NFUF@pF`fR;L)|g`R!R888j5|&B-Tgl??le`dP+h9ef|h_@y%GgCXw(q;9wxU} ze@?=<(^Qk&D}=s>L8G>G90rsGvp+g8oYq^yHW6vB|LogOQ7%;lkYt z5c+S(6{^sa`7QeX(Dx9GYLOlQ9Nj!p_W|l2pxL{Ah^|B5L+E=eJ-_&j*30ZBc-Fsj zhO-jxr{(CkVB|*Es|LR8{&_tnMk>G*>`IWIRucbZ1u6HD{D9_ z;jDj0jhVit^oda3c%p1ry?R9rXC(ljPu>{k7njshW$PKox`3J3HhKCfkl$WsOB#iq zfSuwdThcz-?Y33RzzDV^!KybwYp~_t7X(2N1VIo4LHM^&KQo)|<(n9X_C0{@4Tyv7 z8K8dP%B{n*zF7Bu0L|tQg0!%o$OhP}ad-aN9cmv{K zdj{wR34rGfh$GXUfwa2AtZ}3>WCEM2z(@t8+dQXA|%av+a_S^Qp_J<~l-hT}kwyN&SV@-u+=va-q!kQ3OucrZ> zM$>)i^R|fkV2ZJ(0)Wsa0O9rSodN)0E@X@~74n%0%h27RqH*=|E&<{7`WgTL^}*DA zwhY}3EE>+D7e=qA0rzjO(ri<~WUaWrnG5+(B9RHIH_!-33)>4}Q1*VwPNQin`8fdK zvM>W6_ScW1*S9myj-ce{?m{CnO!PiHJ_)<+d6Br@v>CvJteOyb7bu>evea=f0vm8q zF0j-gHoaailfyp{S?_$N{s}T8>!W}m2!bF8f*=Uu=!kr5%)4%YRlZ2)0le!5mi@M! zE7d&n$0f7@yz2&*{kFXtbzvF0d*z)Zp$y<%H{f)BH(!!dAQ$yTb0NdjqrUKw+DzeTO2;MiwEb^sl4G3?*!h7e z$Dtc6HI@FYuC@Z(XWRSE4Aa>7U~@}pRO&7D)BC?sskc;aDLv6X3tB|oqNmlftrZKb3k*U3jm!+}t18%Qvb>cKR4xZ_~z2sets}{U|f-w=D9F z>gd^p_v*V6^yDYmV?$j60Fa$)<7Vdw`9>AbFFgRmAoxMQ|NPSXVh;c{`+$W2=!`uS z4gd@%p#$+(#{V;JFS46p?{3#gbO%Uw`V*h~9k`8&nxI#JMsHk9dv4K-?kNBaH^YyN z3jlbZO#uj&O?~X?%1U$x=-us7$4oCZeIk5hT*`*!7Cn{d4gi2Yd21Y(�x!wr8E# z4VX#XCQm;F78g=%lUAVzV09(KHW@!^wOXu}ffeEs1Z!V{Q%zj5F9?Dl2!bF8f-tpk z@7OK(@@@E`-3PF>0Vdd*0a})vQd6A~qzeLCF;>}Rd~sDNSXTvwX*lkD{W-8ZD)2?o^$m@sJufZ2>0r0c|CL*mF2&+5H@*|xg8^oy!tW-c)8UcnM zD**^gBM?a~LRgK_NH<{P6a+a1*o0Y{kzNLZAP9mW2!bF)noqz;RN68Lmg)ci002ov JPDHLkV1nW!C1(Ht literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal5-inhand-right.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/bal5-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0e81801aa8f7dc4375314e0983d70ef4d2012ab5 GIT binary patch literal 642 zcmV-|0)737P)~95(H5#oc65>+Pi4c zBg_-DR0x`VE?NYF%&H!sMLxi|2wa4aqHM_0H{p>}k`jT=%2!i+yeApPg0vdL!^6ye-p)^myAVvJv+d` zSy)s?)2*qs%MS~`WcIWv#yJfDFv@2DsQvZB==B_ovm=ain!C`bj1;}qy9Z^ry?Mm0 zci9Rcg;gzr?_FSbCnHlwV)!n=!G2Dr4z)2&b0yo~7pp#a-&0_%S@kYp7=~dOhG7_n zSvx`>8&mrRWaSHW9zg9IFdDWf6|-~mMfa2$;Tyw@erfTgdPY7!6z0tuH(t zp1JuZufL-br~{~d1J2-Q^Cdn702<$b6R+LryZO#E0mrEBesEsC@&PZi&sGA%MTBC_A4osBesA z3ePf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon2.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon2.png new file mode 100644 index 0000000000000000000000000000000000000000..18efea153dda5a86046d888d583fab76ba07a9c9 GIT binary patch literal 339 zcmV-Z0j&OsP)AT{E(jv*%z_H%ONVor`T5VxfWcree3_W|&gGS3!-r0za20{!5tu@NaLARsrLW?002ovPDHLkV1hbFk@5fl literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon3.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon3.png new file mode 100644 index 0000000000000000000000000000000000000000..5d06bb0ce415d0cafd03f3da6cb1fd909d145947 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|D z)5S3)qV??*TdqS60_9IUlf)jbryU6VU>ZoZr2 z#0;sehHI{}ISLpF2PE##O5AL%pZ|?_L4bxxyxU^AInT44*3F)7`g5Md_KIb32dh%L z{qMVLCB$TKFr2t;-jT@Vnccb9Sh<@+bwU1?CZ%=DonPNA%v;Xbpwo1PsZ(MZ1H<*J zW&(oKShnt%SK7S4UQ}>e03Q!uaIUz1;$(w|RljcAsq(%NJ7E@}_;h>zmX??Dj0{(g z^D)$lOYn(%;YF12Cx%HI?j7(yP}=ymA<$>jxy`IoeB*c`E&2}EwZ!ZH kyRX@CsP%uDgCMK_xr@PXE$2Pg2L=;^r>mdKI;Vst0Q2C3Bme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon4.png b/Resources/Textures/ADT/Structures/Decoration/birthday_balloon.rsi/balloon4.png new file mode 100644 index 0000000000000000000000000000000000000000..1a429faad7f86191f74c291c8dfd9b6fe591da4e GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|3 z)5S3)qBS`|f^~6%NKX?ZThEiM8leL}MFnUhmILt|@<@1*91$(J|(|8eE9X?FyphJhx>gN$lY}lf2{WAND(fCB+OnEPg*&4M5;d)j#HU0<$b1 z9M?;Cd-i_6WW>HdN3{I?@)WFD5*VfloMcUT8qc?V@BjZrn~Xpj{s0}5kf5+%M`1TZ z^u!ZSq;t+WC$((*(<;wC z`|Mu~QERMbu3a?kqHOq?GiRnRzW5@&_S$Rd+;h)OPd@o%?ze5*)AB~g%lMUdvVNK|MBue&`0KB~zO^D_nl^1(`u5vz(}y2^ zm?lk{l$I=6l5W2FW`nBje012g734>J{e=)ym@J_z4l6n9d=m8VGLxTjKzx=r}gXCXV1L%-g_I8 zFAq}nuNVQs@B{Z8*haYF!-uDnPC6;|>C-3u^2;xOAtQ2XogqSTIyc;KL+jS9TeJM5 zM~_Y`R;);Dam+Etq`rOortiM{F0EX-vTbf<@Y}*_5wLhn`M|Ed_S$sfi6^EHKKLL5 zefsIAnFOJHp6FPcFn&TB(0@P*#TCaZdt476``>>1?KEJ(fUJ z19Q|FGiFTUbZk*e|7Gyo^$-FW?3-`CNeqtl`qtLgbmp07X78tv{{8#6MF6>(A$H$= z_q25B(zI#wrc^HybQA%K_^Vg1P8DUOd+xa>sXs=I8kOxt3483ZNA|#3vu35Qzy3PU zSA<%=e0fe4&3K{+!1!bSF=jjY0VDjNL4(rgpMReA-+%wM2;d&0xF7fz)y1AP2dA8GF45l0-6wrtsAQn#)C zWc5D@RczmX|9#y;C-4ca*x~7qKmK?YTsja24?q0y9QsZ;;e>n)O9~K{g+=rG`RAX7 z%Gnh%++M`)==j15FWe^A!#Vx*)3ahf{`liGb?Q`+EzjlTlTXf3XvByS>EMG8&O=f< zd_7%@sMm`4LNDbC!{PPtDP8zi z2#N~4A?9BaI*(yYWbe_VN2-uDA0q)BF!-=x!_vfw6SK#gE6)$SDO09&3f~Ir>8GDg z8#ipsQ-5*!i&-`@ivrRCOkNMS8oyEbYpw!#pByIS8(0Ix;2H%e!0x{L?zXhxJ|j`O z6#@^8;^^|rFSk@`X*3kp!w=l|-g_@c7jt85X^A(&m;2YOS(A=B>Zq(3`B@sPwAM2C zyh+jd)KgD+H_I;j;XEsGW{%J`y=G{D=D zK*S}#`P9N^pGNTOMgUAUus(!i@Myph1k*gj@K{edu4@e9m=VghBK}P`-IT{NAC1u& zh8M!+rC}T%Ds@R4@V(m%zA@!@x%SjkPfb7k@I!j&p@(wbm4kUFFWeFG^L}Cev(G-u z5eB)XVf6%qlfRb!>4yHiLG}j2Oiw+24 zqKZV5#X|2X5*y8hweaQkBEEe9*M#8bpMO3ba>yas<0$O3(@x8Z6NPw*w9pLx{Q2|K zgb5S!`@E43$S5r^I+@{0hg~UuWsjxx>Z`BLo-e&90Fm43Ch+N4szY)$8hnQ5fUc>V z6u|WFJ`&W^f6WNM=w33Ybtj`cHUZZu0K1$ciTgrc5C-FbyB^JZjkY2_#Ty5f-Z+%b zBh?%{ls5|bj$M1>jW_anXYhHQXd>i_HjdRar<`(1CWD%Q6Lhuw42ZOF7~UWGcs=rw zpMDTjANcegX@?_*{@vF^!dk5+0T_^hgcG!is}uZEFxMHuM-E}0mF@gw(kwfqQh?6JpYj5%}W zWa1$VkZu zgMWb=eKkIVTK8H5TMEAZ`s=ypkrarS`n&GBD{tO3gU|SKzdC>iM#OQf1{geea83bT zEx)np4{i~k%%OkB$nCize%Qu!x?>l;)KE|VH3{HFF90%t7C_D!-!l;bFf+h|X)#7j zf)N^R@oq=><`g?~_6S5P-zOANdR4UEoXg@Pwq_|%Knhb| zARQ98#)zRy`j0SQ#4i@yp+mjsSx^3&1R#(XC|JX`29F_>MIjL<<%y$c2v$A_WlTDWu#RKYn~$+GqsZGl8$lSA5xPu)Aqj&c={y zmdX0AmY=bOd=Wrh<6H`g6d3Y%r2lZ#j`Y9XD!`6e){L2yr1AaUGJL#VI7MIlp$4>ZGlhWwpR7hNjO9- zg(LOww2)tTb{x&UGR?ORUp$e`G0dZnJ~}V$YUv*q83Ui4iuh4D*P2630`OGK_oBfV zS}*JvIKo~O88aEus^DL;x}#$o(s z@e$hJWtUynminwfT!R@!pn1YYOno?Gqxf~bGIH@5XPl9DlX#i}%ii?fd+(ig+G(d; z1YxESx$CaGW`o--k@H=nv`7B^NZrrD?R^cbg)hG|DxxWl6k*osqLTGFFBN(8uGviS z)w1#lxm(eojU2w!*wT+uL{;Ohy+b+KN;#}u2vX4aYr5n)=5q$nd2ISvmmt8VJ8Kha`$6P8=^!C2} z`p%wq;k4veSkjs~AeR)u7Ib1xY8{T@n!Zu|hCIXmyh#c3@k0;-%YhW(_kao&`O5K} zhvsA%>irNT1nlSsA@N)h|EjC5${Rqu-yVQp1qri4V1(QUAAB&AW69Dbnc$7$1YY#< zv#@bv$F;Opes1TNLB)_R%x>JcFS~G?Td=UWl)<3qk zLDa)<1}6rE7st^D5#qepPQ7wXv|!zy-`YvPmn0r$M z@bZY`N3?9(xG9gL>aP@C?bZ_kSnTTwSbV1XI22R{zZsms4ZJvyz8-#Ou#8>AYj3Qn z7ffv}>VMVBRi$kSujVg;+^E+G?jG>LLk6eHB=e(jy)u!~M5u>V>w4h)zv5T)(Uc)- z$y)0g!@FKBe_Wq8cU~#{h94ez+Q`xRrk%}H-lA; z%_}RFbxRrfSG>5QVck~aRiE!j{O$5vHMn!iXYBBH>v89miRH%`-!E|D89jwnkHr|x z7^GSJX0WQ~?3^qioAXBGH)qc_(~4=p`#Tc9Lzaf}s|BHiVzWN2ZipcgbjA>!#qX>q z{;%+Z1Y!JY-8QQKj^yu<0D$W$p?XrqbH?uoy!d>3$A9Dh8G+l=QT4q>_1_Qy49*C8 zp|HIMSnDd|2iD*CJ4XKv6QJ4TF0000FB{#m^F1h~$8x zDEd6lNx?ABa{x!`Srg=ja%kZi4ROZM+$W#=KL2`g@nClIrqe4;FHKo_hsi^6NsQ@cRD#K735iL!)LP+-n55G@f$~r_;%+U6KQ^Gek-WjIrUP8?DPv zMVTmUr>``Z}w;6W_8nR2jUM{x>%MXR<82 z+xbM%os z5CTx=Nk5ZQiR1XHU(Uzr5+rYz||+U940M>#u`*pAoB1q-w#REwy{rB#b?u5XVO~06piPM2iUeL z`&L)8h7$*FsSq(TUd#9waOWakW; z*tTtyHBGb2vaF}3L9a>>I~bF()##yMj5*8gplJ}HEH7>U%@GPpA3n?XZ9{}2^zrdQ zZg7b#K*2|6CqAb_bDqunv`y9dFG}x&!MI3=aR2}S4rN$LW=%~1DgXcg2mk;800000 S(o>TF0000Px)rAb6VRCt{2TQO|gMihNVN|a36FqFVF>H-X$IC`qjv1RFgJ-V=y4XdQ4)IcSsEZm7K)@-&pimr(vPDX~4$>*IZ1VmoWF(`000&E- zckiA)?>_IHfm__-e+?!J;Lo06d2IL?L)tiUPjMbJv3e2!Xb)Ok0I+%z;5=yJ$UV)5X+|Im z&^!1z2oY`)NRI#j>EL_gD)IB=z*yc~!=#l*Ue{n2uhOnxG!eEUocf{C+(XWQVM44z zr+&!IVvYm2a+$>(KlMXymx@^4TqCzl&VXT|cL|oQLUZj^h})$iTi#qFWx~h{09;;$ zAem%US0VBva9FFQ8b^g$&;fwFx`;S&pA2LHp3mR8wDwerUYX zB>3~YcL3T0?Z0}zPaCf1XBJPM1ICQ^p`!SSk86+#$WU*zGQE$K0foHAsH(c2k3wF% z5oIty$bkLrC*5^*ciKXG*^PnKe)bw+G!idD6i5ZwDwpxV%;9e#BXJ+1 zAFk(Pz6G`s==kjI+r(Ju9H26I09Y6wM=6RBGM4bH&`{+Z8-YGhI~#${t6YBTNLPZt z>l{vVFddJh2rglCBV7p|=o}SmFaatS#{nUE$Qe-8G#u7ySQsC_wjw-^qVDrw>eLAy zu^f%VpB;9NZNc??IJSi^|L|htUwmPA<6O`0-k$_%$llZ#9=`UmWSaP`UdLgrhQpZH zs-|JdG;vs~VQ*>-_JBo9KYD8rF&Fi3$pOHNYvN@fWx(#V1;;k==p_>02acl%JF_NS zubp}yngIgh7X^TwSyL%q29f}x!JS$8Qq-G*X<^Qp?6xg~V_TSWCesxlO9E85o)06Z zv7j0M9%AG)xSr1iUkb>RU{(ZF5HyoZY?ZAr0i`-13j)IisSZ%x>rdMo$g+Q_0A@jF zuIIxn=%iO%)%aoeFBPD(vB2t$mh=^OfBT72ybP-C4bnf!9lptsnWHzt7|9YOdtBhA z?DF)kM!)`ZmKaOP01iOeavBzdlZ5xSSt6tYIJSkA#Tj_j3qEP(Q=phFCarweNuul` zk>-GjsS+I9LS7&JDI>3IaBM5lL+pjph_17xM-8eRNB<|y7`FmYg3jJlv*wXHsGM&z zKqa_-G5QCfR5?lo5IZ}r=cC@Z0Rl9dmpIEnS~JA^wQ&|;t6WB&a~Pb%01yBO7(>X~ zRdv>W;8wW|0I?j5Ndt95C+`U;Jpy;b2mpA<7&khlrqTHu0MB#YC71<-_(>c(9LZ1; z;9kASOHl;j6^cuI7BZHZ2x9QUtBm7tude2$DGAWqX)k(7WFbQT;AI?Cpd^6IAx_g7 z?g!PSrn=Yyw{^g<2@D%b0;pKuclC69LDjZY?Rg~ughdWqJu4_W7Y=b+#wgG>S(i+c z+`kHxUY=zZxfp!K;`qFot^k!B$2Xw$zbD@b>w+XeuQmPXW&5*!n_PJG;zS4KZ~_&g zt%}taA*uhJSrhR5Z0vEFMV^H<-p`}b=_84Qh)wNXK-k?K+bJ=>varVc+fHiVEa zXmKhJ@{Hlw7FrPp+Frty%gAX=^;GvDaBK@kPP>)^0M?4Q(rIy}^8sc-k2OcW{%#$v z=Oe4L0sTCF`92*UY8xU6hn@yK)jbH(Px$X-PyuR9J=WmcL5FP!xy1dn;UTi@3G8R1m>u=%&x1OUaVS2XGL40p~8Ii+uuL zpj%%;9I{9=2>uE2g1K>M6Vs$cu?Y(1gFv_^oZpvomjnMDk-WsC5ddS?MM;UVHZC(r zNhyrAoDK%_;C>%~t?WnH@QzYt<}))UR#J+w>!uQrnZS)wm4#;{(n*{d1At75Rfhv~ zl)_jWE1AZA3RE4QmnaDQ7PUYvPz%%owLmTKcLaJ`Gg~YPRWdV%p4LSHM@N-QB;k&Z z(zA3YJcpu)#D8O9@ZN{kfPt zya2ha7@*s3;rIbVbiT9^j*jTITX=r3bY2iR?C#?E0ayFmr3&B&Y40p+FZuD=2Px%PDw;TRCt{2o4-l}K@f+3cM;ZA(9U!bMDQ6bEqn@X&#;IgFuR1X7;~x?ZVYJ*6O_)r86137DYs6>kYc8!-X0lg@E!=_6lf|n^59oH9nu(rnE~8K z-V%%eDZ~W~-T@>K7a&a(Af13TQGj#;(nJB$2}na;3ZKo)I6buuk{d&Qiu1+T&wwaE zIss{-0PcXfF<91`JM6cx3b2FEbio<+N634E3+Zr&*Jb%`@Jj`fb828ukOf@ydQR;I zkNjnY8r2_U0j}qBrVG^OrqOD5sUf{W7O*=%>DI8_#bRyt{|SJ@a{8uY0N~e4W)8># zj<)uOwprQUq=xx3SZ{+@tvk+ePOu4>QkA6D?qW(+f_Msyyuf-izIq3cY;16*@Couo zuqp65%O^gr0ezRBN>iNF>mI`Sg>6eLHwG$A6H}I0Yc$>x5IzOi?gCY%V9GMMnZUXZ z2vGw2hKQBG9rrupmY8$`(nJB$2}lzKNGBjo6d;{|G-EFynBAGCQX^H0{+m)+DWU-B z1f+=qq!X|#YmJ=v^~Wd#BOud-h=gFi8CoikWV+}dK;xpCXPpcE`jQE5XeG?izxi1jHHw0iFO3=(8oBU!&Im0000Ea6^5x~3FEE*~Env;yap1ln(IB?KkU`hMxVE9f{7207 z4D<5a&|Q Vv2kD5cmn;;;OXk;vd$@?2>_KSZ&UyP literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_2.png b/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f9cbd4e37817439385f20f86850cea627db2f2ed GIT binary patch literal 660 zcmV;F0&D$=P)Px%PDw;TRCt{2o4-l}K@f+3cM;ZA(9U!bMDQ6bEqn@X&#;IgFuR1X7;~x?ZVYJ*6O_)r86137DYs6>kYc8!-X0lg@E!=_6lf|n^59oH9nu(rnE~8K z-V%%eDZ~W~-T@>K7a&a(Af13TQGj#;(nJB$2}na;3ZKo)I6buuk{d&Qiu1+T&wwaE zIss{-0PcXfF<91`JM6cx3b2FEbio<+N634E3+Zr&*Jb%`@Jj`fb828ukOf@ydQR;I zkNjnY8r2_U0j}qBrVG^OrqOD5sUf{W7O*=%>DI8_#bRyt{|SJ@a{8uY0N~e4W)8># zj<)uOwprQUq=xx3SZ{+@tvk+ePOu4>QkA6D?qW(+f_Msyyuf-izIq3cY;16*@Couo zuqp65%O^gr0ezRBN>iNF>mI`Sg>6eLHwG$A6H}I0Yc$>x5IzOi?gCY%V9GMMnZUXZ z2vGw2hKQBG9rrupmY8$`(nJB$2}lzKNGBjo6d;{|G-EFynBAGCQX^H0{+m)+DWU-B z1f+=qq!X|#YmJ=v^~Wd#BOud-h=gFi8CoikWV+}dK;xpCXPpcE`jQE5XeG?izxi1jHHw0iFO3=(8oBU!&Im0000Ea6^5x~3FEE*~Env;yap1ln(IB?KkU`hMxVE9f{7207 z4D<5a&|Q Vv2kD5cmn;;;OXk;vd$@?2>_KSZ&UyP literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_4.png b/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_4.png new file mode 100644 index 0000000000000000000000000000000000000000..50f02b4239b5e841dd976f28b451c08978925ea2 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|et5b#hE&XX zJ9{H!Y3|z3DTT$FS?`!1 zynk`NCcfavf7VGbhg`00_~K)5IydD!quhh7xi9`zFjTGTVUKvQaYu*8^*xLWj?2cT TvD;k*h5>`8tDnm{r-UW|DYJS} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_5.png b/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_5.png new file mode 100644 index 0000000000000000000000000000000000000000..453f118c990d34eac37f0e45ea3ac79d2e522246 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zWj$RSLn`LH zon_5+*g$}FK2M_ccDum5hmU`XSx$^D_deh?m03lo$05IJ;r7E)ufti2U0wus-P?Li z_tEo@=U;2-e%9A*t`<1`sr;ku0oEtA$w$4JITX65vk5pPGnOz&aW7!L5WyhZaE$2% zgNc{}`+}Kq4wvJiCdIvuiaxge-Sg;~`mLuakFK?{Qr$c`EY)d(ly>N)!R QfT70V>FVdQ&MBb@02z*eO8@`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_6.png b/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_6.png new file mode 100644 index 0000000000000000000000000000000000000000..50f02b4239b5e841dd976f28b451c08978925ea2 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|et5b#hE&XX zJ9{H!Y3|z3DTT$FS?`!1 zynk`NCcfavf7VGbhg`00_~K)5IydD!quhh7xi9`zFjTGTVUKvQaYu*8^*xLWj?2cT TvD;k*h5>`8tDnm{r-UW|DYJS} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_7.png b/Resources/Textures/ADT/Structures/Furniture/red_wood_table.rsi/state_7.png new file mode 100644 index 0000000000000000000000000000000000000000..284e1a09dbca261d70f750f28a9991914880d67c GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|c6z!vhE&XX zd+Q+Q;Q*ck0n3?FR{PvtyUD@2g`Z#OWuCwx@z4JaXS}ccXZHDet^Dkt=hJ?0ia2m* za4ldpVZFdKiz$QAmvKwOGKMIJU-i2y2BWLDFI45J+qRe^ALt1NPgg&ebxsLQ0Ql!vIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/meta.json b/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/meta.json new file mode 100644 index 00000000000..1ef3fbbec8a --- /dev/null +++ b/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:unlumy для Время Приключений MRP сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "round_plastic" + }, + { + "name": "round_glass" + }, + { + "name": "round_wood" + } + ] +} + diff --git a/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_glass.png b/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..c526ccca2d2dd2acae7cdb639a0b726746ebd82d GIT binary patch literal 562 zcmV-20?qx2P)1EcfK5_yuP-9C`%;qh5)8wzXJS6tiY#f zA_pC|ZAWQf9k?taOH_)21Hk9i_3ZwV%odBq^MSyr;b{_;BH>9Ar5*eUKrIQ(`+f^9 zU@ntqy+xodJQm1WZ#iLqNZ~nD1nW$HEHG)^Jap&pO1nJl4{81F zl>)%#_D%=>1pw9Er!hjir!j_ptiT_+u3IVt+e3mM7zM%OGoj2oi;|EJq_TMP)DlUj zp;A2{hHpTgV;fPa9!L?1Df&Y>Q&Ltp=s3uQMm`gxRr_+fD zAutRBtJMksV45bvFa%=^)9F-c%%er=u`tG9nr3{h8|4`Q_Ol=hss4Ix0WKl7b>Qdx ziF^ZKS142V+Vukf000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f=A5n AL;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_plastic.png b/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_plastic.png new file mode 100644 index 0000000000000000000000000000000000000000..5b41a1d78c13f4acfa2fa2836261341c6b08c421 GIT binary patch literal 551 zcmV+?0@(eDP)^PD6}KH9eZj2^-Fg5QbE zC0-uGS1HT#Ze3MX&^|#|S6P-QrAX71G)+-TErix4xB;aUhr?l7YpwsTz#JF~hrqv} zsw%YBbX`Z+b!e@FuYuqOLVBkmd^-QmIjpr`b`*zUz*>v77Gn&3-_tY= zbzO@H;F-i;kvZ5ow}68;4}A5rz*-A{F$Q1(hu^p2G4m#jF-R$=yVuyrmX|RG=Nx_C zV~knA7Y)ptfc^78-}eACO#?ih2VRa$dnck-;8g;?$kwcx30Dcsb2^=zQi|j8$n|;! zAj>jtw;Nh(E|<%uJ$K!Tvn-q5hh}pF@TUb|XzQ;J78oVw>k#;N{)zkq7pfndLof8K p0000EWmrjOO-%qQ00008000000002eQbV literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_wood.png b/Resources/Textures/ADT/Structures/Furniture/roundtable.rsi/round_wood.png new file mode 100644 index 0000000000000000000000000000000000000000..e15db8a13190305a6bf8362c448ce76cfcae44ea GIT binary patch literal 455 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 P00000NkvXXu0mjfxSFx- literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/meta.json b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/meta.json new file mode 100644 index 00000000000..1fe8caddc03 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by m1and1b for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "state_0", + "directions": 4 + }, + { + "name": "state_1", + "directions": 4 + }, + { + "name": "state_2", + "directions": 4 + }, + { + "name": "state_3", + "directions": 4 + }, + { + "name": "state_4", + "directions": 4 + }, + { + "name": "state_5", + "directions": 4 + }, + { + "name": "state_6", + "directions": 4 + }, + { + "name": "state_7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_0.png b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ae5f044e06d834e53032a37cd3d1072c0e674611 GIT binary patch literal 708 zcmV;#0z3VQP)Px%en~_@RCt{2o4;#QQ546&uQe1}L}E!XOF$@DRD@h`$Pz{9;+ukVq5pssM+a9o z7bmBnn;*8c72w4JYY-yW-lF+#LBq`B%<9WT`LvugyhQfWEbH4ZV{y6Uh z@XR*>+ksK7Hu3jPE{D}@7T=GKMmFzisa?A84tc}j1!v+POMnK2p&)(04sPv zi2wj7!2^l}VBrN|JHW;Zz;=L*7l7>m8!rIc0XE{>;90^0mQOyGAK?>X8`LDY(8CS3dh!??~T+V7-7={33f?Wh@d>*&02nB$SSs%w) zNla52Y#e91K-n17>-CxIhZl|0bAUz>XjNeVLA)?B@ijrV18lqiYzNrT1bB3Cz%o4n zO#m$?LjNzoc7V;?3qZe|jB2&`O8sA*qSy0zQ4DjR0bT&M0{}1_4r#Vk2(X&X(s~9| z2=MiD6C0IEd`)(W3IPVE$EcQyC>!Hk1Qi0jd;JQx%)Q{e2xpm0;v+@HIRNT zA9nYwGvQMGY777hYb&Uhig^F!n-hEL1c-YGX6ZYSpkfV}#_yg2n@5DY42bFd7~raor=@!#O8VrF z+}n#RA27~4F37q=*W0As+vtb90fVkXGDB3uF@`M+y^I-*Qp^{aOfIu`@H>A=R7?FO zngEqM`-Sn5Zbpw_Zu8c#66rn5_+RXu|FH2Pmxug^*V+y)DOnTVGxpc^|9>^_=$G|} z*cPy6@HlW^kZ2HFV2EbJto0U?r+?aKS{Hx4|9EAj)e&Ty(KUW%+I2;F-7Z7xWT3wp NJYD@<);T3K0RV(Ualilo literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_2.png b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ae5f044e06d834e53032a37cd3d1072c0e674611 GIT binary patch literal 708 zcmV;#0z3VQP)Px%en~_@RCt{2o4;#QQ546&uQe1}L}E!XOF$@DRD@h`$Pz{9;+ukVq5pssM+a9o z7bmBnn;*8c72w4JYY-yW-lF+#LBq`B%<9WT`LvugyhQfWEbH4ZV{y6Uh z@XR*>+ksK7Hu3jPE{D}@7T=GKMmFzisa?A84tc}j1!v+POMnK2p&)(04sPv zi2wj7!2^l}VBrN|JHW;Zz;=L*7l7>m8!rIc0XE{>;90^0mQOyGAK?>X8`LDY(8CS3dh!??~T+V7-7={33f?Wh@d>*&02nB$SSs%w) zNla52Y#e91K-n17>-CxIhZl|0bAUz>XjNeVLA)?B@ijrV18lqiYzNrT1bB3Cz%o4n zO#m$?LjNzoc7V;?3qZe|jB2&`O8sA*qSy0zQ4DjR0bT&M0{}1_4r#Vk2(X&X(s~9| z2=MiD6C0IEd`)(W3IPVE$EcQyC>!Hk1Qi0jd;JQx%)Q{e2xpm0;v+@HIRNT zA9nYwGvQMGY777hYb&Uhig^F!n-hEL1c-YGX6ZYSpkfV}#_yg2n@5DY42bFd7~raor=@!#O8VrF z+}n#RA27~4F37q=*W0As+vtb90fVkXGDB3uF@`M+y^I-*Qp^{aOfIu`@H>A=R7?FO zngEqM`-Sn5Zbpw_Zu8c#66rn5_+RXu|FH2Pmxug^*V+y)DOnTVGxpc^|9>^_=$G|} z*cPy6@HlW^kZ2HFV2EbJto0U?r+?aKS{Hx4|9EAj)e&Ty(KUW%+I2;F-7Z7xWT3wp NJYD@<);T3K0RV(Ualilo literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_4.png b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_4.png new file mode 100644 index 0000000000000000000000000000000000000000..36ef68a2af3f9dc3b29a7f938d5ed280c8807455 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6$!0hE&XX zJ8L8FVFdvO#ZxRVZQ6IAIk01clhyf$dfE@J=~gZ2J{0@^QH|5Kp1GI%1G3+~ua%!y zog3Y^=646re`dA?tQkBG+!rJo#1Z9k_JHshZ% zKe+$m<@A+L%Nu~Ufz3M2en7r?@AnJI2G3=7wWX(2u&p&MsV#Q^GQRK$2u9B0o|&h- V&g$y6S3uu0c)I$ztaD0e0sz?Mc{l(7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_5.png b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_5.png new file mode 100644 index 0000000000000000000000000000000000000000..fa69de6c150e5397cb34f623def8f858e58ae5bf GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zg*;sxLn`LH zy|uCTuz`Tf#i`yq&Xj5t^Xg1DwFs6yw~p01h|!L#;z(hgU%|Iz)<*9%UJud zno}*I?a}H_;vHc1E(enDul{al;<1zK8slb<6COT!cFZ7yL58?A@Ga OR1BW3elF{r5}E)Z9k_JHshZ% zKe+$m<@A+L%Nu~Ufz3M2en7r?@AnJI2G3=7wWX(2u&p&MsV#Q^GQRK$2u9B0o|&h- V&g$y6S3uu0c)I$ztaD0e0sz?Mc{l(7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_7.png b/Resources/Textures/ADT/Structures/Furniture/white_wood_table.rsi/state_7.png new file mode 100644 index 0000000000000000000000000000000000000000..a86dd51636dcd53a13a587b6cfed1bec24625416 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|c6quuhE&XX zdut=_VF#WA4wlM0KL0zs^EB5<0WH1_C*v3#R|x*=KUnkr_x73g>tEkEQ*UPx(P)S5VR9HvFmv2neWgNgiPt)V>NRCz_C~!i;m@7&ce@dww;zD#$p|#$$wahnW zbGeF|wq`k9rJL1@u-bZ)Q6#z)sO!(US;_z_rD9ab0R@OH4ukuH>(`#=?)U4CVX=ob zo;T0m-+e#dzt25_Ic{Q(<#SblnwlEJ@AoS{m&+B$Id$Ef$DWmI=64MZ4Of-(uK>?@ zADgv-YFE6B$K%llC>*JvW1+_aG3T+pxhc=d_1O8|yXu&g1!e*e3n+!hexnUgQBh%R z>wbjwy$^DHX+6S-=vC!=fF^f6>s0>%>wKFmjhiz+RO8CNjkKt-;O&xnJqyef00V@8 zO5Y}?1K6KerxydU0H%s3-1W)=W}Arxv;kxqZfvh2qM=Z|N?JL$5F(?v`IP;`#mDqq zAOY5QRDfYv08PDHB5|;^&JrBq5*+W{tkyQT55<5A8jD)=0m|FU;xzaAo=`$oyAMXS zj+z9)7rw{UUU}wgaTfce$g2;qvaQt8^t5jW>A=IlOTg{!S0j!v;Oo98c@B6N7ywpf z?vFZ2aI*L-eSpH&f@loDH~r5lA+kw;sV#P|Fnw0=B zfr0PRP8P`Pd72oIP?v$M8(uWag#vG1;njCR!Pzzcq+wKO@9$5?`8(G4S=aBgOmEhQ z_5#l=0NSclp2b%_gM!iRGg5 z%jDo-pM|h3Et5N=^K94a)_GaN+lr3r17vt)7DVphe*bos0Pm+}aAc^Tw}3~%>hDX< zpk}C_VIb3Wz=Atp+@uE}>p*Vn8YTX>v0BokUIIQ&&*tv_9`29MrGY*IS~9ZPFwmn6 zHV7n1AHE9>4Yc=bDw7}xlGDa@%BL%n!_?G2iw>y+(fxrZ{J>Bfd&c*3)DoX`}0o*@# zk%C|ZgM|y8;@6T>`YxFFc?Zb`gakMoTREN7h%>iG*MLIG|Yt0oY5 zgG2)^3Aj>Ts0SdkV7&1RE)4t#lASW-;Ee4E^XJ*HJM7pK>;yvrf`Jf|S0*V9SF4~M zop?tTD_NWp?=97jfr+E%lm$iwxa<$%559-*x)kj81Z=hh>yJk`93mJD;r`>IbBEC@XXHgS4%qI=(gTn|D1UtFv&TF O00003W=+vP=yJpDHDMOHcgg?Lq zjMfG^`2!44lteL097NPnvTS9_TO^)D-qYQ?(*ds?j51Cp6KjkCV+=wFNGZWN2V)G3 zF=(x!l!6cfLI?mrnx+5%tu;EG4mjtq)+Y7mQuoxe=Qa;W0$S_xU3a&@`ww{s?t1giE(DA*l^eaJJcKqH*@{3IhWSID zUtPP$p^GSrNV~TR{(L;~9<~b(fBnR4HY@leBVes<)Op#NB!Mi;8Yj?dkrhw(fo&o% zJo=VfFYeDv-}ec-T!amxRu#NN3TkN}2!h55a85T}(%Npf8z&IQF=;17=(7EKofq8Y zak=0q_}V)e0bkeJ2aJ(DkB)#ZTvZreALQ1H