Gas tanks: properly localized.

Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs

@@ -109,11 +109,10 @@ namespace Content.Server.GameObjects.Components.Atmos
 
         public void Examine(FormattedMessage message, bool inDetailsRange)
         {
-            message.AddMarkup(Loc.GetString("Pressure: [color=orange]{0}[/color] kPa.\n",
+            message.AddMarkup(Loc.GetString("gas-tank-examine", ("pressure", Math.Round(Air?.Pressure ?? 0))));
-                Math.Round(Air?.Pressure ?? 0)));
             if (IsConnected)
             {
-                message.AddMarkup(Loc.GetString("Connected to external component"));
+                message.AddMarkup(Loc.GetString("gas-tank-connected"));
             }
         }
 

Resources/Locale/en-US/components/gas-tank-component.ftl

@@ -0,0 +1,7 @@
+### GasTankComponent stuff.
+
+# Examine text showing pressure in tank.
+comp-gas-tank-examine = Pressure: [color=orange]{PRESSURE($pressure)}[/color].
+
+# Examine text when internals are active.
+comp-gas-tank-connected = {"\u000A"}Connected to external component

Resources/Locale/en-US/entities/gas-tanks.ftl

@@ -0,0 +1,24 @@
+### Gas tank entity prototype data.
+
+ent-gas-tank-base = gas tank
+    .desc = It's a gas tank. It contains gas.
+
+ent-oxygen-tank = oxygen tank
+    .desc = A tank of oxygen.
+ent-yellow-oxygen-tank = { ent-oxygen-tank }
+    .desc = A tank of oxygen. This one is in yellow.
+ent-red-oxygen-tank = { ent-oxygen-tank }
+    .desc = A tank of oxygen. This one is in red.
+ent-emergency-oxygen-tank = emergency oxygen tank
+    .desc = Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
+ent-extended-emergency-oxygen-tank = extended-capacity emergency oxygen tank
+ent-double-emergency-oxygen-tank = double emergency oxygen tank
+
+ent-air-tank = air tank
+    .desc = Mixed anyone?
+
+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

Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml

@@ -1,48 +1,32 @@
 - type: entity
   id: OxygenTankFilled
   parent: OxygenTank
-  name: oxygen tank
+  suffix: ent-gas-tank-suffix-filled
-  description: A tank of oxygen.
+  components: &oxyTankFill
-  suffix: Filled
+  - type: GasTank
-  components:
+    outputPressure: 21.27825
-    - type: GasTank
+    air:
-      outputPressure: 21.27825
+      volume: 70
-      air:
+      moles:
-        volume: 70
+        - 22.6293856 # oxygen
-        moles:
+      temperature: 293.15
-          - 22.6293856 # oxygen
-        temperature: 293.15
 
 - type: entity
   id: YellowOxygenTankFilled
-  parent: OxygenTankFilled
+  parent: YellowOxygenTank
-  name: oxygen tank
+  suffix: ent-gas-tank-suffix-filled
-  description: A tank of oxygen. This one is yellow.
+  components: *oxyTankFill
-  suffix: Filled
-  components:
-    - type: Sprite
-      sprite: Objects/Tanks/yellow.rsi
-    - type: Clothing
-      sprite: Objects/Tanks/yellow.rsi
 
 - type: entity
   id: RedOxygenTankFilled
-  parent: OxygenTankFilled
+  parent: RedOxygenTank
-  name: oxygen tank
+  suffix: ent-gas-tank-suffix-filled
-  description: A tank of oxygen. This one is red.
+  components: *oxyTankFill
-  suffix: Filled
-  components:
-    - type: Sprite
-      sprite: Objects/Tanks/red.rsi
-    - type: Clothing
-      sprite: Objects/Tanks/red.rsi
 
 - type: entity
   id: EmergencyOxygenTankFilled
   parent: EmergencyOxygenTank
-  name: emergency oxygen tank
+  suffix: ent-gas-tank-suffix-filled
-  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 21.27825
@@ -55,9 +39,7 @@
 - type: entity
   id: ExtendedEmergencyOxygenTankFilled
   parent: ExtendedEmergencyOxygenTank
