Remove yellow oxygen tank (#24374)

* Remove yellow oxygen tank

* forgor

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Resources/Prototypes/Catalog/Fills/Crates/emergency.yml

@@ -31,7 +31,7 @@
         amount: 2
       - id: ClothingOuterSuitFire
         amount: 2
-      - id: YellowOxygenTankFilled
+      - id: OxygenTankFilled
         amount: 2
 
 - type: entity

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

@@ -24,7 +24,7 @@
   id: OxygenTankFilled
   parent: OxygenTank
   suffix: Filled
-  components: &oxyTankFill
+  components:
   - type: GasTank
     outputPressure: 21.3
     air:
@@ -34,13 +34,6 @@
         - 2.051379050 # oxygen
       temperature: 293.15
 
-- type: entity
-  id: YellowOxygenTankFilled
-  parent: YellowOxygenTank
-  suffix: Filled
-  components: *oxyTankFill
-
-
 - type: entity
   id: EmergencyOxygenTankFilled
   parent: EmergencyOxygenTank

Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

@@ -6,7 +6,7 @@
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitSpatio
-      - id: YellowOxygenTankFilled
+      - id: OxygenTankFilled
       - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
       - id: ClothingMaskGasExplorer

Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml

@@ -82,7 +82,7 @@
     contents:
       - id: ClothingOuterHardsuitAtmos
       - id: ClothingMaskGasAtmos
-      - id: YellowOxygenTankFilled
+      - id: OxygenTankFilled
       - id: NitrogenTankFilled
       - id: ClothingOuterSuitAtmosFire
       - id: ClothingHeadHelmetAtmosFire

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -83,7 +83,7 @@
         - id: ClothingOuterSuitFire
         - id: ClothingHeadHelmetFire
         - id: ClothingMaskGas
-        - id: YellowOxygenTankFilled
+        - id: OxygenTankFilled
         - id: NitrogenTankFilled
         - id: FireExtinguisher
           prob: 0.25
@@ -97,7 +97,7 @@
         - id: ClothingOuterSuitFire
         - id: ClothingHeadHelmetFire
         - id: ClothingMaskGas
-        - id: YellowOxygenTankFilled
+        - id: OxygenTankFilled
         - id: NitrogenTankFilled
         - id: FireExtinguisher
           prob: 0.25

Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml

@@ -256,7 +256,7 @@
   - type: StorageFill
     contents:
       - id: NitrogenTankFilled
-      - id: YellowOxygenTankFilled
+      - id: OxygenTankFilled
       - id: ClothingShoesBootsMag
       - id: ClothingOuterHardsuitSpatio
       - id: ClothingMaskGasExplorer

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

@@ -151,7 +151,7 @@
       rareChance: 0.08
       prototypes:
         - FlashlightLantern
-        - YellowOxygenTankFilled
+        - OxygenTankFilled
         - DoubleEmergencyOxygenTankFilled
         - ToolboxEmergencyFilled
         - ToolboxArtisticFilled
@@ -228,7 +228,7 @@
       rareChance: 0.05
       prototypes:
         - FlashlightLantern
-        - YellowOxygenTankFilled
+        - OxygenTankFilled
         - DoubleEmergencyOxygenTankFilled
         - NitrogenTankFilled
         - DoubleEmergencyNitrogenTankFilled

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

@@ -66,19 +66,6 @@
   - type: Clothing
     sprite: Objects/Tanks/oxygen.rsi
 
-- type: entity
-  parent: OxygenTank
-  id: YellowOxygenTank
-  name: oxygen tank
-  description: A standard cylindrical gas tank for oxygen. This one is yellow.
-  components:
-  - type: Sprite
-    sprite: Objects/Tanks/yellow.rsi
-  - type: Item
-    sprite: Objects/Tanks/yellow.rsi
-  - type: Clothing
-    sprite: Objects/Tanks/yellow.rsi
-
 - type: entity
   parent: GasTankRoundBase
   id: NitrogenTank

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -35,7 +35,7 @@
     pocket1: SpiderCharge
     pocket2: PinpointerStation
     belt: EnergyKatana
-    suitstorage: YellowOxygenTankFilled
+    suitstorage: OxygenTankFilled
   inhand:
     - JetpackBlackFilled
 
@@ -260,7 +260,7 @@
     id: CBURNPDA
     pocket1: RadioHandheld
     pocket2: WeaponLaserGun
-    suitstorage: YellowOxygenTankFilled
+    suitstorage: OxygenTankFilled
     belt: ClothingBeltBandolier
   innerClothingSkirt: ClothingUniformJumpsuitColorBrown
   satchel: ClothingBackpackDuffelCBURNFilled

Resources/ServerInfo/Guidebook/Cargo/Salvage.xml

@@ -22,7 +22,6 @@ Jetpacks will be needed to move thoughout space, since without floors and gravit
 <Box>
 <GuideEntityEmbed Entity="ClothingMaskGasExplorer"/>
 <GuideEntityEmbed Entity="OxygenTankFilled"/>
-<GuideEntityEmbed Entity="YellowOxygenTankFilled"/>
 <GuideEntityEmbed Entity="NitrogenTankFilled"/>
 </Box>
 Internals will be important, given all species need to breathe, and space doesnt have any gases. Your mask is used to connect the gas tank to your mouth to breath, while the gas tanks hold consumable gases and can be refilled at gas canisters. All species breathe oxygen (blue + yellow tanks) except slimes, which need nitrogen (red tanks)

Resources/Textures/Objects/Tanks/yellow.rsi/meta.json

@@ -1,71 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE-dog",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-puppy",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-fox",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-cat",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-hamster",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-kangaroo",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-sloth",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-possum",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "equipped-SUITSTORAGE-pig",
-      "directions": 4,
-      "delays": [[1],[1],[1],[1]]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}

Resources/migration.yml

@@ -208,3 +208,6 @@ SpawnVehicleJanicart: null
 VehicleJanicart: null
 VehicleJanicartDestroyed: null
 
+# 2024-02-01
+YellowOxygenTank: OxygenTank
+YellowOxygenTankFilled: OxygenTankFilled