Add pressure protection to hardsuits, cleanup hardsuit prototypes

Content.Client/IgnoredComponents.cs

@@ -162,6 +162,7 @@
             "GasVapor",
             "MobStateManager",
             "Metabolism",
+            "PressureProtection",
         };
     }
 }

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

@@ -1,7 +1,17 @@
 - type: entity
   parent: HatBase
-  id: HatHardsuit-old
+  id: HelmetHardsuitBase
-  name: hardsuit-old
+  name: base hardsuit helmet
+  abstract: true
+  components:
+    - type: PressureProtection
+      highPressureMultiplier: 0.75
+      lowPressureMultiplier: 100
+
+- type: entity
+  parent: HelmetHardsuitBase
+  id: HatHardsuitOld
+  name: old hardsuit helmet
   description: An old helmet from a hardsuit. Still functional, for now.
   components:
   - type: Sprite
@@ -10,11 +20,15 @@
     sprite: Clothing/Head/hardsuit-old.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-old.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.85
+    lowPressureMultiplier: 45
+
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-atmos
+  id: HelmetHardsuitAtmos
-  name: hardsuit-atmos
+  name: atmos hardsuit helmet
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
   components:
   - type: Sprite
@@ -23,11 +37,14 @@
     sprite: Clothing/Head/hardsuit-atmos.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-atmos.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-engineering
+  id: HelmetHardsuitEngineering
-  name: hardsuit-engineering
+  name: engineering hardsuit helmet
   description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
   components:
   - type: Sprite
@@ -36,11 +53,14 @@
     sprite: Clothing/Head/hardsuit-engineering.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-engineering.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.65
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-hazardhardsuit
+  id: HelmetHardsuitHazard
-  name: hardsuit-hazardhardsuit
+  name: hazard hardsuit helmet
   description: Robust hardsuit helmet made for dangerous and hazardous situations.
   components:
   - type: Sprite
@@ -51,9 +71,9 @@
     sprite: Clothing/Head/hardsuit-hazardhardsuit.rsi
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-medical
+  id: HelmetHardsuitMedical
-  name: hardsuit-medical
+  name: medical hardsuit helmet
   description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
   components:
   - type: Sprite
@@ -62,11 +82,14 @@
     sprite: Clothing/Head/hardsuit-medical.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-medical.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.80
+    lowPressureMultiplier: 55
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-mining
+  id: HelmetHardsuitMining
-  name: hardsuit-mining
+  name: mining hardsuit helmet
   description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
   components:
   - type: Sprite
@@ -75,11 +98,14 @@
     sprite: Clothing/Head/hardsuit-mining.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-mining.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.70
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-sectg
+  id: HelmetHardsuitSecurity
-  name: hardsuit-sectg
+  name: security hardsuit helmet
   description: Armored hardsuit helmet for security needs.
   components:
   - type: Sprite
@@ -88,11 +114,14 @@
     sprite: Clothing/Head/hardsuit-sectg.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-sectg.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.70
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-syndie
+  id: HelmetHardsuitSyndie
-  name: hardsuit-syndie
+  name: blood red hardsuit helmet
   description: An advanced red hardsuit helmet designed for work in special operations.
   components:
   - type: Sprite
@@ -103,11 +132,14 @@
     state: icon
   - type: Clothing
     sprite: Clothing/Head/hardsuit-syndie.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-ce
+  id: HelmetHardsuitCE
-  name: hardsuit-ce
+  name: CE hardsuit helmet
   description: Special hardsuit helmet, made for the chief engineer of the station.
   components:
   - type: Sprite
@@ -116,11 +148,14 @@
     sprite: Clothing/Head/hardsuit-white.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-white.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: HatBase
+  parent: HelmetHardsuitBase
-  id: HatHardsuit-wiz
+  id: HelmetHardsuitWizard
-  name: hardsuit-wiz
+  name: wizard hardsuit helmet
   description: A bizarre gem-encrusted helmet that radiates magical energies.
   components:
   - type: Sprite
@@ -129,3 +164,6 @@
     sprite: Clothing/Head/hardsuit-wiz.rsi
   - type: Clothing
     sprite: Clothing/Head/hardsuit-wiz.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100

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

@@ -1,7 +1,17 @@
 - type: entity
   parent: OuterclothingBase
