From b0e811b4f35ba7968c98fe21263bae0b104273d8 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Thu, 29 Feb 2024 15:40:17 -0600 Subject: [PATCH] Removes all big O2 tanks from non-emergency & fire lockers + removes counterpart N2 tanks (#25660) kills off N2 & O2 tanks from lockers & removes duplicate n2 tanks from stuff with o2 tanks --- .../Catalog/Fills/Items/toolboxes.yml | 3 --- .../Catalog/Fills/Lockers/cargo.yml | 2 -- .../Catalog/Fills/Lockers/engineer.yml | 4 ---- .../Catalog/Fills/Lockers/heads.yml | 2 -- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 14 ------------ .../Catalog/Fills/Lockers/suit_storage.yml | 22 +------------------ 6 files changed, 1 insertion(+), 46 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index b3415744c7..87921a71d4 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -13,9 +13,6 @@ - id: EmergencyOxygenTankFilled - id: EmergencyOxygenTankFilled prob: 0.5 - - id: EmergencyNitrogenTankFilled - - id: EmergencyNitrogenTankFilled - prob: 0.5 - id: FoodTinMRE - id: FoodTinMRE prob: 0.5 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index d39040041b..4a0da9179e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -6,8 +6,6 @@ - type: StorageFill contents: - id: ClothingOuterHardsuitSpatio - - id: OxygenTankFilled - - id: NitrogenTankFilled - id: ClothingShoesBootsMag - id: ClothingMaskGasExplorer - id: ClothingBeltUtilityFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 6ea009dba5..384c27b0df 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -82,8 +82,6 @@ contents: - id: ClothingOuterHardsuitAtmos - id: ClothingMaskGasAtmos - - id: OxygenTankFilled - - id: NitrogenTankFilled - id: ClothingOuterSuitAtmosFire - id: ClothingHeadHelmetAtmosFire - id: GasAnalyzer @@ -120,8 +118,6 @@ - id: ClothingOuterHardsuitEngineering - id: ClothingHandsGlovesColorYellow - id: ClothingMaskGas - - id: OxygenTankFilled - - id: NitrogenTankFilled - id: ClothingShoesBootsMag - id: RCD - id: RCDAmmo diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index bd9b499af2..25c3fde0bd 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -133,8 +133,6 @@ contents: - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath - - id: OxygenTankFilled - - id: NitrogenTankFilled - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - id: ClothingShoesBootsMagAdv diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 8408d49cfe..70341cb019 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -28,12 +28,6 @@ - id: OxygenTankFilled prob: 0.20 orGroup: EmergencyTankOrRegularTank - - id: EmergencyNitrogenTankFilled - prob: 0.80 - orGroup: EmergencyNitrogenOrRegularNitrogen - - id: NitrogenTankFilled - prob: 0.20 - orGroup: EmergencyNitrogenOrRegularNitrogen - id: ToolboxEmergencyFilled prob: 0.4 - id: MedkitOxygenFilled @@ -58,12 +52,6 @@ - id: OxygenTankFilled prob: 0.20 orGroup: EmergencyTankOrRegularTank - - id: NitrogenTankFilled - prob: 0.80 - orGroup: EmergencyNitrogenOrRegularNitrogen - - id: EmergencyNitrogenTankFilled - prob: 0.20 - orGroup: EmergencyNitrogenOrRegularNitrogen - id: ToolboxEmergencyFilled prob: 0.4 - id: MedkitOxygenFilled @@ -84,7 +72,6 @@ - id: ClothingHeadHelmetFire - id: ClothingMaskGas - id: OxygenTankFilled - - id: NitrogenTankFilled - id: FireExtinguisher prob: 0.25 - type: entity @@ -98,7 +85,6 @@ - id: ClothingHeadHelmetFire - id: ClothingMaskGas - id: OxygenTankFilled - - id: NitrogenTankFilled - id: FireExtinguisher prob: 0.25 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 0b22343dfa..b9ce46878b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -7,7 +7,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVA @@ -21,7 +20,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVALarge @@ -35,7 +33,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath @@ -47,8 +44,7 @@ suffix: Prisoner EVA components: - type: StorageFill - contents: - - id: NitrogenTankFilled + contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitEVAPrisoner - id: ClothingHeadHelmetEVALarge @@ -62,7 +58,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndicate - id: ClothingHeadHelmetSyndicate @@ -76,7 +71,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas @@ -103,7 +97,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitBasic - id: ClothingMaskBreath @@ -116,7 +109,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitEngineering @@ -132,7 +124,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath @@ -147,7 +138,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitSecurity - id: ClothingMaskBreath @@ -162,7 +152,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: JetpackVoidFilled - id: ClothingShoesBootsMagAdv @@ -179,7 +168,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitMedical - id: ClothingMaskBreathMedical @@ -194,7 +182,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitRd - id: ClothingMaskBreath @@ -209,7 +196,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: JetpackSecurityFilled - id: ClothingOuterHardsuitSecurityRed @@ -225,7 +211,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath @@ -240,7 +225,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain @@ -255,7 +239,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitSpatio @@ -271,7 +254,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndie - id: ClothingShoesBootsMagSyndie @@ -285,7 +267,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateCap - id: ClothingMaskGas @@ -298,7 +279,6 @@ components: - type: StorageFill contents: - - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitWizard - id: ClothingMaskBreath -- 2.51.2