Gas Masks, Oxygen Tank Correction, and Correct Fills for lockers and survival boxes (#7589)

* gas mask and oxy and fills and stuff

* Update masks.yml

* Update masks.yml

* i think this is right

* bag variants fill fix

* syndicate gas mask

* Update emergency.yml

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -1,8 +1,8 @@
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskGas
-  name: old gas mask
-  description: An old, dusty mask. Yet still dutifully functional.
+  name: gas mask
+  description: A face-covering mask that can be connected to an air supply.
   components:
   - type: Sprite
     sprite: Clothing/Mask/gas.rsi
@@ -13,6 +13,122 @@
   - type: DiseaseProtection
     protection: 0.05
 
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskGasSecurity
+  name: security gas mask
+  description: A standard issue Security gas mask.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gassecurity.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gassecurity.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.05
+
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskGasSyndicate
+  name: syndicate gas mask
+  description: A close-fitting tactical mask that can be connected to an air supply.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gassyndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gassyndicate.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.05
+
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskGasAtmos
+  name: atmospheric gas mask
+  description: Improved gas mask utilized by atmospheric technicians. It's flameproof!
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gasatmos.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gasatmos.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.05
+  - type: Armor
+    modifiers:
+      coefficients:
+        Heat: 0.80
+
+- type: entity
+  parent: ClothingMaskGasAtmos
+  id: ClothingMaskGasCaptain
+  name: captain's gas mask
+  description: Nanotrasen cut corners and repainted a spare atmospheric gas mask, but don't tell anyone.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gascaptain.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gascaptain.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.05
+
+- type: entity
+  parent: ClothingMaskGasAtmos
+  id: ClothingMaskGasCentcom
+  name: centcom gas mask
+  description: Oooh, gold and green. Fancy! This should help as you sit in your office.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gascentcom.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gascentcom.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.05
+
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskGasExplorer
+  name: explorer gas mask
+  description: A military-grade gas mask that can be connected to an air supply.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/gasexplorer.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/gasexplorer.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.05
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.95
+        Heat: 0.95
+
+- type: entity
+  parent: ClothingMaskBase
+  id: ClothingMaskBreathMedical
+  name: medical mask
+  description: A close-fitting sterile mask that can be connected to an air supply.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/medical.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/medical.rsi
+  - type: BreathMask
+  - type: IngestionBlocker
+  - type: DiseaseProtection
+    protection: 0.10
+
 - type: entity
   parent: ClothingMaskBase
   id: ClothingMaskBreath

Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml

@@ -31,7 +31,7 @@
   parent: GasTankBase
   id: OxygenTank
   name: oxygen tank
-  description: A tank of oxygen.
+  description: A tank of oxygen, this one is blue.
   components:
   - type: Sprite
     sprite: Objects/Tanks/oxygen.rsi
@@ -77,7 +77,7 @@
 - type: entity
   parent: OxygenTank
   id: EmergencyOxygenTank
-  name: extended-capacity emergency oxygen tank
+  name: emergency oxygen tank
   description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
   components:
   - type: Sprite
@@ -85,7 +85,7 @@
   - type: GasTank
     outputPressure: 21.27825
     air:
-      volume: 2
+      volume: 3
       temperature: 293.15
   - type: Clothing
     size: 10
@@ -98,7 +98,7 @@
 - type: entity
   parent: EmergencyOxygenTank
   id: ExtendedEmergencyOxygenTank
-  name: double emergency oxygen tank
+  name: extended-capacity emergency oxygen tank
   description: Used for emergencies. Contains little oxygen, so try to conserve it until you actually need it.
   components:
   - type: Sprite
@@ -120,13 +120,14 @@
 - type: entity
   parent: ExtendedEmergencyOxygenTank
   id: DoubleEmergencyOxygenTank
+  name: double emergency oxygen tank
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_double.rsi
   - type: GasTank
     outputPressure: 21.27825
     air:
-      volume: 10
+      volume: 12
       temperature: 293.15
   - type: Clothing
     size: 10