-  id: OuterclothingDeathsquad
+  id: HardsuitBase
-  name: deathsquad
+  name: base hardsuit
+  abstract: true
+  components:
+    - type: PressureProtection
+      highPressureMultiplier: 0.75
+      lowPressureMultiplier: 100
+
+- type: entity
+  parent: HardsuitBase
+  id: HardsuitDeathsquad
+  name: deathsquad hardsuit
   description: An advanced hardsuit favored by commandos for use in special operations.
   components:
   - type: Sprite
@@ -10,10 +20,13 @@
     sprite: Clothing/OuterClothing/deathsquad.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/deathsquad.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterclothingIhvoidsuit
+  id: IHVoidsuit
   name: IH voidsuit
   description: A special void suit that protects against hazardous, low pressure environments.
   components:
@@ -23,11 +36,14 @@
     sprite: Clothing/OuterClothing/ihvoidsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/ihvoidsuit.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 1
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitatmos
+  id: HardsuitAtmos
-  name: hardsuit atmos
+  name: atmos hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has thermal shielding.
   components:
   - type: Sprite
@@ -36,11 +52,14 @@
     sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_atmos.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitengineering
+  id: HardsuitEngineering
-  name: hardsuit engineering
+  name: engineering hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has radiation shielding.
   components:
   - type: Sprite
@@ -49,11 +68,14 @@
     sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_engineering.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.65
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuithazardhardsuit
+  id: HardsuitHazard
-  name: hardsuit hazard hardsuit
+  name: hazard hardsuit
   description: A robust hardsuit made for dangerous and hazardous situations.
   components:
   - type: Sprite
@@ -62,11 +84,14 @@
     sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_hazardhardsuit.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitmedical
+  id: HardsuitMedical
-  name: hardsuit medical
+  name: medical hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
   components:
   - type: Sprite
@@ -75,11 +100,14 @@
     sprite: Clothing/OuterClothing/hardsuit_medical.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_medical.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitmining
+  id: HardsuitMining
-  name: hardsuit mining
+  name: mining hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
   components:
   - type: Sprite
@@ -88,11 +116,14 @@
     sprite: Clothing/OuterClothing/hardsuit_mining.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_mining.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitsectg
+  id: HardsuitSecurity
-  name: hardsuit sectg
+  name: security hardsuit
   description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
   components:
   - type: Sprite
@@ -101,11 +132,14 @@
     sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_sectg.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.75
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitsyndie
+  id: HardsuitSyndie
-  name: hardsuit syndie
+  name: blood red hardsuit
   description: A dual-mode advanced hardsuit designed for work in special operations.
   components:
   - type: Sprite
@@ -114,12 +148,15 @@
     sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_syndie.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
 
 # Some massive smoothbrain had this named "hardsuit white" yeah thanks fuckhead really useful.
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitce
+  id: HardsuitCE
-  name: hardsuit ce
+  name: CE hardsuit
   description: A special hardsuit that protects against hazardous, low pressure environments, made for the chief engineer of the station.
   components:
   - type: Sprite
@@ -128,11 +165,14 @@
     sprite: Clothing/OuterClothing/hardsuit_ce.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_ce.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterClothingHardsuitwiz
+  id: HardsuitWizard
-  name: hardsuit wiz
+  name: wizard hardsuit
   description: A bizarre gem-encrusted suit that radiates magical energies.
   components:
   - type: Sprite
@@ -141,11 +181,14 @@
     sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/hardsuit_wiz.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterclothingSpace
+  id: Spacesuit
-  name: space
+  name: spacesuit
   description: A basic space suit.
   components:
   - type: Sprite
@@ -154,12 +197,15 @@
     sprite: Clothing/OuterClothing/space.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/space.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 1
+    lowPressureMultiplier: 100
 
 # I don't know what the hell "td" is but whatever i'll dump it here.
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterclothingTdgreen
+  id: HardsuitTDGreen
-  name: td green
+  name: green TD hardsuit
   description: Heavily armored black and green suit for long combat situations, also provides protection from low-pressure/vacuum damage.
   components:
   - type: Sprite
@@ -168,11 +214,14 @@
     sprite: Clothing/OuterClothing/tdgreen.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/tdgreen.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 1
+    lowPressureMultiplier: 100
 
 - type: entity
-  parent: OuterclothingBase
+  parent: HardsuitBase
-  id: OuterclothingTdred
+  id: HardsuitTDRed
-  name: td red
+  name: red TD hardsuit
   description: Heavily armored black and red suit for long combat situations, also provides protection from low-pressure/vacuum damage
   components:
   - type: Sprite
@@ -181,3 +230,6 @@
     sprite: Clothing/OuterClothing/tdred.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/tdred.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 1
+    lowPressureMultiplier: 100