Remove yellow oxygen tank (#24374)

* Remove yellow oxygen tank * forgor --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-01 07:53:33 +01:00
parent b80b6c04b2
commit e5bf4979ae
25 changed files with 14 additions and 103 deletions
--- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/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
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/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
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/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
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/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