Clean up Eva and Hardsuit helm yml + Lets atmos firesuit helm work as a BreathMask...

diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 40f9e0a3d4e390255b444365b7b5a1be6c65ab14..866fe962ca5e64f159ca3606ee9fa81b9ba6c959 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -119,6 +119,7 @@
   id: ClothingHeadEVAHelmetBase
   name: base space helmet
   components:
+  - type: BreathMask
   - type: Item
     size: Normal
   - type: PressureProtection
@@ -150,6 +151,7 @@
   name: base hardsuit helmet
   noSpawn: true
   components:
+  - type: BreathMask
   - type: Sprite
     state: icon # default state used by most inheritors
   - type: Clickable

diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
index 963bcdedd783e5d233bbcb46b333fe189141a9aa..530c23a5781e7fbcd6d867790c5eb319e33a4509 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@@ -5,7 +5,6 @@
   name: EVA helmet
   description: An old-but-gold helmet designed for extravehicular activites. Infamous for making security officers paranoid.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/eva.rsi
   - type: Clothing
@@ -22,7 +21,6 @@
   name: EVA helmet
   description: An old-but-gold helmet designed for extravehicular activites.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/eva_large.rsi
   - type: Clothing
@@ -35,7 +33,6 @@
   name: syndicate EVA helmet
   description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/eva_syndicate.rsi
   - type: Clothing
@@ -48,7 +45,6 @@
   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: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/cosmonaut.rsi
   - type: Clothing
@@ -61,7 +57,6 @@
   name: paramedic void helmet
   description: A void helmet made for paramedics.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/paramedhelm.rsi
   - type: Clothing
@@ -81,7 +76,6 @@
   name: NTSRA void helmet
   description: An ancient space helmet, designed by the NTSRA branch of CentCom.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 072dd53d9ae1561a67052f27ee751ff53ea1f233..0c660e09b807a06fb38e348ea8c895c84ac83720 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -12,7 +12,6 @@
   name: basic hardsuit helmet
   description: A basic-looking hardsuit helmet that provides minor protection against most sources of damage.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/basic.rsi
   - type: Clothing
@@ -28,7 +27,6 @@
   name: atmos hardsuit helmet
   description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/atmospherics.rsi
     layers:
@@ -68,7 +66,6 @@
   name: engineering hardsuit helmet
   description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering.rsi
   - type: Clothing
@@ -86,7 +83,6 @@
   name: spationaut hardsuit helmet
   description: A sturdy helmet designed for complex industrial operations in space.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
     layers:
@@ -121,7 +117,6 @@
   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: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/salvage.rsi
   - type: Clothing
@@ -140,7 +135,6 @@
   name: salvager maxim helmet
   description: A predication of decay washes over your mind.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/maxim.rsi
   - type: Clothing
@@ -163,7 +157,6 @@
   name: security hardsuit helmet
   description: Armored hardsuit helmet for security needs.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/security.rsi
   - type: Clothing
@@ -188,7 +181,6 @@
   name: brigmedic hardsuit helmet
   description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/brigmedic.rsi
   - type: Clothing
@@ -215,7 +207,6 @@
   name: warden's hardsuit helmet
   description: A modified riot helmet. Oddly comfortable.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/security-warden.rsi
   - type: Clothing
@@ -240,7 +231,6 @@
   name: captain's hardsuit helmet
   description: Special hardsuit helmet, made for the captain of the station.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/capspace.rsi
   - type: Clothing
@@ -256,7 +246,6 @@
   name: chief engineer's hardsuit helmet
   description: Special hardsuit helmet, made for the chief engineer of the station.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering-white.rsi
   - type: Clothing
@@ -274,7 +263,6 @@
   name: chief medical officer's hardsuit helmet
   description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/medical.rsi
   - type: Clothing
@@ -292,7 +280,6 @@
   name: experimental research hardsuit helmet
   description: Lightweight hardsuit helmet that doesn't restrict your head movements.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/rd.rsi
   - type: Clothing
@@ -310,7 +297,6 @@
   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: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/security-red.rsi
   - type: Clothing
@@ -335,7 +321,6 @@
   name: luxury mining hardsuit helmet
   description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/luxury.rsi
   - type: Clothing
@@ -355,7 +340,6 @@
   name: blood-red hardsuit helmet
   description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndicate.rsi
   - type: Clothing
@@ -380,7 +364,6 @@
   name: blood-red medic hardsuit helmet
   description: An advanced red hardsuit helmet specifically designed for field medic operations.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndiemedic.rsi
   - type: Clothing
@@ -405,7 +388,6 @@
   name: syndicate elite helmet
   description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndieelite.rsi
   - type: Clothing
@@ -434,7 +416,6 @@
   name: syndicate commander helmet
   description: A bulked up version of the blood-red hardsuit's helmet, purpose-built for the commander of a syndicate operative squad. Has significantly improved armor for those deadly front-lines firefights.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
   - type: Clothing
@@ -459,7 +440,6 @@
   name: cybersun juggernaut helmet
   description: Made of compressed red matter, this helmet was designed in the Tau chromosphere facility.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
   - type: Clothing
@@ -482,7 +462,6 @@
   name: wizard hardsuit helmet
   description: A bizarre gem-encrusted helmet that radiates magical energies.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/wizard.rsi
   - type: Clothing
@@ -507,7 +486,6 @@
   name: organic space helmet
   description: A spaceworthy biomass of pressure and temperature resistant tissue.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
   - type: Clothing
@@ -524,7 +502,6 @@
   suffix: Pirate
   description: A deep space EVA helmet, very heavy but provides good protection.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/pirateeva.rsi
   - type: Clothing
@@ -541,7 +518,6 @@
   suffix: Pirate
   description: A special hardsuit helmet, made for the captain of a pirate ship.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
   - type: Clothing
@@ -558,7 +534,6 @@
   name: ERT leader hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
   - type: Clothing
@@ -580,7 +555,6 @@
   name: ERT chaplain hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
   - type: Clothing
@@ -595,7 +569,6 @@
   name: ERT engineer hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
   - type: Clothing
@@ -617,7 +590,6 @@
   name: ERT medic hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
   - type: Clothing
@@ -632,7 +604,6 @@
   name: ERT security hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
   - type: Clothing
@@ -654,7 +625,6 @@
   name: ERT janitor hardsuit helmet
   description: A special hardsuit helmet worn by members of an emergency response team.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
   - type: Clothing
@@ -669,7 +639,6 @@
   name: CBURN exosuit helmet
   description: A pressure resistant and fireproof hood worn by special cleanup units.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/cburn.rsi
     layers:

diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 720e52ee588329ec2e0b1a45337dd1606526b624..d585518ece8829d43393a680ac8f71dbe15d9e25 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -263,6 +263,7 @@
     slots:
     - Hair
     - Snout
+  - type: BreathMask
 
 #Chitinous Helmet
 - type: entity