Стаминзащита скафам, новый костюм КМ-а, фикс слайма и дисплейсмент. (#…

…845) ## Описание PR :cl: Filo - add: Новый комбинезон квартирмейстера в лодауте и в шкафу. - add: Скафандрам осщ, гсб и риот обр добавлена защита от стана. - fix: Теперь смайл не умеет вскрывать запитанные шлюзы... - fix: Шлемы скафандров были оптимизированы под вульпканинов..
AdventureTimeSS14 · Dec 3, 2024 · 051ef6d · 051ef6d
2 parents 78d61bb + 5002557
commit 051ef6d
Show file tree

Hide file tree

Showing 30 changed files with 310 additions and 72 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl
@@ -374,3 +374,5 @@ ent-ADTClothingUniformSwimsuitWinth = купальник ведьмочки
     .desc = Точно не для повседневного ношения, так ведь?..
     .suffix = Хеллоуин
 
+ent-ADTClothingUniformJumpsuitCamisoleQM = укороченный камзол квартирмейстера
+    .desc = Камзол, который одновременно хорош как для работы так и для отдыха.
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -118,6 +118,7 @@
         Piercing: 0.7
         Heat: 0.6
         Radiation: 0.9
+    staminaModifier: 0.65
   - type: ClothingSpeedModifier
     walkModifier: 0.9
     sprintModifier: 0.9
@@ -148,7 +149,7 @@
         Heat: 0.7
         Radiation: 0.3
         Caustic: 0.5
-        # Stun: 0.9
+    staminaModifier: 0.85
   - type: ExplosionResistance
     damageCoefficient: 0.6
   - type: ToggleableClothing

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
@@ -1230,3 +1230,13 @@
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/winth_swimsuit.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformJumpsuitCamisoleQM
+  name: Quartermaster's camisole
+  description: short camisole
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/qm_camisole.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -519,3 +519,13 @@
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpskirt/redhat.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformJumpskirtCamisoleQM
+  name: Quartermaster's camisole with skirt
+  description: short camisole
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/qm_camisole.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml
@@ -69,6 +69,33 @@
     - type: Wagging
     - type: Inventory
       speciesId: vulp
+      maleDisplacements:
+        head:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
+        mask:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
+      femaleDisplacements:
+        jumpsuit:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: jumpsuit-female
+        head:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
+        mask:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
     - type: InteractionPopup
       successChance: 1
       interactSuccessString: hugging-success-generic
@@ -114,4 +141,31 @@
       noRot: true
       drawdepth: Mobs
       scale: 0.95, 0.95
-
+    - type: Inventory
+      maleDisplacements:
+        head:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
+        mask:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
+      femaleDisplacements:
+        jumpsuit:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: jumpsuit-female
+        head:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
+        mask:
+          sizeMaps:
+            32:
+              sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+              state: head
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/demon.yml
@@ -55,6 +55,14 @@
       285: 0.8
       248: 0.6
       220: 0.4
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: ADT/Mobs/Species/Demon/displacement.rsi
+            state: jumpsuit-female
+
   - type: InteractionPopup
     successChance: 1
     interactSuccessString: hugging-success-generic
@@ -85,3 +93,10 @@
   components:
   - type: HumanoidAppearance
     species: DemonSpecies
+  - type: Inventory
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: ADT/Mobs/Species/Vulpkanin/displacement.rsi
+            state: jumpsuit-female
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -0,0 +1,27 @@
+- type: loadoutEffectGroup
+  id: ADTQMJumpsuitCamisole
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobQuartermaster
+      time: 72000 #20 hrs
+
+- type: loadoutEffectGroup
+  id: ADTQMJumpskirtCamisole
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobQuartermaster
+      time: 72000 #20 hrs
+
+- type: loadout
+  id: ADTQMJumpsuitCamisole
+  equipment:
+    jumpsuit: ADTClothingUniformJumpsuitCamisoleQM
+
+- type: loadout
+  id: ADTQMJumpskirtCamisole
+  equipment:
+    jumpsuit: ADTClothingUniformJumpskirtCamisoleQM
diff --git a/Resources/Prototypes/ADT/Reagents/Materials/materials.yml b/Resources/Prototypes/ADT/Reagents/Materials/materials.yml
@@ -0,0 +1,7 @@
+- type: material
+  id: ADTPaper
+  stackEntity: Paper
+  name: materials-paper
+  icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper }
+  color: "#d9d9d9"
+  price: 0.01 # it's paper bro what do you expect?
diff --git a/Resources/Prototypes/ADT/Stacks/misc.yml b/Resources/Prototypes/ADT/Stacks/misc.yml
@@ -6,3 +6,11 @@
   maxCount: 1
   # itemSize: 1
 
+- type: stack
+  id: ADTPaper
+  name: paper
+  icon: { sprite: Objects/Misc/bureaucracy.rsi, state: paper }
+  spawn: Paper
+  maxCount: 1
+  # itemSize: 1
+
diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/printer.yml
@@ -107,5 +107,5 @@
       tags:
       - Document
     storage:
-      Paper: 0
+      ADTPaper: 0 # ADT tweak
   - type: DocumentPrinter #DocumentPrinterComponent (ADT)