From 207a07157a51e30893da0571757101c1187f814f Mon Sep 17 00:00:00 2001 From: Myctai <108953437+Myctai@users.noreply.github.com> Date: Mon, 8 Aug 2022 02:28:52 +0000 Subject: [PATCH] Make red tanks always mean Nitrogen (#9795) --- Resources/Maps/atlas.yml | 4 ++-- Resources/Maps/bagel.yml | 2 +- Resources/Maps/box.yml | 4 ++-- Resources/Maps/delta.yml | 8 ++++---- Resources/Maps/packedstation.yml | 2 +- Resources/Maps/packedstationxmas.yml | 2 +- Resources/Maps/pirate.yml | 2 +- Resources/Maps/saltern.yml | 2 +- Resources/Maps/waystation.yml | 4 ++-- Resources/Prototypes/Catalog/Fills/Crates/emergency.yml | 2 +- Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml | 8 +------- Resources/Prototypes/Catalog/Fills/Lockers/misc.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml | 6 +++--- 13 files changed, 21 insertions(+), 27 deletions(-) diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index 9a63b43ec3..4d5315f669 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -55737,7 +55737,7 @@ entities: toggleable-clothing: !type:ContainerSlot {} type: ContainerContainer - uid: 6357 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: -36.449944,-9.475628 parent: 30 @@ -55745,7 +55745,7 @@ entities: - canCollide: False type: Physics - uid: 6358 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: -35.512444,-9.460003 parent: 30 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index fea002a225..bbf388382e 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -120874,7 +120874,7 @@ entities: - canCollide: False type: Physics - uid: 13270 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 44.355366,0.6725495 parent: 60 diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 51fbe6f006..8d5a88f004 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -91332,7 +91332,7 @@ entities: parent: 8364 type: Transform - uid: 9104 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: -20.659506,35.504356 parent: 8364 @@ -91340,7 +91340,7 @@ entities: - canCollide: False type: Physics - uid: 9105 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: -20.408901,35.44926 parent: 8364 diff --git a/Resources/Maps/delta.yml b/Resources/Maps/delta.yml index 9eab6ae311..3a6f0562c7 100644 --- a/Resources/Maps/delta.yml +++ b/Resources/Maps/delta.yml @@ -79998,7 +79998,7 @@ entities: - canCollide: False type: Physics - uid: 6369 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: -46.5,-11.5 parent: 60 @@ -265960,7 +265960,7 @@ entities: - canCollide: False type: Physics - uid: 31240 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 62.5,13.5 parent: 60 @@ -265968,7 +265968,7 @@ entities: - canCollide: False type: Physics - uid: 31241 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 63.5,13.5 parent: 60 @@ -265976,7 +265976,7 @@ entities: - canCollide: False type: Physics - uid: 31242 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 64.5,13.5 parent: 60 diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index f2acb14972..8bb0d770a5 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -15793,7 +15793,7 @@ entities: - canCollide: False type: Physics - uid: 610 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 23.524204,-7.450146 parent: 2 diff --git a/Resources/Maps/packedstationxmas.yml b/Resources/Maps/packedstationxmas.yml index 8b801d8f4a..fb6bea4e3a 100644 --- a/Resources/Maps/packedstationxmas.yml +++ b/Resources/Maps/packedstationxmas.yml @@ -12418,7 +12418,7 @@ entities: - canCollide: False type: Physics - uid: 632 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 23.524204,-7.450146 parent: 0 diff --git a/Resources/Maps/pirate.yml b/Resources/Maps/pirate.yml index 1540118d74..c2444261ba 100644 --- a/Resources/Maps/pirate.yml +++ b/Resources/Maps/pirate.yml @@ -5454,7 +5454,7 @@ entities: - canCollide: False type: Physics - uid: 617 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 1.6834307,2.5188363 parent: 25 diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index b9dfa10b2a..05bf17ee47 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -73882,7 +73882,7 @@ entities: parent: 852 type: Transform - uid: 8740 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: -32.388412,-27.529545 parent: 852 diff --git a/Resources/Maps/waystation.yml b/Resources/Maps/waystation.yml index 9be93af6ba..faeca885a9 100644 --- a/Resources/Maps/waystation.yml +++ b/Resources/Maps/waystation.yml @@ -36532,7 +36532,7 @@ entities: - canCollide: False type: Physics - uid: 2639 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 5.5,36.5 parent: 82 @@ -72980,7 +72980,7 @@ entities: - canCollide: False type: Physics - uid: 6915 - type: RedOxygenTankFilled + type: OxygenTankFilled components: - pos: 20.538078,-30.484762 parent: 82 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml index dbb6a46f80..e287cb6f5a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml @@ -35,7 +35,7 @@ amount: 2 - id: ClothingOuterSuitFire amount: 2 - - id: RedOxygenTankFilled + - id: YellowOxygenTankFilled 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 caa68154d4..59d5362ed6 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml @@ -17,12 +17,6 @@ suffix: Filled components: *oxyTankFill -- type: entity - id: RedOxygenTankFilled - parent: RedOxygenTank - suffix: Filled - components: *oxyTankFill - - type: entity id: EmergencyOxygenTankFilled parent: EmergencyOxygenTank @@ -78,7 +72,7 @@ - type: entity id: NitrogenTankFilled - parent: RedOxygenTankFilled + parent: NitrogenTank suffix: Filled name: nitrogen tank components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 35102f96c4..bb93917cfc 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -45,7 +45,7 @@ components: - type: StorageFill contents: - - id: RedOxygenTankFilled + - id: YellowOxygenTankFilled prob: 0.6 - id: ClothingOuterSuitFire prob: 0.75 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index d9c138c570..f52e3b8434 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -66,9 +66,9 @@ - type: entity parent: OxygenTank - id: RedOxygenTank - name: oxygen tank - description: A tank of oxygen. This one is in red. + id: NitrogenTank + name: nitrogen tank + description: A tank of nitrogen. components: - type: Sprite sprite: Objects/Tanks/red.rsi