Merge pull request #261 from JustKekc/Things

Всякая всячина.
AdventureTimeSS14 · Dec 31, 2023 · c9c1dbe · c9c1dbe
2 parents b90ba19 + 6bdf189
commit c9c1dbe
Show file tree

Hide file tree

Showing 18 changed files with 216 additions and 9 deletions.
diff --git a/Resources/Audio/ADT/Items/Toys/soundshark.ogg b/Resources/Audio/ADT/Items/Toys/soundshark.ogg
diff --git 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/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 = Именная, Клавед
diff --git 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/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
@@ -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 = Самые чистые воды прямиком из рук Бога, известные магическим исцелением ран.
diff --git 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: Clothing/Uniforms/Jumpskirt/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hos.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_hos.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTRDJumpskirtWarm
+  name: rd Jumpskirt warm
+  description: A purple turtleneck to wear stylishly with labcoat.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_rd.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi #ADT/Clothing/Uniforms/Jumpskirt/jumpskirt_rd.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
@@ -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: Clothing/Uniforms/Jumpsuit/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hos.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_hos.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTRDJumpsuitWarm
+  name: rd jumpsuit warm
+  description: A purple turtleneck to wear stylishly with labcoat.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_rd.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi #ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_rd.rsi
+
 #костюм Эйдана
 
 - type: entity

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
@@ -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/ADT/Recipes/Lathes/clothing.yml 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
diff --git 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
@@ -197,8 +195,6 @@
       - id: ClothingEyesGlassesMeson
       - id: ClothingBeltChiefEngineerFilled
       - id: ClothingHandsGlovesColorYellow
-      - id: ClothingUniformJumpsuitChiefEngineerTurtle
-      - id: ClothingUniformJumpskirtChiefEngineerTurtle
       - id: CigarCase
         prob: 0.15
       - id: DoorRemoteEngineering
@@ -358,8 +354,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/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/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml
@@ -90,6 +90,9 @@
       uiWindowPos: 1,3
       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
@@ -43,4 +43,4 @@
   underwearb: ClothingUnderwearBottomPantiesRD # Sirena-Underwear
   innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
-  duffelbag: ClothingBackpackDuffelResearchDirectorFilled
+  duffelbag: ClothingBackpackDuffelResearchDirectorFilled
diff --git 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
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
diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_mini_pink.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/shark_mini_pink.png