EVA suit resprite (+ new fluff hardsuit) (#17268)

* eva suit resprite

* speed bump

* yaml linter fix

Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml

@@ -12,7 +12,34 @@
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVA
         - id: ClothingMaskBreath
-        
+
+#Basic EVA (Big Ass Helmet)
+- type: entity
+  id: SuitStorageEVAAlternate
+  parent: SuitStorageBase
+  suffix: EVA, Large Helmet
+  components:
+  - type: StorageFill
+    contents:
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
+        - id: ClothingOuterHardsuitEVA
+        - id: ClothingHeadHelmetEVALarge
+        - id: ClothingMaskBreath
+
+#Emergency EVA
+- type: entity
+  id: SuitStorageEVAEmergency
+  parent: SuitStorageBase
+  suffix: Emergency EVA
+  components:
+  - type: StorageFill
+    contents:
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
+        - id: ClothingOuterSuitEmergency
+        - id: ClothingMaskBreath
+     
 #Prisoner EVA
 - type: entity
   id: SuitStorageEVAPrisoner
@@ -21,10 +48,10 @@
   components:
   - type: StorageFill
     contents:
-#        - id: NitrogenTankFilled #there's no emergency nitrogen tank to match yet so i have opted to remove it. call it cost cutting measures
-        - id: EmergencyOxygenTankFilled
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
-        - id: ClothingHeadHelmetEVA
+        - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
 
 #Syndicate EVA
@@ -51,10 +78,9 @@
     contents:
         - id: NitrogenTankFilled
         - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitEVAPrisoner
-        - id: ClothingHeadHelmetEVA
+        - id: ClothingOuterHardsuitPirateEVA
         - id: ClothingMaskGas
-
+        
 #NTSRA Voidsuit
 - type: entity
   id: SuitStorageNTSRA
@@ -69,6 +95,19 @@
         - id: ClothingMaskBreath
         
 #HARDSUITS
+#Basic hardsuit
+- type: entity
+  id: SuitStorageBasic
+  parent: SuitStorageBase
+  suffix: Basic Hardsuit
+  components:
+  - type: StorageFill
+    contents:
+        - id: NitrogenTankFilled
+        - id: OxygenTankFilled
+        - id: ClothingOuterHardsuitBasic
+        - id: ClothingMaskBreath
+
 #Engineering hardsuit
 - type: entity
   id: SuitStorageEngi

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -779,7 +779,7 @@
   id: UplinkEVASyndie
   name: uplink-eva-syndie-name
   description: uplink-eva-syndie-desc
-  icon: { sprite: /Textures/Clothing/OuterClothing/Suits/syndicate.rsi, state: icon }
+  icon: { sprite: /Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateEVABundle
   cost:
     Telecrystal: 2

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

@@ -121,6 +121,7 @@
     tags:
     - HidesHair
     - WhitelistChameleon
+    - HelmetEVA
   - type: IdentityBlocker
 
 - type: entity

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

@@ -0,0 +1,79 @@
+#EVA Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetEVA
+  name: EVA helmet
+  description: An old-but-gold helmet designed for extravehicular activites. Infamous for making security officers paranoid.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/eva.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/eva.rsi
+
+#Large EVA Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetEVALarge
+  name: EVA helmet
+  description: An old-but-gold helmet designed for extravehicular activites.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/eva_large.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/eva_large.rsi
+
+#Syndicate EVA Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetSyndicate
+  name: syndicate EVA helmet
+  description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/eva_syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/eva_syndicate.rsi
+ 
+#Cosmonaut Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetCosmonaut
+  name: cosmonaut helmet
+  description: Ancient design, but advanced manufacturing. #Description here originally started with " A deceptively well armored space helmet." Potentially had armor values in SS13 that weren't brought over?
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/cosmonaut.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/cosmonaut.rsi
+
+#Paramedic Void Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetVoidParamed
+  name: Paramedic Void Helmet
+  description: A void helmet made for paramedics.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/paramedhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/paramedhelm.rsi
+  - type: TemperatureProtection
+    coefficient: 0.1
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.95
+        Heat: 0.90
+        Radiation: 0.75
+
+#Ancient Void Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetAncient
+  name: NTSRA void helmet
+  description: An ancient space helmet, designed by the NTSRA branch of CentCom.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi

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

@@ -1,3 +1,29 @@
+#When adding new hardsuits, please try to keep the organization consistent with hardsuit.yml (if possible.)
+
+#CREW HARDSUITS
+#Standard Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitBasic
+  noSpawn: true
+  name: basic hardsuit helmet
+  description: A basic-looking hardsuit helmet that provides minor protection against most sources of damage.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/basic.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/basic.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+        Radiation: 0.9
+        Caustic: 0.9
+
+#Atmospherics Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitAtmos
@@ -45,36 +71,7 @@
   - type: TemperatureProtection
     coefficient: 0.005
 
-- type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitCap
-  noSpawn: true
-  name: captain's hardsuit helmet
-  description: Special hardsuit helmet, made for the captain of the station.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/capspace.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/capspace.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.3
-    lowPressureMultiplier: 1000
-
-- type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitDeathsquad
-  noSpawn: true
-  name: deathsquad hardsuit helmet
-  description: A robust helmet for special operations.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.08
-    lowPressureMultiplier: 1000
-
+#Engineering Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitEngineering
@@ -92,233 +89,7 @@
     highPressureMultiplier: 0.1
     lowPressureMultiplier: 1000
 
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitEngineeringWhite
-  noSpawn: true
-  name: chief engineer's hardsuit helmet
-  description: Special hardsuit helmet, made for the chief engineer of the station.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
-  - type: PointLight
-    color: "#daffad"
-  - type: PressureProtection
-    highPressureMultiplier: 0.08
-    lowPressureMultiplier: 1000
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitMedical
-  noSpawn: true
-  name: chief medical officer's hardsuit helmet
-  description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/medical.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/medical.rsi
-  - type: PointLight
-    color: "#adf1ff"
-  - type: PressureProtection
-    highPressureMultiplier: 0.6
-    lowPressureMultiplier: 5500
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitRd
-  noSpawn: true
-  name: experimental research hardsuit helmet
-  description: Lightweight hardsuit helmet that doesn't restrict your head movements.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/rd.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/rd.rsi
-  - type: PointLight
-    color: "#d6adff"
-  - type: PressureProtection
-    highPressureMultiplier: 0.60
-    lowPressureMultiplier: 5500
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitSalvage
-  noSpawn: true
-  name: salvage 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
-    sprite: Clothing/Head/Hardsuits/salvage.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/salvage.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.525
-    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-  - type: PointLight
-    radius: 7
-    energy: 3
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitSecurity
-  noSpawn: true
-  name: security hardsuit helmet
-  description: Armored hardsuit helmet for security needs.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/security.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/security.rsi
-  - type: PointLight
-    color: "#ffeead"
-  - type: PressureProtection
-    highPressureMultiplier: 0.525
-    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitSecurityRed
-  noSpawn: true
-  name: head of security's hardsuit helmet
-  description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/security-red.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/security-red.rsi
-  - type: PointLight
-    color: "#ffeead"
-  - type: PressureProtection
-    highPressureMultiplier: 0.45
-    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitBrigmedic
-  noSpawn: true
-  name: brigmedic hardsuit helmet
-  description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/brigmedic.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/brigmedic.rsi
-  - type: PointLight
-    color: "#00FFFF"
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.95
-        Heat: 0.95
-        Radiation: 0.90
-        Caustic: 0.90
-  - type: PressureProtection
-    highPressureMultiplier: 0.6
-    lowPressureMultiplier: 5500
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitWarden
-  noSpawn: true
-  name: warden's hardsuit helmet
-  description: A modified riot helmet. Oddly comfortable.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/security-warden.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/security-warden.rsi
-  - type: PointLight
-    color: "#ffeead"
-  - type: PressureProtection
-    highPressureMultiplier: 0.525
-    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitSyndie
-  noSpawn: true
-  name: blood-red hardsuit helmet
-  description: An advanced red hardsuit helmet designed for work in special operations.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/syndicate.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/syndicate.rsi
-  - type: PointLight
-    color: green
-  - type: PressureProtection
-    highPressureMultiplier: 0.08
-    lowPressureMultiplier: 1000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8
-        Radiation: 0.5
-
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitWizard
-  noSpawn: true
-  name: wizard hardsuit helmet
-  description: A bizarre gem-encrusted helmet that radiates magical energies.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/wizard.rsi
-  - type: PointLight
-    color: "#ffadfb"
-  - type: PressureProtection
-    highPressureMultiplier: 0.27
-    lowPressureMultiplier: 1000
-
-- type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitLing
-  noSpawn: true
-  name: organic space helmet
-  description: A spaceworthy biomass of pressure and temperature resistant tissue.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.225
-    lowPressureMultiplier: 10000
-
+#Spationaut Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSpatio
@@ -353,6 +124,228 @@
     highPressureMultiplier: 0.72
     lowPressureMultiplier: 10000
 
+#Salvage Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSalvage
+  noSpawn: true
+  name: salvage 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
+    sprite: Clothing/Head/Hardsuits/salvage.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/salvage.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+  - type: PointLight
+    radius: 7
+    energy: 3
+
+#Security Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSecurity
+  noSpawn: true
+  name: security hardsuit helmet
+  description: Armored hardsuit helmet for security needs.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/security.rsi
+  - type: PointLight
+    color: "#ffeead"
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+
+#Brigmedic Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitBrigmedic
+  noSpawn: true
+  name: brigmedic hardsuit helmet
+  description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/brigmedic.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/brigmedic.rsi
+  - type: PointLight
+    color: "#00FFFF"
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95
+        Radiation: 0.90
+        Caustic: 0.90
+  - type: PressureProtection
+    highPressureMultiplier: 0.6
+    lowPressureMultiplier: 5500
+
+#Warden's Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitWarden
+  noSpawn: true
+  name: warden's hardsuit helmet
+  description: A modified riot helmet. Oddly comfortable.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/security-warden.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/security-warden.rsi
+  - type: PointLight
+    color: "#ffeead"
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+
+#Captain's Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitCap
+  noSpawn: true
+  name: captain's hardsuit helmet
+  description: Special hardsuit helmet, made for the captain of the station.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/capspace.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/capspace.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.3
+    lowPressureMultiplier: 1000
+
+#Chief Engineer's Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitEngineeringWhite
+  noSpawn: true
+  name: chief engineer's hardsuit helmet
+  description: Special hardsuit helmet, made for the chief engineer of the station.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+  - type: PointLight
+    color: "#daffad"
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 1000
+
+#Chief Medical Officer's Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitMedical
+  noSpawn: true
+  name: chief medical officer's hardsuit helmet
+  description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/medical.rsi
+  - type: PointLight
+    color: "#adf1ff"
+  - type: PressureProtection
+    highPressureMultiplier: 0.6
+    lowPressureMultiplier: 5500
+
+#Research Director's Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitRd
+  noSpawn: true
+  name: experimental research hardsuit helmet
+  description: Lightweight hardsuit helmet that doesn't restrict your head movements.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/rd.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/rd.rsi
+  - type: PointLight
+    color: "#d6adff"
+  - type: PressureProtection
+    highPressureMultiplier: 0.60
+    lowPressureMultiplier: 5500
+
+#Head of Security's hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSecurityRed
+  noSpawn: true
+  name: head of security's hardsuit helmet
+  description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/security-red.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/security-red.rsi
+  - type: PointLight
+    color: "#ffeead"
+  - type: PressureProtection
+    highPressureMultiplier: 0.45
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+
+#ANTAG HARDSUITS
+#Blood-red Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSyndie
+  noSpawn: true
+  name: blood-red hardsuit helmet
+  description: An advanced red hardsuit helmet designed for work in special operations.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/syndicate.rsi
+  - type: PointLight
+    color: green
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+        Heat: 0.8
+        Radiation: 0.5
+
+#Cybersun Juggernaut Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitCybersun
@@ -368,31 +361,7 @@
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
 
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitSyndieCommander
-  noSpawn: true
-  name: syndicate commander helmet
-  description: A syndicate hardsuit helmet custom designed for commanders of syndicate operative squads.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
-  - type: PointLight
-    color: green
-  - type: PressureProtection
-    highPressureMultiplier: 0.08
-    lowPressureMultiplier: 1000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.6
-        Slash: 0.6
-        Piercing: 0.6
-        Heat: 0.8
-        Radiation: 0.5
-
+#Syndicate Elite Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitSyndieElite
@@ -420,6 +389,173 @@
         Heat: 0.2
         Radiation: 0.5
 
+#Syndicate Commander Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSyndieCommander
+  noSpawn: true
+  name: syndicate commander helmet
+  description: A syndicate hardsuit helmet custom designed for commanders of syndicate operative squads.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
+  - type: PointLight
+    color: green
+  - type: PressureProtection
+    highPressureMultiplier: 0.08
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.6
+        Piercing: 0.6
+        Heat: 0.8
+        Radiation: 0.5
+
+#Wizard Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitWizard
+  noSpawn: true
+  name: wizard hardsuit helmet
+  description: A bizarre gem-encrusted helmet that radiates magical energies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/wizard.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/wizard.rsi
+  - type: PointLight
+    color: "#ffadfb"
+  - type: PressureProtection
+    highPressureMultiplier: 0.27
+    lowPressureMultiplier: 1000
+
+#Organic Space Suit
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitLing
+  noSpawn: true
+  name: organic space helmet
+  description: A spaceworthy biomass of pressure and temperature resistant tissue.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.225
+    lowPressureMultiplier: 10000
+
+#Pirate EVA Suit (Deep Space EVA Suit)
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitPirateEVA
+  noSpawn: true
+  name: deep space EVA helmet
+  suffix: Pirate
+  description: A deep space EVA helmet, very heavy but provides good protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/pirateeva.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/pirateeva.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.3
+    lowPressureMultiplier: 1000
+
+#Pirate Captain Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitBase
+  id: ClothingHeadHelmetHardsuitPirateCap
+  noSpawn: true
+  name: pirate captain's hardsuit helmet
+  suffix: Pirate
+  description: A special hardsuit helmet, made for the captain of a pirate ship.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.3
+    lowPressureMultiplier: 1000
+
+#CENTCOMM / ERT HARDSUITS
+#ERT Leader Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndieCommander
+  id: ClothingHeadHelmetHardsuitERTLeader
+  noSpawn: true
+  name: ERT leader hardsuit helmet
+  description: A special hardsuit helmet worn by members of an emergency response team.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
+  - type: PointLight
+    color: "#addbff"
+
+#ERT Engineer Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTEngineer
+  noSpawn: true
+  name: ERT engineer hardsuit helmet
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
+  - type: PointLight
+    color: "#f4ffad"
+
+#ERT Medical Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndieElite
+  id: ClothingHeadHelmetHardsuitERTMedical
+  noSpawn: true
+  name: ERT medic hardsuit helmet
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
+  - type: PointLight
+    color: "#adffec"
+
+#ERT Security Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTSecurity
+  noSpawn: true
+  name: ERT security hardsuit helmet
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
+  - type: PointLight
+    color: "#ffadc6"
+
+#ERT Janitor Hardsuit
+- type: entity
+  parent: ClothingHeadHelmetHardsuitSyndie
+  id: ClothingHeadHelmetHardsuitERTJanitor
+  noSpawn: true
+  name: ERT janitor hardsuit helmet
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
+  - type: PointLight
+    color: "#cbadff"
+
+#CBURN Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetCBURN
@@ -461,105 +597,24 @@
         Cold: 0.2
         Radiation: 0.2
 
+#Deathsquad Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitPirateCap
+  id: ClothingHeadHelmetHardsuitDeathsquad
   noSpawn: true
-  name: ancient hardsuit helmet
-  suffix: Pirate
-  description: Special hardsuit helmet, made for the captain of a pirate ship.
+  name: deathsquad hardsuit helmet
+  description: A robust helmet for special operations.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
+    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
+    sprite: Clothing/Head/Hardsuits/deathsquad.rsi
   - type: PressureProtection
-    highPressureMultiplier: 0.3
+    highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
 
-- type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitPirateEVA
-  noSpawn: true
-  name: deep space EVA helmet
-  suffix: Pirate
-  description: A deep space EVA helmet, very heavy but provides good protection.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/pirateeva.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/pirateeva.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.3
-    lowPressureMultiplier: 1000
-
-#ERT
-- type: entity
-  parent: ClothingHeadHelmetHardsuitSyndieCommander
-  id: ClothingHeadHelmetHardsuitERTLeader
-  noSpawn: true
-  name: ERT leader hardsuit helmet
-  description: A special hardsuit helmet worn by members of an emergency response team.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
-  - type: PointLight
-    color: "#addbff"
-
-- type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
-  id: ClothingHeadHelmetHardsuitERTEngineer
-  noSpawn: true
-  name: ERT engineer hardsuit helmet
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
-  - type: PointLight
-    color: "#f4ffad"
-
-- type: entity
-  parent: ClothingHeadHelmetHardsuitSyndieElite
-  id: ClothingHeadHelmetHardsuitERTMedical
-  noSpawn: true
-  name: ERT medic hardsuit helmet
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
-  - type: PointLight
-    color: "#adffec"
-
-- type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
-  id: ClothingHeadHelmetHardsuitERTSecurity
-  noSpawn: true
-  name: ERT security hardsuit helmet
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
-  - type: PointLight
-    color: "#ffadc6"
-
-- type: entity
-  parent: ClothingHeadHelmetHardsuitSyndie
-  id: ClothingHeadHelmetHardsuitERTJanitor
-  noSpawn: true
-  name: ERT janitor hardsuit helmet
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
-  - type: PointLight
-    color: "#cbadff"
-
+#MISC. HARDSUITS
+#Clown Hardsuit
 - type: entity
   parent: ClothingHeadHelmetHardsuitSecurity
   id: ClothingHeadHelmetHardsuitClown

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

@@ -1,3 +1,54 @@
+#(Security) Helmet
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetHelmet
+  name: helmet
+  description: A usual helmet.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/security.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/security.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.9
+        Heat: 0.8
+
+#Old (Security) Helmet
+- type: entity
+  parent: ClothingHeadHelmetHelmet
+  id: ClothingHeadHelmetHelmetOld
+  name: helmet
+  description: An old usual helmet.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/securityold.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/securityold.rsi
+
+#Light Riot Helmet
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHelmetRiot
+  name: light riot helmet
+  description: It's a helmet specifically designed to protect against close range attacks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/light_riot.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/light_riot.rsi
+  - type: IngestionBlocker
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.8
+
+#Bombsuit Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetBombSuit
@@ -17,23 +68,8 @@
         Blunt: 0.5
         Slash: 0.8
         Piercing: 0.8
-  - type: IdentityBlocker
-
-- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadHelmetCosmonaut
-  name: cosmonaut helmet
-  description: A deceptively well armored space helmet. Ancient design, but advanced manufacturing.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/cosmonaut.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/cosmonaut.rsi
-  - type: IngestionBlocker
-  - type: Tag
-    tags:
-    - HelmetEVA
 
+#Cult Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetCult
@@ -53,68 +89,7 @@
         Piercing: 0.9
         Heat: 0.8
 
-- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadHelmetEVA
-  name: EVA helmet
-  description: A basic helmet designed for extravehicular activities.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/eva.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/eva.rsi
-  - type: IngestionBlocker
-  - type: Tag
-    tags:
-    - HelmetEVA
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetHelmet
-  name: helmet
-  description: A usual helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/security.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/security.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.9
-        Heat: 0.8
-
-- type: entity
-  parent: ClothingHeadHelmetHelmet
-  id: ClothingHeadHelmetHelmetOld
-  name: helmet
-  description: An old usual helmet.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/securityold.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/securityold.rsi
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHelmetRiot
-  name: light riot helmet
-  description: It's a helmet specifically designed to protect against close range attacks.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/light_riot.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/light_riot.rsi
-  - type: IngestionBlocker
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-
+#SCAF Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetScaf
@@ -136,6 +111,7 @@
     tags:
     - HidesHair
 
+#Space Ninja Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetSpaceNinja
@@ -152,26 +128,12 @@
     - HidesHair
   - type: IdentityBlocker
 
-- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadHelmetSyndicate
-  name: syndicate EVA helmet
-  description: A stylish, robust syndicate helmet
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/syndicate.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/syndicate.rsi
-  - type: IngestionBlocker
-  - type: Tag
-    tags:
-    - HelmetEVA
-
+#Templar Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetTemplar
   name: templar helmet
-  description: DEUS VULT
+  description: DEUS VULT!
   components:
   - type: Sprite
     sprite: Clothing/Head/Helmets/templar.rsi
@@ -180,6 +142,7 @@
   - type: IngestionBlocker
   - type: IdentityBlocker
 
+#Thunderdome Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetThunderdome
@@ -191,6 +154,7 @@
   - type: Clothing
     sprite: Clothing/Head/Helmets/thunderdome.rsi
 
+#Wizard Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetWizardHelm
@@ -204,6 +168,7 @@
   - type: IngestionBlocker
   - type: IdentityBlocker
 
+#Fire Helmet
 - type: entity
   parent: ClothingHeadLightBase
   id: ClothingHeadHelmetFire
@@ -232,6 +197,7 @@
     - HidesHair
     - WhitelistChameleon
 
+#Atmos Fire Helmet
 - type: entity
   parent: ClothingHeadLightBase
   id: ClothingHeadHelmetAtmosFire
@@ -263,11 +229,12 @@
     - HidesHair
     - WhitelistChameleon
 
+#Chitinous Helmet
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHelmetLing
   name: chitinous helmet
-  description: Inflates the changeling's body into an all-consuming chitinous mass of armor.
+  description: An all-consuming chitinous mass of armor.
   components:
   - type: Sprite
     sprite: Clothing/Head/Helmets/linghelmet.rsi
@@ -279,40 +246,4 @@
         Blunt: 0.5
         Slash: 0.5
         Piercing: 0.5
-        Heat: 0.9
-  - type: IdentityBlocker
-
-- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadHelmetVoidParamed
-  name: Paramedic Void Helmet
-  description: A void helmet made for paramedics.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/paramedhelm.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/paramedhelm.rsi
-  - type: IngestionBlocker
-  - type: TemperatureProtection
-    coefficient: 0.1
-  - type: Armor
-    modifiers:
-      coefficients:
-        Slash: 0.95
-        Heat: 0.90
-        Radiation: 0.75
-
-- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadHelmetAncient
-  name: NTSRA void helmet
-  description: An ancient space helmet, designed by the NTSRA branch of CentCom.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
-  - type: IngestionBlocker
-  - type: Tag
-    tags:
-    - HelmetEVA
+        Heat: 0.9

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

@@ -0,0 +1,101 @@
+#Basic EVA
+- type: entity
+  parent: ClothingOuterEVASuitBase
+  id: ClothingOuterHardsuitEVA
+  name: EVA suit
+  description: A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/eva.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/eva.rsi
+
+#Syndicate EVA
+- type: entity
+  parent: ClothingOuterEVASuitBase
+  id: ClothingOuterHardsuitSyndicate
+  name: syndicate EVA suit
+  description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'"
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/eva_syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/eva_syndicate.rsi
+
+#Emergency EVA
+- type: entity
+  parent: ClothingOuterEVASuitBase
+  id: ClothingOuterSuitEmergency
+  name: emergency EVA suit
+  description: An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to bide you time from the harsh vaccuum of space.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/eva_emergency.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/eva_emergency.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.5
+    sprintModifier: 0.5
+  - type: TemperatureProtection
+    coefficient: 0.5
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetEVALarge
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+#Prisoner EVA
+- type: entity
+  parent: ClothingOuterEVASuitBase
+  id:  ClothingOuterHardsuitEVAPrisoner
+  name: prisoner EVA suit
+  description: A lightweight space suit for prisoners to protect them from the vacuum of space during emergencies.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi
+
+#NTSRA Voidsuit / Ancient Voidsuit
+- type: entity
+  parent: ClothingOuterEVASuitBase
+  id: ClothingOuterHardsuitAncientEVA
+  name: NTSRA voidsuit #Nanotrasen Space Research Association
+  description: An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Suits/ancient_voidsuit.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Suits/ancient_voidsuit.rsi
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.85
+
+#Paramedic Voidsuit
+#Despite having resistances and looking like one, this is two-piece and parents off the EVA suit so it goes here.
+- type: entity
+  parent: ClothingOuterEVASuitBase
+  id: ClothingOuterHardsuitVoidParamed
+  name: Paramedic Void Suit
+  description: A void suit made for paramedics.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 1000
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+  - type: TemperatureProtection
+    coefficient: 0.1
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.95
+        Heat: 0.90
+        Radiation: 0.75
+        Caustic: 0.5
+  - type: GroupExamine

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

@@ -22,27 +22,6 @@
     tags:
     - Hardsuit
 
-- type: entity
-  parent: ClothingOuterEVASuitBase
-  id: ClothingOuterSuitEmergency
-  name: emergency suit
-  description: An emergency suit in cases of... emergencies.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Suits/emergency.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Suits/emergency.rsi
-  - type: ClothingSpeedModifier
-    walkModifier: 0.5
-    sprintModifier: 0.5
-  - type: TemperatureProtection
-    coefficient: 0.5
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetEVA
-  - type: ContainerContainer
-    containers:
-      toggleable-clothing: !type:ContainerSlot {}
-
 - type: entity
   parent: ClothingOuterBaseLarge
   id: ClothingOuterSuitFire

Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_hardsuit.yml

@@ -12,7 +12,7 @@
             - tag: HardsuitEVA
               name: EVA suit
               icon:
-                sprite: Clothing/OuterClothing/Hardsuits/eva.rsi
+                sprite: Clothing/OuterClothing/Suits/eva.rsi
                 state: icon
               doAfter: 1
             - tag: HelmetEVA

Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
   "size": {
     "x": 32,
     "y": 32
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-OUTERCLOTHING",
+      "name": "equipped-HELMET",
       "directions": 4
     },
     {

Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json

@@ -1,56 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "visorlit"
-    },
-    {
-      "name": "headlight"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "visorlit-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "headlight-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "visorlit-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "visorlit-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "headlight-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "headlight-inhand-right",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by peptide, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32