From 4926bc7cdacd82668d1c3f9ac40138196ea0ea45 Mon Sep 17 00:00:00 2001
From: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com>
Date: Thu, 21 Apr 2022 08:11:26 -0400
Subject: [PATCH] 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
---
 .../Fills/Backpacks/StarterGear/backpack.yml  |   6 +-
 .../Fills/Backpacks/StarterGear/duffelbag.yml |   6 +-
 .../Fills/Backpacks/StarterGear/satchel.yml   |   6 +-
 .../Catalog/Fills/Boxes/emergency.yml         |  93 ++++++
 .../Catalog/Fills/Boxes/general.yml           |  35 ---
 .../Catalog/Fills/Lockers/cargo.yml           |   2 +-
 .../Catalog/Fills/Lockers/engineer.yml        |   4 +-
 .../Catalog/Fills/Lockers/heads.yml           |   2 +
 .../Entities/Clothing/Masks/masks.yml         | 120 +++++++-
 .../Entities/Objects/Tools/gas_tanks.yml      |  11 +-
 .../Mask/breath.rsi/up-equipped-MASK.png      | Bin 0 -> 156 bytes
 .../Mask/gasatmos.rsi/equipped-MASK.png       | Bin 0 -> 903 bytes
 .../Clothing/Mask/gasatmos.rsi/icon.png       | Bin 0 -> 255 bytes
 .../Mask/gasatmos.rsi/inhand-left.png         | Bin 0 -> 278 bytes
 .../Mask/gasatmos.rsi/inhand-right.png        | Bin 0 -> 276 bytes
 .../Clothing/Mask/gasatmos.rsi/meta.json      |  26 ++
 .../Mask/gascaptain.rsi/equipped-MASK.png     | Bin 0 -> 898 bytes
 .../Clothing/Mask/gascaptain.rsi/icon.png     | Bin 0 -> 293 bytes
 .../Mask/gascaptain.rsi/inhand-left.png       | Bin 0 -> 336 bytes
 .../Mask/gascaptain.rsi/inhand-right.png      | Bin 0 -> 343 bytes
 .../Clothing/Mask/gascaptain.rsi/meta.json    |  26 ++
 .../Mask/gascentcom.rsi/equipped-MASK.png     | Bin 0 -> 879 bytes
 .../Clothing/Mask/gascentcom.rsi/icon.png     | Bin 0 -> 301 bytes
 .../Mask/gascentcom.rsi/inhand-left.png       | Bin 0 -> 302 bytes
 .../Mask/gascentcom.rsi/inhand-right.png      | Bin 0 -> 316 bytes
 .../Clothing/Mask/gascentcom.rsi/meta.json    |  26 ++
 .../Mask/gasexplorer.rsi/equipped-MASK.png    | Bin 0 -> 968 bytes
 .../Clothing/Mask/gasexplorer.rsi/icon.png    | Bin 0 -> 264 bytes
 .../Mask/gasexplorer.rsi/inhand-left.png      | Bin 0 -> 341 bytes
 .../Mask/gasexplorer.rsi/inhand-right.png     | Bin 0 -> 341 bytes
 .../Clothing/Mask/gasexplorer.rsi/meta.json   |  30 ++
 .../Mask/gasexplorer.rsi/up-equipped-MASK.png | Bin 0 -> 928 bytes
 .../Mask/gassecurity.rsi/equipped-MASK.png    | Bin 0 -> 351 bytes
 .../Clothing/Mask/gassecurity.rsi/icon.png    | Bin 0 -> 189 bytes
 .../Mask/gassecurity.rsi/inhand-left.png      | Bin 0 -> 306 bytes
 .../Mask/gassecurity.rsi/inhand-right.png     | Bin 0 -> 308 bytes
 .../Clothing/Mask/gassecurity.rsi/meta.json   |  30 ++
 .../Mask/gassecurity.rsi/up-equipped-MASK.png | Bin 0 -> 336 bytes
 .../Mask/gassyndicate.rsi/equipped-MASK.png   | Bin 0 -> 999 bytes
 .../Clothing/Mask/gassyndicate.rsi/icon.png   | Bin 0 -> 298 bytes
 .../Mask/gassyndicate.rsi/inhand-left.png     | Bin 0 -> 250 bytes
 .../Mask/gassyndicate.rsi/inhand-right.png    | Bin 0 -> 255 bytes
 .../Clothing/Mask/gassyndicate.rsi/meta.json  |  32 ++
 .../Mask/medical.rsi/equipped-MASK.png        | Bin 0 -> 338 bytes
 .../Clothing/Mask/medical.rsi/icon.png        | Bin 0 -> 312 bytes
 .../Clothing/Mask/medical.rsi/inhand-left.png | Bin 0 -> 299 bytes
 .../Mask/medical.rsi/inhand-right.png         | Bin 0 -> 298 bytes
 .../Clothing/Mask/medical.rsi/meta.json       |  30 ++
 .../Mask/medical.rsi/up-equipped-MASK.png     | Bin 0 -> 342 bytes
 .../Storage/boxes.rsi/emergencytank.png       | Bin 0 -> 144 bytes
 .../Storage/boxes.rsi/extendedtank.png        | Bin 0 -> 147 bytes
 .../Objects/Storage/boxes.rsi/internals.png   | Bin 0 -> 211 bytes
 .../Objects/Storage/boxes.rsi/meta.json       | 279 +++++++++---------
 53 files changed, 575 insertions(+), 189 deletions(-)
 create mode 100644 Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
 create mode 100644 Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasatmos.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassecurity.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassyndicate.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK.png
 create mode 100644 Resources/Textures/Clothing/Mask/medical.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Mask/medical.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Mask/medical.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Mask/medical.rsi/meta.json
 create mode 100644 Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
 create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/internals.png

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 23b85e213c..1350e17e3a 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -36,7 +36,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalSecurity
       - id: Flash
 
 - type: entity
@@ -46,7 +46,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalMedical
 
 - type: entity
   noSpawn: true
@@ -66,7 +66,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalEngineering
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index e04a041d29..3a7699a047 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -24,7 +24,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalSecurity
       - id: Flash
 
 - type: entity
@@ -34,7 +34,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalMedical
 
 - type: entity
   noSpawn: true
@@ -54,7 +54,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalEngineering
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index dec35845df..80e178f06a 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -23,7 +23,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalSecurity
       - id: Flash
 
 - type: entity
@@ -33,7 +33,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalMedical
 
 - type: entity
   noSpawn: true
@@ -53,7 +53,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
+      - id: BoxSurvivalEngineering
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
new file mode 100644
index 0000000000..dcdecfc68b
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -0,0 +1,93 @@
+- type: entity
+  name: survival box
+  parent: BoxCardboard
+  id: BoxSurvival
+  description: It's a box with basic internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: extended-capacity survival box
+  parent: BoxCardboard
+  id: BoxSurvivalEngineering
+  description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: ExtendedEmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: extendedtank
+
+- type: entity
+  name: survival box
+  parent: BoxCardboard
+  id: BoxSurvivalSecurity
+  description: It's a box with basic internals inside.
+  suffix: Security
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskGasSecurity
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: survival box
+  parent: BoxCardboard
+  id: BoxSurvivalMedical
+  description: It's a box with basic internals inside.
+  suffix: Medical
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreathMedical
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: box of hugs
+  parent: BoxCardboard
+  id: BoxHug
+  description: A special box for sensitive people.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_hug
+      - state: heart
+  - type: Item
+    HeldPrefix: hug
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 39cb18101d..778d7c8c73 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -135,41 +135,6 @@
       - state: box
       - state: meson
 