-  name: extended-capacity emergency oxygen tank
+  suffix: ent-gas-tank-suffix-filled
-  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 21.27825
@@ -70,9 +52,7 @@
 - type: entity
   id: DoubleEmergencyOxygenTankFilled
   parent: DoubleEmergencyOxygenTank
-  name: double emergency oxygen tank
+  suffix: ent-gas-tank-suffix-filled
-  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-  suffix: Filled
   components:
     - type: GasTank
       outputPressure: 21.27825
@@ -84,13 +64,9 @@
 
 - type: entity
   id: AirTankFilled
-  parent: GasTankBase
+  parent: AirTank
-  name: air tank
+  suffix: ent-gas-tank-suffix-filled
-  description: Mixed anyone?
-  suffix: Filled
   components:
-    - type: Sprite
-      sprite: Objects/Tanks/generic.rsi
     - type: GasTank
       outputPressure: 101.325
       air:
@@ -99,14 +75,12 @@
           - 4.75217098 # oxygen
           - 17.8772147 # nitrogen
         temperature: 293.15
-    - type: Clothing
-      sprite: Objects/Tanks/generic.rsi
 
 - type: entity
   id: PlasmaTankFilled
   parent: PlasmaTank
   name: plasma tank
-  suffix: Filled
+  suffix: ent-gas-tank-suffix-filled
   description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
   components:
     - type: GasTank

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

@@ -2,8 +2,6 @@
   parent: BaseItem
   abstract: true
   id: GasTankBase
-  name: Gas Tank
-  description: It's a gas tank. It contains gas.
   components:
     - type: Sprite
       sprite: Objects/Tanks/generic.rsi
@@ -23,9 +21,7 @@
 - type: entity
   id: OxygenTank
   parent: GasTankBase
-  name: oxygen tank
+  suffix: ent-gas-tank-suffix-empty
-  description: A tank of oxygen.
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/oxygen.rsi
@@ -42,9 +38,7 @@
 - type: entity
   id: YellowOxygenTank
   parent: OxygenTank
-  name: oxygen tank
+  suffix: ent-gas-tank-suffix-empty
-  description: A tank of oxygen. This one is in yellow.
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/yellow.rsi
@@ -56,9 +50,7 @@
 - type: entity
   id: RedOxygenTank
   parent: OxygenTank
-  name: oxygen tank
+  suffix: ent-gas-tank-suffix-empty
-  description: A tank of oxygen. This one is in yellow.
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/red.rsi
@@ -70,9 +62,7 @@
 - type: entity
   id: EmergencyOxygenTank
   parent: OxygenTank
-  name: emergency oxygen tank
+  suffix: ent-gas-tank-suffix-empty
-  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/emergency.rsi
@@ -90,9 +80,7 @@
 - type: entity
   id: ExtendedEmergencyOxygenTank
   parent: EmergencyOxygenTank
-  name: extended-capacity emergency oxygen tank
+  suffix: ent-gas-tank-suffix-empty
-  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/emergency_yellow.rsi
@@ -110,9 +98,7 @@
 - type: entity
   id: DoubleEmergencyOxygenTank
   parent: ExtendedEmergencyOxygenTank
-  name: double emergency oxygen tank
+  suffix: ent-gas-tank-suffix-empty
-  description: Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it.
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/emergency_double.rsi
@@ -130,9 +116,7 @@
 - type: entity
   id: AirTank
   parent: GasTankBase
-  name: air tank
+  suffix: ent-gas-tank-suffix-empty
-  description: Mixed anyone?
-  suffix: Empty
   components:
     - type: Sprite
       sprite: Objects/Tanks/generic.rsi
@@ -149,9 +133,7 @@
 - type: entity
   id: PlasmaTank
   parent: GasTankBase
-  name: plasma tank
+  suffix: ent-gas-tank-suffix-empty
-  suffix: Empty
-  description: "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
   components:
     - type: Sprite
       sprite: Objects/Tanks/plasma.rsi