From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 1 Feb 2024 06:53:33 +0000 (+0100) Subject: Remove yellow oxygen tank (#24374) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e5bf4979ae432266cd6e2e9ef1d91cb40dd99264;p=space-station-14.git Remove yellow oxygen tank (#24374) * Remove yellow oxygen tank * forgor --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml index 2e467f73d8..9532fbf74e 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml index 15bf27fb8f..2cf1354c14 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index d2b9fa1b8d..d39040041b 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 1e48431295..6ea009dba5 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 4bf07481d7..8408d49cfe 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 7ee7351fbe..0b22343dfa 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 482a6ef54c..9aa6dc9141 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index bd7a42d2a4..e750b211a3 100644 --- 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 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 5d3f84df3c..3f5c36875f 100644 --- 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 diff --git a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml index a0902ae7ab..a8a7ffcea1 100644 --- a/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml +++ b/Resources/ServerInfo/Guidebook/Cargo/Salvage.xml @@ -22,7 +22,6 @@ Jetpacks will be needed to move thoughout space, since without floors and gravit - 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) diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-BACKPACK.png deleted file mode 100644 index 0ae5d0fe8b..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-cat.png deleted file mode 100644 index 55cd899faf..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-cat.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-dog.png deleted file mode 100644 index 820cf0af75..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-dog.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-fox.png deleted file mode 100644 index 881effe79c..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-fox.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png deleted file mode 100644 index b4cf9b527c..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png deleted file mode 100644 index f44f77d777..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-pig.png deleted file mode 100644 index dfe35d0579..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-pig.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-possum.png deleted file mode 100644 index 34993de6d8..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-possum.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-puppy.png deleted file mode 100644 index 423fcfbcd3..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-puppy.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-sloth.png deleted file mode 100644 index 9bf4168ae8..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-sloth.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/icon.png b/Resources/Textures/Objects/Tanks/yellow.rsi/icon.png deleted file mode 100644 index e290d453be..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/yellow.rsi/inhand-left.png deleted file mode 100644 index d9c79703ca..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/yellow.rsi/inhand-right.png deleted file mode 100644 index b79125ee7c..0000000000 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json deleted file mode 100644 index 59ffe2bb89..0000000000 --- a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/migration.yml b/Resources/migration.yml index 8c13f4359c..557a1a767b 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -208,3 +208,6 @@ SpawnVehicleJanicart: null VehicleJanicart: null VehicleJanicartDestroyed: null +# 2024-02-01 +YellowOxygenTank: OxygenTank +YellowOxygenTankFilled: OxygenTankFilled