-- type: entity
-  name: survival box
-  parent: BoxCardboard
-  id: BoxSurvival
-  description: It's a box with basic internals inside.
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingMaskBreath
-      - id: EmergencyOxygenTankFilled
-      - id: EmergencyMedipen
-      - id: Flare
-      - id: FoodSnackChocolate
-  - type: Sprite
-    layers:
-      - state: box
-      - state: writing
-
-- type: entity
-  name: box of hugs
-  parent: BoxCardboard
-  id: BoxHug
-  description: A special box for sensitive people.
-  components:
-  - type: Sprite
-    layers:
-      - state: box_hug
-      - state: heart
-  - type: Item
-    HeldPrefix: hug
-  - type: StorageFill
-    contents:
-      - id: Brutepack
-        amount: 6
-
 - type: entity
   name: inflatable wall box
   parent: BoxCardboard
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 3681174a9e..ac6fed8901 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -10,7 +10,7 @@
       - id: YellowOxygenTank
       - id: ClothingShoesBootsMag
       - id: ClothingHeadHelmetHardsuitSalvage
-      - id: ClothingMaskGas
+      - id: ClothingMaskGasExplorer
 # Currently do not function as 'true' mesons, so they're useless for salvagers.
 #      - id: ClothingEyesGlassesMeson
       - id: ClothingBeltUtilityFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 0e141b3894..03d69815a7 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -80,7 +80,7 @@
     contents:
       - id: ClothingHeadHelmetHardsuitAtmos
       - id: ClothingOuterHardsuitAtmos
-      - id: ClothingMaskBreath
+      - id: ClothingMaskGasAtmos
       - id: OxygenTankFilled
       - id: ClothingOuterSuitAtmosFire
       - id: ClothingHeadHelmetAtmosFire
@@ -96,7 +96,7 @@
       - id: ClothingHeadHelmetHardsuitEngineering
       - id: ClothingOuterHardsuitEngineering
       - id: ClothingHandsGlovesColorYellow
-      - id: ClothingMaskBreath
+      - id: ClothingMaskGas
       - id: OxygenTankFilled
       - id: ClothingShoesBootsMag
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 4285fc42b8..a84a25112d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -38,6 +38,7 @@
       - id: ClothingNeckCloakCap
       - id: ClothingHandsGlovesCaptain
       - id: ClothingOuterHardsuitCap
+      - id: ClothingMaskGasCaptain
       - id: TaserGun
       - id: ClothingHeadHelmetHardsuitCap
       - id: CommsComputerCircuitboard
@@ -172,6 +173,7 @@
         prob: 0.1
       - id: ClothingHeadHelmetHardsuitSecurityRed
       - id: ClothingOuterHardsuitSecurityRed
