From 0a85b049ddbd39f83f1819fcc3bb21047bfd459c Mon Sep 17 00:00:00 2001 From: JustKekc Date: Wed, 20 Dec 2023 00:11:32 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B4=D0=B8?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=B8=20=D1=88=D0=B0=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D1=88=D0=B5=D0=BA,?= =?UTF-8?q?=20=D0=BA=D1=80=D0=B0=D1=84=D1=82=D1=8B=20=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=BB=D0=B0=D0=B7=D0=BE=D0=BA=20=D0=B8=20=D0=B4=D0=B2?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5.=20=D0=B1=D0=B5=D0=B7?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D1=83=D1=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Clothing/Uniform/turtleneck.ftl | 11 +++ .../structuries/furniture/furniture.ftl | 2 +- .../Entities/Clothing/Uniforms/Jumpskirt.yml | 22 +++++ .../Entities/Clothing/Uniforms/Jumpsuit.yml | 23 ++++- .../ADT/Recipes/Lathes/clothing.yml | 98 +++++++++++++++++++ .../Catalog/Fills/Lockers/heads.yml | 8 +- .../Entities/Structures/Machines/lathe.yml | 24 +++-- .../human_inventory_template.yml | 3 + .../Roles/Jobs/Science/research_director.yml | 4 +- 9 files changed, 175 insertions(+), 20 deletions(-) create mode 100644 Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml diff --git a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/turtleneck.ftl b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/turtleneck.ftl index 0a60bcb4327..400332134ba 100644 --- a/Resources/Locale/ru-RU/ADT/Clothing/Uniform/turtleneck.ftl +++ b/Resources/Locale/ru-RU/ADT/Clothing/Uniform/turtleneck.ftl @@ -146,6 +146,12 @@ ent-ADTQMJumpsuitWarm = водолазка квартирмейстера .desc = Строгая водолазка, предназначенная для суровых условий работы в области снабжения. .suffix = {""} +ent-ADTHOSJumpsuitWarm = { ent-ClothingUniformJumpsuitHoSAlt } + .desc = { ent-ClothingUniformJumpsuitHoSAlt.desc } + +ent-ADTRDJumpsuitWarm = { ent-ClothingUniformJumpsuitResearchDirector } + .desc = { ent-ClothingUniformJumpsuitResearchDirector.desc } + ent-ADTCEJumpskirtWarm = водолазка старшего инженера .desc = Это комбинезон повышенной заметности, который выдается тем инженерам, которые достаточно безумны и живучи, чтобы достичь звания главного инженера. Имеет слабую защиту от радиации. .suffix = {""} @@ -162,3 +168,8 @@ ent-ADTQMJumpskirtWarm = водолазка квартирмейстера .desc = Строгая водолазка, предназначенная для суровых условий работы в области снабжения. .suffix = {""} +ent-ADTHOSJumpskirtWarm = { ent-ClothingUniformJumpsuitHoSAlt } + .desc = { ent-ClothingUniformJumpsuitHoSAlt.desc } + +ent-ADTRDJumpskirtWarm = { ent-ClothingUniformJumpsuitResearchDirector } + .desc = { ent-ClothingUniformJumpsuitResearchDirector.desc } 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 003582129ad..f2068e92106 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/structuries/furniture/furniture.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/structuries/furniture/furniture.ftl @@ -165,7 +165,7 @@ ent-ADTArmchairBrown2 = { ent-ADTArmchairBrown } .desc = { ent-ADTArmchairWhite.desc } ent-ADTArmchairBlue = синее кресло - .desc = { ent-ADTArmchairWhite } + .desc = { ent-ADTArmchairWhite.desc } ent-ADTArmchairBlue2 = { ent-ADTArmchairBlue } .desc = { ent-ADTArmchairWhite.desc } diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index d77512e89f7..23af7e1dc8c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -390,6 +390,28 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_qm.rsi +- type: entity + parent: ClothingUniformBase + id: ADTHOSJumpskirtWarm + name: hos Jumpskirt warm + description: A turtleneck for someone domineering. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTRDJumpskirtWarm + name: rd Jumpskirt warm + description: A purple turtleneck to wear stylishly with labcoat. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + #купальники - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index 368696469e6..84540b18b4b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -399,7 +399,6 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hop.rsi - - type: entity parent: ClothingUniformBase id: ADTQMJumpsuitWarm @@ -422,6 +421,28 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/Halloween/suit_hunterdemon.rsi +- type: entity + parent: ClothingUniformBase + id: ADTHOSJumpsuitWarm + name: hos jumpsuit warm + description: A turtleneck for someone domineering. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTRDJumpsuitWarm + name: rd jumpsuit warm + description: A purple turtleneck to wear stylishly with labcoat. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + #костюм Эйдана - type: entity diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml b/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml new file mode 100644 index 00000000000..31fdd959ab3 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml @@ -0,0 +1,98 @@ +#Ce +- type: latheRecipe + id: ADTCEJumpsuitWarm + result: ADTCEJumpsuitWarm + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTCEJumpskirtWarm + result: ADTCEJumpskirtWarm + completetime: 4 + materials: + Cloth: 300 +#Cmo +- type: latheRecipe + id: ADTCMOJumpsuitWarm + result: ADTCMOJumpsuitWarm + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTCMOJumpskirtWarm + result: ADTCMOJumpskirtWarm + completetime: 4 + materials: + Cloth: 300 +#Hop +- type: latheRecipe + id: ADTHOPJumpsuitWarm + result: ADTHOPJumpsuitWarm + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTHOPJumpskirtWarm + result: ADTHOPJumpskirtWarm + completetime: 4 + materials: + Cloth: 300 +#QM +- type: latheRecipe + id: ADTQMJumpsuitWarm + result: ADTQMJumpsuitWarm + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTQMJumpskirtWarm + result: ADTQMJumpskirtWarm + completetime: 4 + materials: + Cloth: 300 +#Hos +- type: latheRecipe + id: ADTHOSJumpsuitWarm + result: ADTHOSJumpsuitWarm + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTHOSJumpskirtWarm + result: ADTHOSJumpskirtWarm + completetime: 4 + materials: + Cloth: 300 +#RD +- type: latheRecipe + id: ADTRDJumpsuitWarm + result: ADTRDJumpsuitWarm + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTRDJumpskirtWarm + result: ADTRDJumpskirtWarm + completetime: 4 + materials: + Cloth: 300 +#Bartender +- type: latheRecipe + id: ADTClothingUniformNewBarmanSuit + result: ADTClothingUniformNewBarmanSuit + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ADTClothingUniformNewBarmanSkirt + result: ADTClothingUniformNewBarmanSkirt + completetime: 4 + materials: + Cloth: 300 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index c12326d6147..09da37fadc6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -160,8 +160,6 @@ contents: - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath - - id: ClothingUniformJumpsuitChiefEngineerTurtle - - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: OxygenTankFilled - id: NitrogenTankFilled - id: ClothingNeckCloakCe @@ -195,8 +193,6 @@ - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingHandsGlovesColorYellow - - id: ClothingUniformJumpsuitChiefEngineerTurtle - - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering @@ -354,8 +350,8 @@ - id: ClothingNeckCloakHos - id: ClothingOuterCoatHoSTrench - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite - - id: ClothingUniformJumpskirtHoSAlt - - id: ClothingUniformJumpsuitHoSAlt + - id: ADTHOSJumpsuitWarm + - id: ADTHOSJumpskirtWarm - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat # - id: ClothingShoeSlippersDuck # Corvax-Resprite: Need more space for style diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 85edb7bac29..8baf921034e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -763,8 +763,8 @@ staticRecipes: - ClothingUniformJumpsuitColorGrey - ClothingUniformJumpskirtColorGrey - - ClothingUniformJumpsuitBartender - - ClothingUniformJumpskirtBartender + - ADTClothingUniformNewBarmanSuit + - ADTClothingUniformNewBarmanSkirt - ClothingUniformJumpsuitCaptain - ClothingUniformJumpskirtCaptain - ClothingUniformJumpsuitCargo @@ -772,8 +772,8 @@ - ClothingUniformJumpsuitSalvageSpecialist - ClothingUniformJumpsuitChiefEngineer - ClothingUniformJumpskirtChiefEngineer - - ClothingUniformJumpsuitChiefEngineerTurtle - - ClothingUniformJumpskirtChiefEngineerTurtle + - ADTCEJumpsuitWarm + - ADTCEJumpskirtWarm - ClothingUniformJumpsuitChaplain - ClothingUniformJumpskirtChaplain - ClothingUniformJumpsuitBrigmedic @@ -785,16 +785,20 @@ - ClothingUniformJumpsuitClown - ClothingUniformJumpsuitCMO - ClothingUniformJumpskirtCMO + - ADTCMOJumpsuitWarm + - ADTCMOJumpskirtWarm - ClothingUniformJumpsuitDetective - ClothingUniformJumpskirtDetective - ClothingUniformJumpsuitEngineering - ClothingUniformJumpskirtEngineering - ClothingUniformJumpsuitHoP - ClothingUniformJumpskirtHoP + - ADTHOPJumpsuitWarm + - ADTHOPJumpskirtWarm - ClothingUniformJumpsuitHoS - ClothingUniformJumpskirtHoS - - ClothingUniformJumpsuitHoSAlt - - ClothingUniformJumpskirtHoSAlt + - ADTHOSJumpsuitWarm + - ADTHOSJumpskirtWarm - ClothingUniformJumpsuitHydroponics - ClothingUniformJumpskirtHydroponics - ClothingUniformJumpsuitJanitor @@ -813,10 +817,10 @@ - ClothingUniformJumpskirtPrisoner - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM - - ClothingUniformJumpsuitQMTurtleneck - - ClothingUniformJumpskirtQMTurtleneck - - ClothingUniformJumpsuitResearchDirector - - ClothingUniformJumpskirtResearchDirector + - ADTQMJumpsuitWarm + - ADTQMJumpsuitWarm + - ADTRDJumpsuitWarm + - ADTRDJumpskirtWarm - ClothingUniformJumpsuitScientist - ClothingUniformJumpskirtScientist - ClothingUniformJumpsuitSec diff --git a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml index c93e28e429b..40768294808 100644 --- a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml @@ -91,6 +91,9 @@ uiWindowPos: 1,0 strippingWindowPos: 1,0 displayName: Head + blacklist: + tags: + - CatWearable - name: pocket1 slotTexture: pocket slotFlags: POCKET diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 7be3ba0af92..7199e2c1a8d 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -30,7 +30,7 @@ - type: startingGear id: ResearchDirectorGear equipment: - jumpsuit: ClothingUniformJumpsuitResearchDirector + jumpsuit: ADTRDJumpsuitWarm back: ClothingBackpackResearchDirectorFilled shoes: ClothingShoesColorBrown outerClothing: ClothingOuterCoatRnd @@ -40,6 +40,6 @@ socks: ClothingUnderwearSocksNormal underweart: ClothingUnderwearTopBraRD # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesRD # Sirena-Underwear - innerClothingSkirt: ClothingUniformJumpskirtResearchDirector + innerClothingSkirt: ADTRDJumpskirtWarm satchel: ClothingBackpackSatchelResearchDirectorFilled duffelbag: ClothingBackpackDuffelResearchDirectorFilled From 338f39f03b1b653be1d6112274ff993e571a5dc6 Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sat, 30 Dec 2023 22:04:34 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BB=D0=B0?= =?UTF-8?q?=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Structures/Machines/lathe.yml | 32 ++++++++----------- RobustToolbox | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 4a64fed65f3..64d7ab1d7ee 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -793,19 +793,17 @@ staticRecipes: - ClothingUniformJumpsuitColorGrey - ClothingUniformJumpskirtColorGrey - - ClothingUniformJumpsuitBartender - - ClothingUniformJumpskirtBartender + - ADTClothingUniformNewBarmanSuit + - ADTClothingUniformNewBarmanSkirt - ClothingUniformJumpsuitCaptain - ClothingUniformJumpskirtCaptain - - ClothingUniformJumpsuitCapFormal - - ClothingUniformJumpskirtCapFormalDress - ClothingUniformJumpsuitCargo - ClothingUniformJumpskirtCargo - ClothingUniformJumpsuitSalvageSpecialist - ClothingUniformJumpsuitChiefEngineer - ClothingUniformJumpskirtChiefEngineer - - ClothingUniformJumpsuitChiefEngineerTurtle - - ClothingUniformJumpskirtChiefEngineerTurtle + - ADTCEJumpsuitWarm + - ADTCEJumpskirtWarm - ClothingUniformJumpsuitChaplain - ClothingUniformJumpskirtChaplain - ClothingUniformJumpsuitBrigmedic @@ -817,22 +815,20 @@ - ClothingUniformJumpsuitClown - ClothingUniformJumpsuitCMO - ClothingUniformJumpskirtCMO + - ADTCMOJumpsuitWarm + - ADTCMOJumpskirtWarm - ClothingUniformJumpsuitDetective - ClothingUniformJumpskirtDetective - ClothingUniformJumpsuitEngineering - ClothingUniformJumpskirtEngineering - ClothingUniformJumpsuitHoP - ClothingUniformJumpskirtHoP + - ADTHOPJumpsuitWarm + - ADTHOPJumpskirtWarm - ClothingUniformJumpsuitHoS - ClothingUniformJumpskirtHoS - - ClothingUniformJumpsuitHosFormal - - ClothingUniformJumpskirtHosFormal - - ClothingUniformJumpsuitHoSAlt - - ClothingUniformJumpskirtHoSAlt - - ClothingUniformJumpsuitHoSBlue - - ClothingUniformJumpsuitHoSGrey - - ClothingUniformJumpsuitHoSParadeMale - - ClothingUniformJumpskirtHoSParadeMale + - ADTHOSJumpsuitWarm + - ADTHOSJumpskirtWarm - ClothingUniformJumpsuitHydroponics - ClothingUniformJumpskirtHydroponics - ClothingUniformJumpsuitJanitor @@ -851,10 +847,10 @@ - ClothingUniformJumpskirtPrisoner - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM - - ClothingUniformJumpsuitQMTurtleneck - - ClothingUniformJumpskirtQMTurtleneck - - ClothingUniformJumpsuitResearchDirector - - ClothingUniformJumpskirtResearchDirector + - ADTQMJumpsuitWarm + - ADTQMJumpsuitWarm + - ADTRDJumpsuitWarm + - ADTRDJumpskirtWarm - ClothingUniformJumpsuitScientist - ClothingUniformJumpskirtScientist - ClothingUniformJumpsuitSec diff --git a/RobustToolbox b/RobustToolbox index eb092e90efc..34d02256fd9 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289 +Subproject commit 34d02256fd94ec5647cfbcc6d90633f58721cc88 From acb5eca7b89006f141f40c8b900d3bbb9fccac0f Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 31 Dec 2023 03:18:24 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=B0=D0=BA=D1=83=D0=BB=D0=B0,=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B=20=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D1=82=D0=BE=D0=B2,=20=D0=BE=D0=B6?= =?UTF-8?q?=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5=D0=BA=D1=81?= =?UTF-8?q?=D1=82=D1=83=D1=80=D0=BE=D0=BA=20=D0=BE=D1=82=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Audio/ADT/Items/Toys/soundshark.ogg | Bin 0 -> 9107 bytes Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 4 ++ Resources/Locale/ru-RU/reagents/meta/fun.ftl | 2 + .../Locale/ru-RU/reagents/meta/medicine.ftl | 8 +++ .../Entities/Clothing/Uniforms/Jumpskirt.yml | 8 +-- .../Entities/Clothing/Uniforms/Jumpsuit.yml | 8 +-- .../ADT/Entities/Objects/Fun/toys.yml | 55 ++++++++++++++---- .../Objects/Materials/Sheets/metal.yml | 2 + .../Roles/Jobs/Science/research_director.yml | 6 +- .../ADT/Objects/Fun/toys.rsi/meta.json | 9 +++ .../Fun/toys.rsi/shark_inhand-left.png | Bin 0 -> 593 bytes .../Fun/toys.rsi/shark_inhand-right.png | Bin 0 -> 608 bytes .../Objects/Fun/toys.rsi/shark_mini_pink.png | Bin 0 -> 394 bytes 13 files changed, 79 insertions(+), 23 deletions(-) create mode 100644 Resources/Audio/ADT/Items/Toys/soundshark.ogg create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_mini_pink.png diff --git a/Resources/Audio/ADT/Items/Toys/soundshark.ogg b/Resources/Audio/ADT/Items/Toys/soundshark.ogg new file mode 100644 index 0000000000000000000000000000000000000000..431da8b86903ad32d4649b8c4c53c8a8062a4594 GIT binary patch literal 9107 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 0ae4bea95fc..9a30771ab0a 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -7,3 +7,7 @@ ent-ADTPlushieJessie = плюшевая Джесси ent-ADTCrateFunAdminPlushie = Ящик милых плюшевых игрушек .desc = Куча мягких милых плюшевых игрушек. Разложите их повсюду, а потом подумайте, как вы объясните эту покупку NT. + +ent-ADTPlushieMiniPinkShark = розовый акулёнок + .desc = Ныне старая игрушка, вдохнувшая в себя новую жизнь, выглядит тщательно ухоженной и выстиранной. На игрушке можно увидеть бирку с надписью "Моя удача будет с тобой, Тимри.К.". + .suffix = Именная, Клавед \ No newline at end of file diff --git a/Resources/Locale/ru-RU/reagents/meta/fun.ftl b/Resources/Locale/ru-RU/reagents/meta/fun.ftl index 2a592902160..69a099fa6eb 100644 --- a/Resources/Locale/ru-RU/reagents/meta/fun.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/fun.ftl @@ -10,3 +10,5 @@ reagent-name-saxoite = саксонит reagent-desc-saxoite = Отдаёт джазом. reagent-name-licoxide = ликоксид reagent-desc-licoxide = Синтетическая аккумуляторная кислота. Выглядит... электризующе. +reagent-name-razorium = разориум +reagent-desc-razorium = Странный, не-ньютоновский химикат. Производится при соединении двух конфликтующих лекарств от механических травм. Когда на него применяется сила, он затвердевает, создавая миллионы маленьких, острых углов. Очень больно. diff --git a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl index e5eaaaa7834..db192fcefa4 100644 --- a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl @@ -70,3 +70,11 @@ reagent-name-sigynate = сигинат reagent-desc-sigynate = Густой розовый сироп, полезный для нейтрализации кислот и смягчения повреждений, вызванных кислотами. Сладкий на вкус! reagent-name-saline = физраствор reagent-desc-saline = Смесь воды с солью. Обычно используется для лечения обезвоживания или низкого содержания жидкости в крови. +reagent-name-lacerinol = ласеринол +reagent-desc-lacerinol = Довольно нереактивный химикат, ускоряющий синтез коллагена до небывалых высот, исцеляя резанные раны. +reagent-name-puncturase = панктурас +reagent-desc-puncturase = Шипучий химикат, который помогает восстановить повреждения от уколов, оставляя после себя немного повреждений ткани. +reagent-name-bruizine = бруизин +reagent-desc-bruizine = Изначально было лекарством от кашля. Как оказалось, этот химикат эффективен в лечении синяков. +reagent-name-holywater = святая вода +reagent-desc-holywater = Самые чистые воды прямиком из рук Бога, известные магическим исцелением ран. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml index 23af7e1dc8c..26c7053553e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -397,9 +397,9 @@ description: A turtleneck for someone domineering. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hos.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hos.rsi - type: entity parent: ClothingUniformBase @@ -408,9 +408,9 @@ description: A purple turtleneck to wear stylishly with labcoat. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_rd.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_rd.rsi #купальники - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml index 84540b18b4b..e85825c05df 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -428,9 +428,9 @@ description: A turtleneck for someone domineering. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hos.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hos.rsi - type: entity parent: ClothingUniformBase @@ -439,9 +439,9 @@ description: A purple turtleneck to wear stylishly with labcoat. components: - type: Sprite - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_rd.rsi - type: Clothing - sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_qm.rsi + sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_rd.rsi #костюм Эйдана diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 3a9b404ee24..217a50ed050 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -8,16 +8,16 @@ state: plushie_resomi_blue - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: MeleeWeapon soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: entity parent: BasePlushie @@ -29,16 +29,16 @@ state: plushie_resomi_green - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: MeleeWeapon soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: entity parent: BasePlushie @@ -50,16 +50,16 @@ state: plushie_resomi_yellow - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: MeleeWeapon soundHit: - path: /Audio/Items/Toys/toysqueak2.ogg + path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg - type: entity parent: BaseItem @@ -444,3 +444,34 @@ sprite: ADT/Objects/Fun/toys.rsi state: plushie_ma +- type: entity + parent: BasePlushie + id: ADTPlushieMiniPinkShark + name: mini shark plushie + description: A pretty old plushie, that got a refresh. Looks well-groomed and washed. There is a label on it that says "My luck will be always with you. Timri.K." + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: shark_mini_pink + - type: Item + size: Tiny + sprite: ADT/Objects/Fun/toys.rsi + heldPrefix: shark + - type: EmitSoundOnUse + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/ADT/Items/Toys/soundshark.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/ADT/Items/Toys/soundshark.ogg + damage: + types: + Blunt: 0 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 829a78326a8..991a133245a 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -66,6 +66,8 @@ Quantity: 9 - ReagentId: Carbon Quantity: 1 + - ReagentId: Lead + Quantity: 0.1 - type: entity parent: SheetSteel diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index dcbd7dd38d8..ec0fad24bcf 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -31,7 +31,7 @@ - type: startingGear id: ResearchDirectorGear equipment: - jumpsuit: ADTRDJumpsuitWarm + jumpsuit: ClothingUniformJumpsuitResearchDirector back: ClothingBackpackResearchDirectorFilled shoes: ClothingShoesColorBrown outerClothing: ClothingOuterCoatRD @@ -41,6 +41,6 @@ socks: ClothingUnderwearSocksNormal underweart: ClothingUnderwearTopBraRD # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesRD # Sirena-Underwear - innerClothingSkirt: ADTRDJumpskirtWarm + innerClothingSkirt: ClothingUniformJumpskirtResearchDirector satchel: ClothingBackpackSatchelResearchDirectorFilled - duffelbag: ClothingBackpackDuffelResearchDirectorFilled + duffelbag: ClothingBackpackDuffelResearchDirectorFilled \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 8d504082ea2..cadbe2ba7cf 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -114,6 +114,15 @@ }, { "name": "plushie_ma" + }, + { + "name": "shark_mini_pink" + }, + { + "name": "shark_inhand-left" + }, + { + "name": "shark_inhand-right" } ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_inhand-left.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ac540f13726c2eaf4085b485963deafd26ad106e GIT binary patch literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>VB+?4aSW-5 zdpm1m)?o*pwx{YZqWIrVG0e7Rv60;GVEvrY>HDn!4wZlnyW4FXo;_pjQFm@DJNsg7 z^K-k#ZXbP%g;zTL8t=^ABk8w)ssH|SZ1dUs;^#g7+RPxpZsF(PcA${?gqnu3g7O0k zMoGrwybAe13drEx(0|}}#ubIj$IrI8&W?V+;l7UNq7`0W6uT1UK3~HyMNK_|)k*rm zx(_E)*vt3EykoT3*8P8NcG&7`kt@z}I&m|o_1tYd$nfX6_=@{+2c`SJn-rd%`~Glx z?Dt)Z^51T)zx}{?!KxcE%UBiq9;p2w*KvoJw^ClXX30Kc(6WqvbcAtR$)u=uiw3WA(<}-b zbmuO)rpUKo(q>gZnFMe3m8Bib7+QMD8{YW~Co>kzbvNK+cwWi!xURQwK9GID@|?1S zIn$iyf<46t9YYcX-TLP}3v1oxMQh?o|PXJ1)MLh1q9ZGkjMw cxBLMARwb4ImF*M10MiJAr>mdKI;Vst0E*rN$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_inhand-right.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..148314874e8430db2c736d6807fe9a767703034f GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V3P85aSW-5 zdpm1m-XRB`wzI+|X)lhQxW(r&bI~3L>(2};svTFc2nDIWi2KNJ<|*qUpNSH;rWyuY zFUg*-Fjbjv;UtrNQ!f9k+Q+Hc{`dFi_je||Zg{@>aphkHh9ivggeM4oxWn*CXo?_^ zF{h!Y;W^ucUHSOu!W}lamncxDpy-wL-O{#DtoAV-rp*A&2`uB{}?|lcW=wg(8n)Sc@zqPDEyPRzn!z6|s z73m9B7JQwPx$L`g(JR9HvtmN9O^KoCVg$8bUCk~S%jsI0vJ;R0zQaRRrrJ^@l1P7p4za)qEs zTFUJxd<>$$Fp9B^cLE4EJB@``JM-qv8he1AW6*PbM1W`@8i)p>fx8WSjmJm+oxkmN zH|4r%le|Azd^(?Fy<9#QK)PmeIES^htpFN3Y6Fst-TT54&f&1%%*JfB oajxA35K69Dj{wm?G|;<&UuylFAzW7qMF0Q*07*qoM6N<$f}a|$NdN!< literal 0 HcmV?d00001 From f7897e424922b9cd1aa681a0ea86add2176b044e Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 31 Dec 2023 03:27:28 +0300 Subject: [PATCH 4/7] =?UTF-8?q?Revert=20"=D0=BF=D1=80=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D0=B0=D1=82."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 338f39f03b1b653be1d6112274ff993e571a5dc6. --- .../Entities/Structures/Machines/lathe.yml | 32 +++++++++++-------- RobustToolbox | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 64d7ab1d7ee..4a64fed65f3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -793,17 +793,19 @@ staticRecipes: - ClothingUniformJumpsuitColorGrey - ClothingUniformJumpskirtColorGrey - - ADTClothingUniformNewBarmanSuit - - ADTClothingUniformNewBarmanSkirt + - ClothingUniformJumpsuitBartender + - ClothingUniformJumpskirtBartender - ClothingUniformJumpsuitCaptain - ClothingUniformJumpskirtCaptain + - ClothingUniformJumpsuitCapFormal + - ClothingUniformJumpskirtCapFormalDress - ClothingUniformJumpsuitCargo - ClothingUniformJumpskirtCargo - ClothingUniformJumpsuitSalvageSpecialist - ClothingUniformJumpsuitChiefEngineer - ClothingUniformJumpskirtChiefEngineer - - ADTCEJumpsuitWarm - - ADTCEJumpskirtWarm + - ClothingUniformJumpsuitChiefEngineerTurtle + - ClothingUniformJumpskirtChiefEngineerTurtle - ClothingUniformJumpsuitChaplain - ClothingUniformJumpskirtChaplain - ClothingUniformJumpsuitBrigmedic @@ -815,20 +817,22 @@ - ClothingUniformJumpsuitClown - ClothingUniformJumpsuitCMO - ClothingUniformJumpskirtCMO - - ADTCMOJumpsuitWarm - - ADTCMOJumpskirtWarm - ClothingUniformJumpsuitDetective - ClothingUniformJumpskirtDetective - ClothingUniformJumpsuitEngineering - ClothingUniformJumpskirtEngineering - ClothingUniformJumpsuitHoP - ClothingUniformJumpskirtHoP - - ADTHOPJumpsuitWarm - - ADTHOPJumpskirtWarm - ClothingUniformJumpsuitHoS - ClothingUniformJumpskirtHoS - - ADTHOSJumpsuitWarm - - ADTHOSJumpskirtWarm + - ClothingUniformJumpsuitHosFormal + - ClothingUniformJumpskirtHosFormal + - ClothingUniformJumpsuitHoSAlt + - ClothingUniformJumpskirtHoSAlt + - ClothingUniformJumpsuitHoSBlue + - ClothingUniformJumpsuitHoSGrey + - ClothingUniformJumpsuitHoSParadeMale + - ClothingUniformJumpskirtHoSParadeMale - ClothingUniformJumpsuitHydroponics - ClothingUniformJumpskirtHydroponics - ClothingUniformJumpsuitJanitor @@ -847,10 +851,10 @@ - ClothingUniformJumpskirtPrisoner - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM - - ADTQMJumpsuitWarm - - ADTQMJumpsuitWarm - - ADTRDJumpsuitWarm - - ADTRDJumpskirtWarm + - ClothingUniformJumpsuitQMTurtleneck + - ClothingUniformJumpskirtQMTurtleneck + - ClothingUniformJumpsuitResearchDirector + - ClothingUniformJumpskirtResearchDirector - ClothingUniformJumpsuitScientist - ClothingUniformJumpskirtScientist - ClothingUniformJumpsuitSec diff --git a/RobustToolbox b/RobustToolbox index 34d02256fd9..eb092e90efc 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 34d02256fd94ec5647cfbcc6d90633f58721cc88 +Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289 From 26b2cfdb5221cac9b53aa2cc8dbbd0e462cca15d Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 31 Dec 2023 03:29:58 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B1=D0=BE=D1=80=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=81=20=D1=80=D0=BE=D0=B1=D0=B0=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index eb092e90efc..34d02256fd9 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289 +Subproject commit 34d02256fd94ec5647cfbcc6d90633f58721cc88 From e992a67d3a2ff1f1bc2f1358c25ddf4eb89e1054 Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 31 Dec 2023 03:40:23 +0300 Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"=D1=80=D0=B0=D0=B7=D0=B1=D0=BE?= =?UTF-8?q?=D1=80=D0=BA=D0=B8=20=D1=81=20=D1=80=D0=BE=D0=B1=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D0=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 26b2cfdb5221cac9b53aa2cc8dbbd0e462cca15d. --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 34d02256fd9..eb092e90efc 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 34d02256fd94ec5647cfbcc6d90633f58721cc88 +Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289 From 6bdf18974308a00025949f82ecec70c23269165b Mon Sep 17 00:00:00 2001 From: JustKekc Date: Sun, 31 Dec 2023 03:49:54 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=B7=D0=B2=D1=83=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Fun/toys.yml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 217a50ed050..0af956b3af5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -8,16 +8,16 @@ state: plushie_resomi_blue - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: MeleeWeapon soundHit: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: entity parent: BasePlushie @@ -29,16 +29,16 @@ state: plushie_resomi_green - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: MeleeWeapon soundHit: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: entity parent: BasePlushie @@ -50,16 +50,16 @@ state: plushie_resomi_yellow - type: EmitSoundOnUse sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnLand sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: EmitSoundOnActivate sound: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: MeleeWeapon soundHit: - path: /Audio/Items/Toys//Audio/ADT/Items/Toys2.ogg + path: /Audio/Items/Toys/toysqueak2.ogg - type: entity parent: BaseItem