From 4fa4289e950c85fae46e80ff04f9994727d36c7d Mon Sep 17 00:00:00 2001
From: Kara D <lunarautomaton6@gmail.com>
Date: Mon, 22 Nov 2021 02:06:35 -0700
Subject: [PATCH] ent-gas-tank-suffix-filled incident

---
 Resources/Locale/en-US/prototypes/gas-tanks.ftl  |  3 ---
 .../Prototypes/Catalog/Fills/Items/gas_tanks.yml | 16 ++++++++--------
 .../Entities/Objects/Tools/gas_tanks.yml         |  8 --------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Resources/Locale/en-US/prototypes/gas-tanks.ftl b/Resources/Locale/en-US/prototypes/gas-tanks.ftl
index 69a6839e57..6a11b25ff8 100644
--- a/Resources/Locale/en-US/prototypes/gas-tanks.ftl
+++ b/Resources/Locale/en-US/prototypes/gas-tanks.ftl
@@ -19,6 +19,3 @@ ent-air-tank = air tank
 
 ent-plasma-tank = plasma tank
     .desc = Contains dangerous plasma. Do not inhale. Warning: extremely flammable.
-
-ent-gas-tank-suffix-empty = Empty
-ent-gas-tank-suffix-filled = Filled
diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index aac92c95f9..3511963835 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: OxygenTankFilled
   parent: OxygenTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components: &oxyTankFill
   - type: GasTank
     outputPressure: 21.27825
@@ -14,19 +14,19 @@
 - type: entity
   id: YellowOxygenTankFilled
   parent: YellowOxygenTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components: *oxyTankFill
 
 - type: entity
   id: RedOxygenTankFilled
   parent: RedOxygenTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components: *oxyTankFill
 
 - type: entity
   id: EmergencyOxygenTankFilled
   parent: EmergencyOxygenTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 21.27825
@@ -39,7 +39,7 @@
 - type: entity
   id: ExtendedEmergencyOxygenTankFilled
   parent: ExtendedEmergencyOxygenTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 21.27825
@@ -52,7 +52,7 @@
 - type: entity
   id: DoubleEmergencyOxygenTankFilled
   parent: DoubleEmergencyOxygenTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 21.27825
@@ -65,7 +65,7 @@
 - type: entity
   id: AirTankFilled
   parent: AirTank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 101.325
@@ -80,7 +80,7 @@
   id: PlasmaTankFilled
   parent: PlasmaTank
   name: plasma tank
-  suffix: ent-gas-tank-suffix-filled
+  suffix: Filled
   description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
   components:
     - type: GasTank
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 48b667a26d..087fbadf33 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -24,7 +24,6 @@
   id: OxygenTank
   name: oxygen tank
   description: A tank of oxygen.
-#  suffix: ent-gas-tank-suffix-empty
   components:
   - type: Sprite
     sprite: Objects/Tanks/oxygen.rsi
@@ -43,7 +42,6 @@
   id: YellowOxygenTank
   name: oxygen tank
   description: A tank of oxygen. This one is in yellow.
-#  suffix: ent-gas-tank-suffix-empty
   components:
   - type: Sprite
     sprite: Objects/Tanks/yellow.rsi
@@ -57,7 +55,6 @@
   id: RedOxygenTank
   name: oxygen tank
   description: A tank of oxygen. This one is in red.
-#  suffix: ent-gas-tank-suffix-empty
   components:
   - type: Sprite
     sprite: Objects/Tanks/red.rsi
@@ -71,7 +68,6 @@
   id: EmergencyOxygenTank
   name: extended-capacity emergency oxygen tank
   description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-#  suffix: ent-gas-tank-suffix-empty
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency.rsi
@@ -92,7 +88,6 @@
   id: ExtendedEmergencyOxygenTank
   name: double emergency oxygen tank
   description: Used for emergencies. Contains little oxygen, so try to conserve it until you actually need it.
-#  suffix: ent-gas-tank-suffix-empty
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_yellow.rsi
@@ -111,7 +106,6 @@
 - type: entity
   parent: ExtendedEmergencyOxygenTank
   id: DoubleEmergencyOxygenTank
-#  suffix: ent-gas-tank-suffix-empty
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_double.rsi
@@ -132,7 +126,6 @@
   id: AirTank
   name: air tank
   description: Mixed anyone?
-#  suffix: ent-gas-tank-suffix-empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/generic.rsi
@@ -151,7 +144,6 @@
   id: PlasmaTank
   name: plasma tank
   description: Contains dangerous plasma. Do not inhale. Extremely flammable.
-#  suffix: ent-gas-tank-suffix-empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/plasma.rsi