+      - id: ClothingMaskGasSecurity
       - id: ClothingShoeSlippersDuck
         prob: 0.2
       - id: DrinkVacuumFlask
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index c0f0f83e93..82efdc12b0 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/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
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 452d26e51f..0b1c3ffe9d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/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
diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef7d82b49317f1f91b339d93e82668db54118985
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*c)GhgIXFE0`nCVW
ziJOlf7uVLV*|lqJowF8D4P!}=UoeBivm0qZj*+K}V~EDY<OGR34h%g44V{gW9TOY9
z3Obm&7-p|#o~5Y6n8EaB&5Lgd91F4!ibx1DFnG>qTD&M!_7YGxgQu&X%Q~loCIF_H
BGg<%u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..4573a5a3321fc5a83eea9ef686a4c7f5fa11dfec
GIT binary patch
literal 903
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MO7gYB`&GO$wiq3C7Jno3=9=>
zRF7M8H5dr69<ZwJYXA0V{arVuNlxn(7#DjkbSk^}I@;py6p3RebvJBYte)ceoz*S=
zYRbJWnJkO5Pac`jx1!!<FPlNv;nT0a?pdm^d8tmqmy~aB&MPFCge1l2ym|A2d9RA}
z8KW#yBL)Vh3!W~HAr*7p&f44k$U&wpzJGP_xn*3t?ufPLuyiNCwGn8^Oe)UV+*p#y
zm(9I>XZAPw8?4rf3OU6`jwNk85q6C&r`)?(Q}<5RNzvmShiZN8{yenwU)*Q$`P}50
zo+-;jSQz_enqOgDVOhnPfBD~p;&~n4C!bt0#edG<$zBZ4Z47;jpMPHHH9<_lDt=|i
zf=sEf)mNAO5m5D5%ed(C_v@YY#b2N3PxrnPWBU`x%b)e^+!l?dy8Zu;|N8&!@A?UH
zjENFV7VHc@%YzTt-q+HfwkdJJ_1CHlAKrZtVfgUy5!2#}91H;~LzcXrB9;&-rnld&
z{E$IQ?(K^ICtuH4#(8>^fn5Jm<`W;zeou@Pi@APxX4bOIBm)VR#~&ruz4p2qIjL6Q
z(H!+{xr?LLCYjB4ylleI@Vv5mr}Uq^wVu1#Jh=sW8ST$@FRbt2R+#X~F=KDs;;UJV
z3{h*vuDvc@xA2?iDnSN@vuVYfAF(+WObC}hq41#o;fw#=8jQdY31nKq9I%)rfPH}*
z=K?;5ULgnB1}W7BD+W_9hEj&CDGaX|t{@anp53s>+^suH`zs@7BS)}V&zsDD6E`L1
z+&a5Ud1@w0$J?S~5_0d({i*F?I#>Crp!}Kfu?feg)noyKF;L{;$8SgKYdbeTnegbV
z>aoXfJLO#i(>N~$A1Iu|!XS}6d((^GLW|a%n5;DCbBp1&O#c}BV-hmQJzssb+I4qb
z$n8r^ZHE&*TP~K$?ppWwllPU*#}eCe4}Z3~skJm?`|Te;ZoW1+w&1lDgF@fqE7^|A
z_BtB!W^KK7uCh_-99Ks%=jy9my>86iN0~nVlu49G%hLY*?8Ub~!p~WcWXB1$ym-5d
zHS+d}((;Hi7j>MA?w3CQrD8GD$IG>3--%sUf1-v0f#8za+aRxaL6vdK=UY#KIg7#5
L)z4*}Q$iB};(emX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/icon.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5c6d9408785389413d848744db3f39c11478c0e
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*0GS>h9+sAtN(u^X
zISTKt_dVQdzNkq}Pfw4ZpMR3oxelNT#*!evU<QY0H`0Kd9#0p?5RHk+2@)X<fdK+j
z^;2?Ml$3Ika*}i!R1`!Otr2QbIj~}umddPE9V!B0azb%p9Vspr0Sjy-7P@ONX#_N;
zbaZ&F-r&;B71MC>;)#nVE}Xp3DtPF5N@7V+)K-s^6B(DeG&s6=2Y9jGOzh$A<q=<0
x;T91X$>8eX;=&TzaPh(fMo|tf10D?qhBjLfnd3$&KxZ*9c)I$ztaD0e0sxdPQ0D*u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..82e159590c44d34cfe359b29d4412c1d4ff3bb5f
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cRgJkLn>~)y=BXF$U&g(VZQ2h
z4~GlV5z9XCd~<r2kiT$ixxl68BKMRU8xEd3bS-PG*qY7O6I#A!9x{{PY#*Ge0yF~z
zIs%^T+<s!qiK$D@6n%D`_xriQjvHsbmI+V0SeeEyz_oX-x96uxCA(}Eb@9!ty}fd!
zw&&8a->*yJ9qyO?+Gkh)x_r`^W$Q{T?)gStTbkEcko<7=D%M}yCaWyXV@xktaZlmC
z^mQJHO+eBo_RXCGS)Q}yizRN(F`u6#r#SmFw})Z>gJ<`cHh$*t{&D@>8wQ4iCGt1U
VCCn=Pt@{C_)6><@Wt~$(69BU)dAtAs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a30b243b5dbf61dddf95a87ab3e933189cfe213d
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>@1PLn>~)y=BPN>>$wkaCt?q
zD9hdndmqRaHP3O`@LgnQYm<QIbfsLa%Pt!|N_<;(Jp3;uno?=}F079Qs2>FMTaJCv
zOWk_*^?J=)t!h9{ppdp#(&{}2FFA$I?C+N8Q}=vzKKA+Bt&E{Fy(e8-6ENjScV+X=
zqqlZl{982JCcb?C-^*(xqz&(!|CqBaINDrlUG=|Tmy@$*Utcz(?&<IS&!XZW76HjO
z^SzCk-~YHT_O?p6Y3tG57RDPQnN`fw*`8I*mtnk~#%7j#K=}UyMuz$ajLWK{bKdK_
QZ3SueboFyt=akR{0C)LxyZ`_I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json
new file mode 100644
index 0000000000..2e57ae2151
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "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": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..d19f0936e8505ffdda57ab1314f2cd2db6251ae7
GIT binary patch
literal 898
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=g;gODB`&GO$wiq3C7Jno3=9=>
zRF7M8H5dr69<ZwJYXA0V{arVuNlxn(92a{&Y|pvyI@;pylNY}Z`dnDN@VG1IbxybF
zDNF8cP~&$Cp8QGgjosggDU+F%Z?8Smz1KJ>yMxKiJFEL!0h61n<u6a?{x-WZ2B|y7
zvBHZP7?{p@x;TbZ%y~O&f3|R<#PR(Tos=fZa29qpHgB7h@<BmjmY!3=HO0NYE4#a+
z`~ESuy?!#os<bfhgqYuknM_3&G!-}sJug0G+bzMAsoSRa{K7uNsSEbKuin`{<2&=x
zh4%NJSI^(~KK9gSmze8Ejf#7%7)-tO6I{QD`=0)G^L5x_IZidd9~^HPE^qo<;l%uV
z#<YzY1>6bZ`?r=gOz*#!l>Ihgp=tqVg1Efy)j4IG9`Cp-x@EGgdekb*M2{Oc%m3~8
zcYmKf_q*x?H&1e0JbgXi?w<3jf9uzumtKFrIrHnE+Z*L0;$vAEa&qz(-OPFP`NyxP
z{-HasJrP^*oR`P$P3U<)w-ZyfEvoiM_o|z`sAP`Ye|)!$dDXoG-RW1g&0`N6Y}ow%
zhtk)beGaPw`z!v+ZE96|XIIhlF{2}9XH(8Xj`jCv|GwOCb$)Bc-;NX3j%C*#bLMXP
zD*iQ4<BNoiy{yxDX$HM*Pkz2MxDb%2w1t`B!Nbe9p7i~GclDmrzpsp(jQ_d4|L<=Q
za*%D1Qf&YRjTb{HL)H|AR}5D)7_Ts{2xMBp9I%)rfPH}*=K?;5UWCF%PL9piGAX(b
z89CXwH^<sc@&DYPBhIg0nra;sWPM;uPW*Z44s{bySoOpvL~Xn8S0;09!ql~zIt{UZ
z9^7!=5>lMv)FA*2)Poz<bsK+k*i_z|Vd7Tb&g*$*b>JyBleDX;JLBF*#cbWlx`Am~
z>hG646VAN|f6lr~@BO5h6z-!ZeVnWoGw+Z%Coom-s&vY6g=I?%9zWCN*;nJ_<Na{O
zYqooO=DN4fPt}&_Z}V7x|KRuhctbhfrO$<y%wBx?dB1PxhVzb|35%9rPdjmqV~h2f
zb1TkF<Eeh@aG!IV)YlU>dUf-%SN|j;AP^y@v$tV>n7@>%K{<0HFjFyjy85}Sb4q9e
E00NAbRsaA1

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee566db54fad63babc53be419a97a8209a806ac2
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyW&u7St_Kbr5H@hMN^dlZ$X8NO
zC`e=pbYo`ln6P06gL>sD)uR0j;p^n=0yH!<<Yi?|O-=Rm^hAtZd5SeUfF>}O1o;Is
zI6S+N2IS23ba4!^=zTjWmhZ3vPqU}YtiJhWJO8JOpORZ9YH`3s`RUR5IW8Oz*Y94D
znQF{1Pl?6j&LRfkrij%0Wr1?c@9d{2{ge@Yw`9p8O-u7VjnT3mR=ZlwpO{Z*mkrtR
zEaoEHbn60+#`9cmwvsABeg3~Cm$(|to_SuZpoaB}(C6vf0v)H%yxx$rkN116?CRX9
oug@^{F9>zmVRz)x|H!=zmMd8J8uqtb13Hw!)78&qol`;+0MKS=WB>pF

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe2901acd1f3fbfeb86d3b0ce614560665cdd9c5
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;UsaSW-r_4d}<JSInxwukvA
z{OWx&4WeDNcdeA<S*hTgWw@7}r9A9zHG{vv2~pJ<rVW`=Op!vfazZt$%00>^eV?ej
z?~UbV_p=j$hJwI?rn2?%bCf^J?3{Gv!{3Dyx5mxB`0i`BMPZll^556Z-}@Tab@vM|
zU%&eK<H&6L%T*JzEM;eE&3x^ubz9P7(x&eVKi+IOk$xj>s^;#xU;O8d^=ED~4*2+U
z;rzo3_bG3f)917A_Nv=+UK`4<zCB0#ey;cZf0=37_LKMSxbm{%Y97nKJG-Voo>RA6
zIQY5`#6dt(!60=01L=k0@ul(yTVnR~*S2Upu|II!u8Fgj<<XJM&8JF=zXxPVtNz$t
fR>sc2@boX!G5hQ-Zx$r41R3G!>gTe~DWM4fdm53a

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..5615899ced3a6b6cbf8db2633243ea187bfb9bef
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV3hN8aSW-r_4d|6KW0af)`!Mt
zd03n|(;ONSn3J+rad3(q7Ebt8QOh8=pdu*n`mDB=HJOGjIk$2qcew`g<V<JX=={$=
zU+ww5nXA8f0Zj#g53P?+&sJKtCiL^RRbshwyBBe)U*F#9-&7-{^>l0M(cda3N~>l&
z|H)GEJep%+;G5g9bI0Y?OTO;VpWm{!GWTZUO`FhN<^O&b&NKV>bN%t!$mdV2Y*WvF
z|LUG#CNraEXTWybtC9Z}<W;W%vM1;NPY$_zZXI9vVz0{WV#NaM%#=TvRhszLGj4p!
z3ULq6$0A9$B!Bq5Hg`R~$vEKHzb!u`%Gv&{VGNpM&7A5pSMY;pfSLc+`jS=Cmv<)Z
k{TszQ;RicE!w>y?jAw(>t~$(pZ2>aL)78&qol`;+0Nr4bq5uE@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
new file mode 100644
index 0000000000..2e57ae2151
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "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": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..28a2e1054f3af19d2e409bd014862221f832c1a1
GIT binary patch
literal 879
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=WmO>&B`&GO$wiq3C7Jno3=9=>
zRF50-H5>4-Ua+(~D*h&P;hMMrfm00O4uTSs7$+ok$L)8%|1ImwVTrUKnirH^Ki4*1
z+<WiIzRJxk$Cj&3SCK#YFR)uJA;kSk>eSQMey=%^yHi6#cIVzB!6H3vSv;HD=QI6f
z_<uoWqKf+~9R>!bEuJopAr*7p&f1tQ6)1Cj|FotRPq)kzahVk$Dz41u`pW)d0ZZP?
z2XlC=++P$m=DfYI*V(Z}>AL+v)d?$|6+I>?9&}wUu<q-eCsr!<hOW2veLwd*u~wdA
zV#}WU-|Z^j`~Cc@^tVoa_8H-K40m$&G%Vj#pK)uN|N82;c`7q39x88T_PPD(ai_$K
z?7(BY6m=T({_WY={c!hni~Kk1wz4QPmVCUJc5kJc?epUWO<9+U7oFWB+}6?@_qzY}
z|F_>y3+!XBn5?;ofBkm*c@KXER{r}OYAn~2aBJH9|38`Z%gY!T)@PZPSjooN?w%MG
z9O1BQO5^W`S?6c_1g;P-to&1}Kd(bE_Edt6glDV3+WMq<HoIO<JDn=?C2F5f?Ly@X
z+2zWQ4|3e};%luEe7CmSX>Ui4YWv58EuWS%UX5?d`P*^E+R^IuN0*#^U$1`+)c7hf
z$2Z+$x)H;>?N4&7xJ^Q4c)SHhXz>>N{g3Nx|81J~zt+L=!2d(X>cuWF?O-lg%v!+y
zz>WI>-+^AS1F{X$x((J0=1~mg40&4^fT5Mac!zPvMYuvW1IEO%_U1LJwhE2`GhQE-
z+PCugPxW>D**EG|tiCld=oaI$+@CLl*gm@OTwU_KWg|B*U{`ydU)Z)L%Qq7kj_*G3
z0fRD-Q_*?L%<?-A=Wb$osQlquZSp;dzp_%3B0?8WVKbR_b!p7}==m*K+}sP8fX1-}
z85FHN{+VgH_#$tviEE!cGv;*DV|`F(;T*OrD1Sm<<Hl45hC9*X$EG!&zTAD__EVr9
zlgS$*{7dy5cUtbM_?O|;vX5Q0(M5lq?}}?2TdaN3LsGrl_LePp&jL&VDWc;0Pi_5L
igUicU!^SM`fd2g;G4mb5$sxcT#Ng@b=d#Wzp$Py`-j!+q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8316253b7dbeefdba201602b677352f3fe76d99e
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyHUT~%t_Kbr5U>`tthd+BHB?ei
z__QHlai%;&zx@Am(P}5X1Z+eF?Zs5~yD_X)ll52B(9n>Vl{Gar)zi}xc9EDZr}GbJ
z4r57>UoeBivm0qZ&U{Z7#}JF&x03?-4lD3Dd(JU?%hsy*egA8x-Tj%Yd;w=Yetw+X
z%c1zER5Y|VhwVUY3&YH3o(+7CYc`$f*4WPYJ-pV(e|~OLNpGNQa?Dm%fjd@>E7nF=
zIR9c;dDBt)`4pp958iT#D1MlC@Pu`<i__0-@s3$6n`i!9!}wJFfsSE)X13@Yqt8+k
wzHWcGZ+-HXwQntI4=87d2=wtAe#u{Lt}%tBRre=LE6}M7p00i_>zopr0PxOk<^TWy

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f5f869dd53e9f1b3fbdef8fe84238dd01892f3e
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up-wMLn>~)y`{)~$U)-R$LB7G
zMO;K~ORSN+&Qr(Sec#=Fs%!VvHD?n9QWhxjNv;UIZ7^ex^qU9&v!g3^RNvoSvYrKK
z3J8cD^8BNxytyaFbJf(HmEzre>L0Crlv+JQyb60S>#0u6dz|)h{q_p2yK+;{@gGw&
zzAGo{!#-)r--65-u?6ppbj}yOy&U}U?ujTrqvn?mH**#*5M8lJ{lV_!%4w_b=0=zP
z4}X?gekr%qY^rX9N~zo5NAvDo4-dZT1F;=Q9x&eK|IGBh`TwdtYq}C^?(ONWY}s{Q
t{lHP1rjLKQZk$uD_<!x(8wQ34_3}+GvcA>*E^7km^>p=fS?83{1OTE5gBSn+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..3245c7789283ec3911dacd88687d8bb5766b6d33
GIT binary patch
literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W}maSW-r_4d}rtV01J$3E%{
zv1@i{Bymq~n0@!s&8v667hYF?$zAeNy5zk^iH3*6LX#=n-}(wqFHwtXpY!Q|ZeziZ
zb0_x(_ptzt1OfLQKX+`HvNiACHC5keiKf~8+|$*HGJ~}9V?tMKo-xIhZT<d9Au0Ov
z1B2NwMEZQu)m(E8C_U5MF8s{%IQg5~YVw|!_uBtU+!}U+{p)o9Pv>`^`o7re_{ryS
zck9A${&w^I_iK{LjJx8CkGJ2d)Sms)xBaQ;kILU&v+9`EJY|Krfq|icb6OdjU*_MX
zFE{W%YZr*Wwdd&E#@W0Mn|2x(_?4U$-LTEL;4-7fpJsN3KjQ4chcm?`I=V|hx;<U}
KT-G@yGywoNLy43C

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
new file mode 100644
index 0000000000..2e57ae2151
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "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": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..af617b61940d76e53d5d1f97373933637338c58d
GIT binary patch
literal 968
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=B~>92B`&GO$wiq3C7Jno3=9=>
zRF4~SwHOGnUa%_e>i@QA-CGl(i6T|4stIN@4{^-g5O@F3^}S-BH|>%wEB?ao`t($S
zPptp5X^Yhi?38DUs4V;Cwt78dk6P8=d6QI+x1CXRJvigUpDz36Cc}X4)a@H)FJ`}c
zRz_<P@5vkn24;Rw7srr_Id5kfdPoOK9REL2rzvJ#$Ax1p%Tf$DoC-O-?#jmSIeIz8
z7)^25wwR;!Q2>+PBwqn`bwiKoI%0QZlv;SUPkD05F)N@);pk~yy@l(WYu#HkzQ3DP
z)BN6i@8iPvzw7^3zn}P_w(;`i;5{kFR<H(qe#FaBRU3HzxrDrUc^Px_#K-e;)ZQMs
zZ*TEM=Kf{A3!g2QX$gBAQ4W~e>7LdjWV+->obwF^+xf}g&ZsOi4|+N~n)|Z!%1yS$
zmPNwf`1zQ_j(_|5mC=#8;#2qQ)laMLwru^hFJ}Ghh?scUPR_lz<rwVN)l`(-<DK`e
zq3Ujp#1t*5An(-Yl_ypxvQ{5uVs6-;AIHex=ViU->b~M<u7XAfUfqaz;TB-*<NNa~
zduIj9*&x@=>1q?-^ew)%v6Z#sSpK~DuX{_r*7QZnJ=$%@bkk?nN=4St#f>TDGN-+Z
zGv>u7R%X6atX$j}Ve%$ZdROcG-*pvx`D5NUM40q+pUy52o~6hdcKn#<Q}s1{Z_gZG
zlo-hCWHWWi_0t!=^4+*|i|@#y#N(OsOzNMV%+Jg1|6|@L&-7{k0d99G2i*p#Ooput
zSxXqNFs+!#7Qns0ji6v${FTp^$GR8peH>_T;>Nz$OjUNrg+6lR<>~I37xdBdztxpP
zC*n39s93Z7Rg2OOD<+$tQ6KKT6qhjDqrOmVkGqoG$Jj~VOIa#D?fuJCcVx%H?dpjF
zY8=uV!gUPd7C-;+kKwk#*2J*(%`;6l^9H}}{W(X^oWtDXgYh}x*x6i<cPD1mXYb!=
zVBfv!MN^Z??#C<M{kw2%()$f&qHe2e*;gl5@2jqfZ32d&?wRvecct8qrw9C>e)jLT
zcVD`XUVpaMaP2qQRc?pFb<XD&9dP!wo9$`*@9NG2iC;Lrd{dW^oo{>TLHgasX~%)q
zOQ-c8*seeS=Fz8L9m=P_;a?!;&}-5V#bA1gA&c>f2Qx6`Df8kN{LgT7eL^a4&H+(i
P)@1N>^>bP0l+XkK;C#7U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/icon.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..30f77b39c57f9d3c83b6a6cc55cec6673fb8d6de
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*D9K1US(;R)her9i
z7-?&$1X;(f?^RCsGipiswKdclsFJZH$S;_|;n|HeAZLcBi(`n!#N-5tkcPkjfvNf_
zIW0;`Nm)5rN)0LsOI9sf)uM9XMVO*W;Ij^u33kQL&b;j8V0`Ga;J}%b9ddyS9I~IE
zNx8_-F~On1<Jgu78zeQEdIE$S+SF!AEK`)0S|TL1NTfr6qb$_aD72KX;bWw$vrChc
zi<9d^E171O7MB(#!8Q)gPOVj3oQikOX`E2dIM5-*z|70==9yGQ+K!8zKsPdYy85}S
Ib4q9e02N?ZHUIzs

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa8af014a21faa4d7c710ababb1ed07057f04f77
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0L@_=@}Uw9vKlaWzr;u
zH!a!O*$n54b8>Qui;E2n4VNEw?*l4gED7=pW^j0RBMr#OtqO@KaY-#sF3Kz@$;{7V
zV5pcA99B?N`u$6A!N;#pw7hk-&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M?4>a0
z(WE1jLKK2EZ8uujnQyd+?(8;J-Mm6#Nq@KTS`9;U(IaM0g2D>E7BkM~VVIdF9b&bX
zcMZ_uOivfb5RcB}1PRu~2?k7zIZZtUfo^QBIb1$6i8>Q62;{i6bRBRxdP;kPrhr~^
zr%{zv(!}%)E*<Nl8hjbcE(RKKxiOkDDl=9xs;x=oaN3`(agC=hU_#uzj{95_HGiy4
gco5YZU$=spVed?C!I}4ufPBl~>FVdQ&MBb@0B`DfdjJ3c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa8af014a21faa4d7c710ababb1ed07057f04f77
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0L@_=@}Uw9vKlaWzr;u
zH!a!O*$n54b8>Qui;E2n4VNEw?*l4gED7=pW^j0RBMr#OtqO@KaY-#sF3Kz@$;{7V
zV5pcA99B?N`u$6A!N;#pw7hk-&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M?4>a0
z(WE1jLKK2EZ8uujnQyd+?(8;J-Mm6#Nq@KTS`9;U(IaM0g2D>E7BkM~VVIdF9b&bX
zcMZ_uOivfb5RcB}1PRu~2?k7zIZZtUfo^QBIb1$6i8>Q62;{i6bRBRxdP;kPrhr~^
zr%{zv(!}%)E*<Nl8hjbcE(RKKxiOkDDl=9xs;x=oaN3`(agC=hU_#uzj{95_HGiy4
gco5YZU$=spVed?C!I}4ufPBl~>FVdQ&MBb@0B`DfdjJ3c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
new file mode 100644
index 0000000000..ff664dffd4
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "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": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/up-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..31ecc7ebe9a301b82e6b2c250ea94ea2e35a7268
GIT binary patch
literal 928
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=<y9dOB`&GO$wiq3C7Jno3=9=>
zRF50-H5>4-Ua+(~D*h&P;hMMrfm00O4ih;#*)M7Fz5QzaVcYejIceJu>GkbfxMGj7
z#No%D&(y1Z6ZTXYX?pm4?F)-%mhk<uYwje~<8ObNq?BoL9dmf5@sEeg&0TldRiL(i
z?ssJK0;;ySGB7Yb@pN$vshIP2mZ67qpv3Y2g5r*Pno3*Joq~-dSQc8a9DT#5*RG(d
zs3&>qV6M9$*HUNB63v@Tj~=MBT~hVtzAK~C!n6ITH~UJ*K*z4>(J@Z(?3IeFQ>(vE
zs=2V|e#yffHUGb#uGVLN-z_62mo#VQ0zQYcH@Ii;{9cedvnPJKw)Mn=M>zd9PI!Oy
z{%w1XSo<qH8+0ch-IBQ^xbVo9m-Q(<lOjSU|Km$!+?HxoU&mH_d*`jITibWOjX67i
zzU0o9y?>iKu76xwSL+bKAphsoHMg}lOCGM>zs7X7Uf4D>H>HL3x0nyC{(9B@J-gx+
zxeGbF%EhlLGw;k<`@QnSkwsEvr&ZY)&d;}HWT;sm7V-PjvhsKlMaH<}$BWGS+8#^Y
zI)C3|`J;@`ejcFJGvA54l8v`$$oPBh<j=jc*X7PU!yRb<K}bXFlaAQcfbzbHFZ~jA
zcXwPnX?bl^cX=~Vz~{xnWr+blcJ1%q@Z0f$<OH7=7Ph+?reEmF(g-h8x?{6{zR!zA
zk}VY(6B5l2cbr)Lp?!P)jh8o%?mgPoYU8a|vgiMg%qQ<zj5s)d$V>hXPgHHNVlee$
zC}qf+!tjdWiU#8q#ub4~E0_Zovjng&aN`69Zm*DoY=ab%!iEj}x2B!^k(lxStA<2M
z?#p7v+eVRAqQ`-uxO}tWo^AJezb2$?k4f5d&G~tYl7}v%-H&5Wa@WTv-1soB<=7M5
zODlJLnYibQ(1Ygp@5Lu@3b*{5*W&0QAhsb|&#=zz{KLPD`yNXjwvp8n`*fx}X7T=K
z$vc}A?kF6*ZXy5T*_uB6zU)7le-3@R#Pn)WyoSdz>(*cA%#)QqGtJ&?b!)o$2dlal
zd)>2yb;Lg9RAw%`zV_qK*ZeQ%%~de1%=Y>HiLLZ`#HwXq_8(Yq>*|WERgVja^))<r
dB&!+g8N+NGxpMRJrUJ7ZgQu&X%Q~loCIHU;riuUn

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..41bd99dd6cb83b0754ae468df6ae2c79f83ea5c9
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*8>L*h>3|=Sy_dKhRVsw
z>FVm5nVG$8<zE3*z*rLG7tG-B>_!@plUEfIQR0$XoLrPyP?DLS$G}iACpfI2sPy}n
z;DV1|pJ;jOYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jue30=
zR5mnL-|ErXZLGR^g~XDH-NtJ*49!K4m^}#!EBIQ>D9y{TJ4|}t?cK@KfHv28x;Tb-
zbS5WA*fj`tB{pz&2|6^)bYzHZUbJ9=(k2^jZx0UcE;cq1ULKylq$a)!Sw$TUorZA6
z#SIE^KLZW8+!%8ily@;ig^Bv`CKxyr%#@5ce8D(7Ba5l&u$Wj^VtaQ2L(^fc7fmlY
poKu81Ochf)A>-}?(#gijz!2HSe#C`a{u<CF44$rjF6*2UngH}!bcg@|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/icon.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..68d604969fb787f3b4022874913dadda67074e00
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L*h>3~G$;p|SnT3Xi
z>gwvcy1I(?oRtSEU@Qsp3ubV5b|VeQ3G;Mu4AGdFoFL)jAmC!ab>L@D6Nk_u2Zn`w
zGg}um33@28%xGyy@@e95mTVCX6`9&PVU1`}Xh^A3&;f-NDmqI#bQGqjXiRC*IiS*$
i#d0Dk#k!4~fnnx<R$=>(2_--q7(8A5T-G@yGywpS#x@E7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3cc8a8566e9728c76416686167f159ef64b217d
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0F7WCMG8*XJ%$*XlR(I
z)GZAZVk`;r3ubV5b|VeQ$*T&9C~-+GPA<wUD9OyvV_>M56C74hRQml(aKXo~Pqe&s
zwa%S6AG{&d;G*$^M>^+yG*2=V_4MwrFb*=lZ0w~l=h37ilR^}NS6Y}_DjOQBZ}sTx
zHdfudLSo6pZsWBYhUTJ2%$@{=6?`pbl;&mF9VWf+_U`0qK%2uoT^vI^I+GJ5SQjT;
zU}DtKNjbpLVjxz=ERkr%x?y#Kkx|oTo()k8S8yb2YA0-GerG25W}OUBvB(8Efm5|T
wJG?k|F!r#VahM{uV@<<!F^jhnVW}((e_NTJZ+8`42(*I1)78&qol`;+0JBPGvH$=8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd0740367b3c11b890593b10749a60b55f0012af
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0F7WCMG8*XJ%$*XlR(I
z)GZAZVk`;r3ubV5b|VeQ$*T&9C~-+GPA<wUD9OyvV_>M56C74hRQml(aKXo~Pqe&s
zwa%S6AG{&d;G*$^M>^+yG*2=V_4MwrFb*=lZ0w~l=h37ilR^}NS6Y}_DjOQBZ}sTx
zHdfudLSo6pZsWBYhUTJ2%$@{=6?`pbl;&mF9VWf+_U`0qK${~yT^vI^I+GJ5SQjT4
zFfsmF)Z@^>d%%@dVxv@}K&p|^p)>}kDS?54vzby`RxpIQcO{hn(f}%M=whg5Y+zur
xI3>_h$H?TSp{@NOTtUS}VZE_X(Gvl7hNqL5b_uRHWB{~;!PC{xWt~$(69E2`WP<<z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
new file mode 100644
index 0000000000..ff664dffd4
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "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": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb11a38527c015877fcf0af05b4069c9e2764f45
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*8>L*h>3}XhK5>MS;@)C
z>FVm5nVD_<Un~Jsz*rLG7tG-B>_!@pQ&<%eQR0$XoLrPyP?DLS$G}iACpfI2sPy}n
z;DV1|pJ;jOYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jue30=
zR5mnL->R{1i$iC(vFhd(5=*9c8?V(cG#5Q$_9Q5*;A=7CY(54RMOh~OvW$&D%X2(k
z978-hlM^IZmoPA@u`#CXTex5WV;9r32?BrAEV?+Y9)v2WXs9%VGcImWsMB^ks3F1H
zENrlh%|Jt8hY!!1#EhMD4NXiL4<>VSAJyQEVPO`K33C+p@fMlrdmwC1heEN;N6QM4
d9;Q1C40E=!*Tph;nFH-*@O1TaS?83{1OUN4ZN~rr

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a450045edabb28eea8bdfd3b5cb43f1bd47a82
GIT binary patch
literal 999
zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3HG1+{xJmq&N#aB8wRq_>O=u<5X=vX$A)7
znVv3=Ar*7p&NcK_c9dwdH=Np<Fi~$t!`(*q({Y+NZl3)5o&DUuSIh_J7w+AgkougT
zqwxl(lTumPwZ^@F7YQ%A+jFz>UEBA@)Xl+9?%qvLo7|dTR;?DG!r;b~pu(UQbs)ne
zD{b@5Y3rS%Z+zQY>XZ4?Q~AM*7b_y~%ki+Cy?lA{(?v`EWH9DcZj3P5fBV3$yK>u4
zPu)Jd^xki$f75TS`MK|!+tc>P`z3hRh)$RyuX`Z(_pe`HuB^L%YuV&Z-ZQhV%<VWk
zf7|P~tD?3B{(Si3?B{rQ$M4e>_&;v&l>W8xu2Dc#-KBho{rAfshh5*=dpwzc`<&|!
zCViUBvgO;|vf}#sd~0j#L~Ci)r|S3FpV++!`dq5arp#y{#6T7?OP=AmdVj;=!-uav
zH@i_3>{Yj=;bFlJo;|yFZ$6roxHs;7Z1wdi)8us@JbZYtufKox&zgNYC%-Lxe*50M
z=1ZR@KVz@Z+;;uM??-zdeEVh=y)Y;9=gIwyJJnpK%v-;IA-S%CdS<f90q&r^YM<_k
zf32Ff*lz!pKTkNN{{8&(XV1rUb!&Zn{cYQ~UoZLVa{JOJ`%=!Tnwl@}KW_cn%~BU-
z=k)Ko+5h9w(lg&be-QnoT!oY4y}*v0J0tUcbMvfP74@y@V$HpuAq)F|UN)=$Eq`La
z&xwAq2iNxn%zEp5p}O(CN5#Cl8HSfcmp)bZy}&X5w(N~hb1f__H$H#<JeB{;Oy$_1
zsDI0McfW60e?6V|*^~P7_it33{VKj;OU>PmgB}b$EC<LUp0OYJd68+=s;si|^0VU0
z*S#)(S{XaP<<h6ctaE(TR_|npn|AO0cU|@L{LmBO-=f6kS^xK+ZGSJJZVH2Wjit=3
z(ro)F$<>)<E2h7nHR1i<e6FYeZxz&C;+A2Go3?lV{{2!-mVPdoKr8t8_@>z&Xunsr
zWAfvf|CT;==jIR=SW)x=XcNmB6ZVA1KX(Z>Ph^nbY#^SPvA=oO=Z(*;GY$fCE`z75
KpUXO@geCxD(7cNP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/icon.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e11d4e771776a252055742986c6b62feea338512
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyHUT~%t_KbraB^}I7Z=yj(UFjl
zaB*_7wY9aeu?Y<g4G9UUuCAWQp*E9&;e?ay83u;GmPW=5403XEadC0>_V&LMms$YL
zVJr#q3ubV5b|VeQnd9l=7-G@;c0x4YVFex*<~a820YZoVzK>D}yt?8UQ|R;N_Occ+
z{nPWU^VZy}jd|D8(ebNoB}4yChX<xD8`v7ZhjDJ0W5W{W=U1@MXW9Y7W$DUCS1fbr
zu*{D>Cz!&i@J7@8(!IVk&qu49W^NZu{NpTYas2DuhrLtzmp%v(+5G5dpv+dSH<n+g
uxz1RTHIr+?x0+1mxg4=CeICm{W99hBvTIJ(rD&i#89ZJ6T-G@yGywo<KW}RQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1fbec0354ac18cb29ccee6509b5e159b8f4f631
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0D`py1Kfdp`rQt`DSKj
zuCA_PVq(*|xOzmm<>cfXKj%FFs$eV$@(X5gcy=QV$Z7X<aSZV|o}3`Tx;UZ1fpN~#
zhFC|-m>5sa)lEvwYBQLGnRB>8CI>G}TOpYo8emw=c16<lB<Bs05Y22y(U6sirD>U&
znjwxqSFzp@+0fp0IN~X5gy@v%kHZbP+zw`BI(j(nWMX9PxWvTnFh$IQVbPWYi~>tp
p`5H8I3m9B78@(C#Y>{ALU{LjwVyTt)+6Z(KgQu&X%Q~loCID+lM+^V}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d024df0845fff1316e4e023c1bc39891620f96b
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0D`py1Kfdp`rQt`DSKj
zuCA_PVq(*|xOzmm<>cfXKj%FFs$eV$@(X5gcy=QV$m#KPaSZV|o}3`Tx;R0>fiWzQ
z)xukLHj|p_3??-;<s2@bo&>It$-$x<Gz`p|JHyV*X*}EVL}f<C)J<Y$tXTyYFI@`C
z;R@4j@7&bhmi#%T(z54hUqVv20hilB57sv<PiAsF5n@d%{qyVanWhic3yRaM>sY&c
vracZ9kdy1XKXK_o)*qr%ri=4DvS4E1<&<QdVDj!Y&|M6ku6{1-oD!M<P?S-d

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
new file mode 100644
index 0000000000..c5a4ced120
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "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": "equipped-MASK",
+        "directions": 4,
+        "delays": [
+            [ 0.5, 0.5, 0.5 ],
+            [ 0.5, 0.5, 0.5 ],
+            [ 0.5, 0.5, 0.5 ],
+            [ 0.5, 0.5, 0.5 ]
+        ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b7e021114db65f1f40d3b9ecaf5d55267dabade
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|exd5LK*8>L*Oxd+7W7e#PU%&RB
zII-v6y@oYwZa#ioTwA+l*DeL`nLmLl8B2ovf*Bm1-ADs+a;iciN?cNllZ!G7N;32F
z7#J$%1cwzAm45#cT=4Ph6D@CDt#fD22X6>9xM=*~k<NJ^&65m8J-s_DjDw6X8+$3t
zc{J(Bq!5K*O><LKV@pH#&TeDX%_}69^mZGs)i5*{J!1AGD6HUXF{3mOLz%7A-6Ag2
zA3%GvJY5_^JUWvTB<valy9$}q7}MAkRqVW1bZ2vPbxnCRiDge&!47MI0#<KE>pIps
zPgz-dBv=<Gi108J6eK0MJ(D(Av0;Ixr>5Jfy>Fi7&1h4YE})|tk>hB1iLsl>FXbGI
h4wu_O4G9?rhJWUqoe_P4{6Je7JYD@<);T3K0RTN#eF6Xg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/icon.png b/Resources/Textures/Clothing/Mask/medical.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c44b97068ad982cac6d45af1b16e72e8c3c05e97
GIT binary patch
literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800030Nkl<ZScUDD
zK@Ni;6hw!nOA~q*+{0<gndoU?-+z~qu(u2OsWFYBR_%h>h$J#^CZG!MJ<inSRQC!{
z0V=>h09@BTXd2xO?|lm5FaXo&?x_%mb1ms^4a6b<PCYi~xt2byl)@ANu(4B!4?yy~
z&0~iiNGaf+$EL86Spd`M&gI0GvbpNb*~|jc0g-3`r4UOXCQkvITY|I%$&0o0F$en8
zZHDtH2%mzm1nCswc(X2UfW_u~H8gz+d<vqZ0WtSKFl=GGSflj|08$9I(ja5azKFQa
zZ%NpgL3ROPh_wbk0oYTU01nv$du#Q_2-udKb$SC8paN8Y3h)Lvx_&pK$8lu<0000<
KMNUMnLSTYQR)hWk

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/medical.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..33b171c87a1344bf2e419bacca534c48bdc07dca
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0Z<C|NmXvw(02`N1RPM
z2;?)C1o;IsI6S+N2IOQ{g+!FNq!uR^WfqiV=I1dmRLltuD<~@c{w28J<JTuz-nv@n
z&YTb45NdGI_`xHc^FEp<8H##(cUTw)8DBQ`Qke5-(ve9a3c;G1cIF!`qC2~dRX4AY
zSkm2XyjH`|T=a<9lc2DIuf>eBxf#L?rK*!=Yn%jH8|LZa7-G?zoFKuvg;7W$iD}XS
z6NR)c2cZCFP89{t4-Fm69!zWnOk6n*N7z*u>lD)5t{vhzx;P<&LA0bX^97Uf1y-I5
ptQ8knb1tyjE#Q_>c%YNS$Z#{C<FpxbOeoL>22WQ%mvv4FO#t53WPShu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/medical.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f71ac4831b58c79ba89a5b728fa57cd97ee086b
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0XnL+qN_R|Lf@+SNt-)
z2jnxB1o;IsI6S+N2IOQ{g+!FNq!uR^WfqiV=I1dmRLltuD<~@c{w28J<JTuz-nv@n
z&YTb45NdGI_`xHc^FEp<8H##(cUTw)8DBQ`Qke5-(ve9a3c;G1cIF!`qC2~dRX4AY
zSkm2XyjH`|T=a<9lc2DIuf>eBxf#L?rK*!=Yn%jH8|vxe7-G?zoFKt!!obO~jH@Fd
zrb*xg3%8F0hey*%W)4O<gUkkj1_OHqmK+Bb<4Iz58yF^WPq?`_;R2&*Nuy5*qh|@D
oTnQs{38QogV_ga3s^we^!NqKITda?i11(_iboFyt=akR{07D&OhX4Qo

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json
new file mode 100644
index 0000000000..ff664dffd4
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "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": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59f016ce6911f41e426a660388ec1932eb94b7d
GIT binary patch
literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|exd5LK*8>L*Oxd+-&%Jy7Cr)I{
zn)UGO*M>D~Za#ioTwA+l*RHo!`*#6VGL{7S1v5B2yO9Ru<X446l(?i8Cl_TFlw{`T
zF)&oj2@WeLD*gT?xZva0CtBXRTIbH358e=JaMAd|Bc1a;nkN~GdU|(Q7zY_&Huh4O
z^JvnMNg)csn&zge#+HWa`?ffAb{ng1ULmn$a<}nX4MTI$BW6#6!V10?GtTB^xDzI$
z==CS_Gtla6PZ!4!kIv)-3DzYHj0R2&s>#Z%DR$h<+5(T6PcA*mSs_|5Lt3DKrI?YC
zbxw<j!G_>94GTmUCy4Ygl^n=n(ovk?z|d@5RpzhfdMf(O!?YP~3eyG79KDg__$)!&
m&tjsb@QFYJE;mMIW`@^QoMq1oISYW+GI+ZBxvX<aXaWF<@qqgP

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e6108b91339c5c8a8a6eb25ad3636a622d33de6
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*_<DJ{c&8XVo7unr
zv)Ytv7MY7}%}ll=mDU2)FqQ=Q1v5B2yO9RusCl|LhG<MoPLN<VVQym5h*48bbroS0
ooo?VL!uah|k=v}@T`CL=g{n;c?=4?W2I^q&boFyt=akR{0Kgn6L;wH)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ddae9b2ca13751d34e32db8f870456d54396163
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*_<DK82DlqMoB8&`
z`7f9KU+-1f(c@}sX5xOOArh#Ju_VYZn8D%MjWi%f&C|s(L}Oxdf&{Axa}$$BjGAhy
rs|cg$^%6%B#=bs2w^_TpR2Ud0STnWkf4FrwPzQsjtDnm{r-UW|^+GIQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/internals.png b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6974a90c7a9bfad8365f5a9106717482b24823c
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*gvJy$bgn3<oHBRy
zMOW|WwEV7_EAMXKzWwISoBAe>URIA?fr=SRg8YIR9G=}s19B2PT^vI+CMG9HxHJR`
z@UT2!aypi<z$2DX)xd$HV@E@ya*Trj*8`@+POn$4UP&uC8UrTOXiRc&d46W5anwW>
zl{6+t<w*@H9tlczj6Aw8+Vpr>nKgGXT-P#)IN+eoz|i(x=SoJo*lM6%44$rjF6*2U
FngEeGMAZNQ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 2e5828ca83..ed17556473 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -6,139 +6,148 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "beaker"
-    },
-    {
-      "name": "bodybags"
-    },
-    {
-      "name": "clown"
-    },
-    {
-      "name": "heart"
-    },
-    {
-      "name": "meson"
-    },
-    {
-      "name": "sechud"
-    },
-    {
-      "name": "box"
-    },
-    {
-      "name": "boxwide"
-    },
-    {
-      "name": "box_hug"
-    },
-    {
-      "name": "box_id"
-    },
-    {
-      "name": "box_of_doom"
-    },
-    {
-      "name": "box_of_doom_big"
-    },
-    {
-      "name": "box_security"
-    },
-    {
-      "name": "circuit"
-    },
-    {
-      "name": "disk"
-    },
-    {
-      "name": "flashbang"
-    },
-    {
-      "name": "glasses"
-    },
-    {
-      "name": "handcuff"
-    },
-    {
-      "name": "implant"
-    },
-    {
-      "name": "latex"
-    },
-    {
-      "name": "light"
-    },
-    {
-      "name": "lightmixed"
-    },
-    {
-      "name": "lighttube"
-    },
-    {
-      "name": "mousetraps"
-    },
-    {
-      "name": "pda"
-    },
-    {
-      "name": "pillbox"
-    },
-    {
-      "name": "solution_trays"
-    },
-    {
-      "name": "sterile"
-    },
-    {
-      "name": "syringe"
-    },
-    {
-      "name": "writing"
-    },
-    {
-      "name": "writing_of_doom"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "hug-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "hug-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "shellbeanbag"
-    },
-    {
-      "name": "shellflare"
-    },
-    {
-      "name": "shellflash"
-    },
-    {
-      "name": "shellincendiary"
-    },
-    {
-      "name": "shelllethal"
-    },
-    {
-      "name": "shellpractice"
-    },
-    {
-      "name": "shellslug"
-    },
-    {
-      "name": "ziptie"
-    }
-  ]
+    "states": [
+        {
+            "name": "beaker"
+        },
+        {
+            "name": "bodybags"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "internals"
+        },
+        {
+            "name": "extendedtank"
+        },
+        {
+            "name": "emergencytank"
+        },
+        {
+            "name": "heart"
+        },
+        {
+            "name": "meson"
+        },
+        {
+            "name": "sechud"
+        },
+        {
+            "name": "box"
+        },
+        {
+            "name": "boxwide"
+        },
+        {
+            "name": "box_hug"
+        },
+        {
+            "name": "box_id"
+        },
+        {
+            "name": "box_of_doom"
+        },
+        {
+            "name": "box_of_doom_big"
+        },
+        {
+            "name": "box_security"
+        },
+        {
+            "name": "circuit"
+        },
+        {
+            "name": "disk"
+        },
+        {
+            "name": "flashbang"
+        },
+        {
+            "name": "glasses"
+        },
+        {
+            "name": "handcuff"
+        },
+        {
+            "name": "implant"
+        },
+        {
+            "name": "latex"
+        },
+        {
+            "name": "light"
+        },
+        {
+            "name": "lightmixed"
+        },
+        {
+            "name": "lighttube"
+        },
+        {
+            "name": "mousetraps"
+        },
+        {
+            "name": "pda"
+        },
+        {
+            "name": "pillbox"
+        },
+        {
+            "name": "solution_trays"
+        },
+        {
+            "name": "sterile"
+        },
+        {
+            "name": "syringe"
+        },
+        {
+            "name": "writing"
+        },
+        {
+            "name": "writing_of_doom"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "hug-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "hug-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "shellbeanbag"
+        },
+        {
+            "name": "shellflare"
+        },
+        {
+            "name": "shellflash"
+        },
+        {
+            "name": "shellincendiary"
+        },
+        {
+            "name": "shelllethal"
+        },
+        {
+            "name": "shellpractice"
+        },
+        {
+            "name": "shellslug"
+        },
+        {
+            "name": "ziptie"
+        }
+    ]
 }