Some clothing yaml tweaks (#5701)

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -78,7 +78,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetScaf
-  name: scaf
+  name: scaf helmet
   description: A robust, strong helmet.
   components:
   - type: Sprite
@@ -144,4 +144,4 @@
     sprite: Clothing/Head/Helmets/wizardhelm.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/wizardhelm.rsi
-  - type: IngestionBlocker
+  - type: IngestionBlocker

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -16,7 +16,7 @@
         Blunt: 0.9
         Slash: 0.9
         Piercing: 0.9
-        Heat: 0.4 # this technically means it protects against fires pretty well?
+        Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature
 
 - type: entity
   parent: ClothingOuterBase
@@ -98,7 +98,7 @@
 - type: entity
   parent: ClothingOuterArmorHeavy
   id: ClothingOuterArmorMagusblue
-  name: magus blue
+  name: blue magus armor
   description: An blue armored suit that provides good protection.
   components:
   - type: Sprite
@@ -109,7 +109,7 @@
 - type: entity
   parent: ClothingOuterArmorHeavy
   id: ClothingOuterArmorMagusred
-  name: magus red
+  name: red magus armor
   description: A red armored suit that provides good protection.
   components:
   - type: Sprite
@@ -127,6 +127,13 @@
     sprite: Clothing/OuterClothing/Armor/riot.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/riot.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.4
+        Slash: 0.4
+        Piercing: 0.9
+        Heat: 0.9
 
 - type: entity
   parent: ClothingOuterBase
@@ -138,3 +145,10 @@
     sprite: Clothing/OuterClothing/Armor/scaf.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/scaf.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.4
+        Heat: 0.9

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -54,7 +54,7 @@
       coefficients:
         Blunt: 0.7
         Slash: 0.7
-        Piercing: 0.7
+        Piercing: 0.4
         Heat: 0.7
 
 - type: entity

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -11,6 +11,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.5
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.95
+        Heat: 0.8 #All default but having a little better heat prot makes sense based on the description
+        Radiation: 0.25
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -25,6 +33,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.5
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.85
+        Heat: 0.8
+        Radiation: 0.1
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -39,6 +55,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.2 #best armor in the game
+        Slash: 0.2
+        Piercing: 0.2
+        Heat: 0.2
+        Radiation: 0.2
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -53,6 +77,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.65
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.95
+        Heat: 0.90
+        Radiation: 0.05 #all default, rad armor is higher
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -67,6 +99,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.95
+        Heat: 0.8
+        Radiation: 0.05 #combines the engi and atmos bonuses
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -109,6 +149,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.75
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6 #increased blunt as per description, for bomb survival
+        Slash: 0.9
+        Piercing: 0.95
+        Heat: 0.9
+        Radiation: 0.25
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -137,9 +185,17 @@
   - type: PressureProtection
     highPressureMultiplier: 0.75
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.7
+        Heat: 0.8 #buffed combat stats all round
+        Radiation: 0.25
 
 - type: entity
-  parent: ClothingOuterHardsuitBase
+  parent: ClothingOuterHardsuitSecurity #set parent to sec hardsuit, hopefully wont break anything
   id: ClothingOuterHardsuitSecurityRed
   name: head of security's hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
@@ -165,6 +221,14 @@
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.4
+        Heat: 0.4 #all the combat numbers are pumped up here
+        Radiation: 0.20
 
 - type: entity
   parent: ClothingOuterHardsuitBase
@@ -179,3 +243,11 @@
   - type: PressureProtection
     highPressureMultiplier: 0.45
     lowPressureMultiplier: 100
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.4
+        Heat: 0.4 #same as the nukie suit
+        Radiation: 0.20

Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

@@ -8,6 +8,13 @@
     sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/bombsuit.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.2 #big blast protection, a little protection from heat, negligable cushioning from other damage cos its thick
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.75
 
 - type: entity
   parent: ClothingOuterBase
@@ -35,6 +42,11 @@
     coefficient: 0.001
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/fire.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.9
+        Heat: 0.7 #makes sense right?
 
 - type: entity
   parent: ClothingOuterBase
@@ -74,6 +86,13 @@
     sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/spaceninja.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.6
 
 - type: entity
   parent: ClothingOuterBase

Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

@@ -8,6 +8,13 @@
     sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/mercwebvest.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7 #slightly better overall protection but slightly worse than kevlar against bullets seems sensible
+        Slash: 0.7
+        Piercing: 0.5
+        Heat: 0.9
 
 - type: entity
   parent: ClothingOuterBase
@@ -19,6 +26,13 @@
     sprite: Clothing/OuterClothing/Vests/webvest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/webvest.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6 #ballistic plates = better protection
+        Slash: 0.6
+        Piercing: 0.3
+        Heat: 0.9
 
 - type: entity
   parent: ClothingOuterBase

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -41,6 +41,10 @@
     sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Radiation: 0.8
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -156,7 +160,7 @@
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtHoSParadeMale
   name: head of security's parade uniform
-  description: A male head of security's luxury-wear, for special occasions.
+  description: A head of security's luxury-wear, for special occasions.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -63,6 +63,11 @@
     sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Radiation: 0.8
+
 
 - type: entity
   parent: ClothingUniformBase