From f691377136d028cb09b2ea848987ba283014cdcf Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 17:19:18 +0000 Subject: [PATCH 1/3] do the chnage --- Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 9a8c1c2a5c9..37e7676ffcb 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -281,6 +281,7 @@ - ClothMade - WhitelistChameleon - PrisonUniform + - Skirt # Delta-V - Skirt Tag for Harpies to wear it. - type: entity parent: ClothingUniformSkirtBase From 1d8d57a5091c1d0e8d37f03a06cde23d67f60ba8 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 17:19:56 +0000 Subject: [PATCH 2/3] Revert "do the chnage" This reverts commit f691377136d028cb09b2ea848987ba283014cdcf. --- Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 37e7676ffcb..9a8c1c2a5c9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -281,7 +281,6 @@ - ClothMade - WhitelistChameleon - PrisonUniform - - Skirt # Delta-V - Skirt Tag for Harpies to wear it. - type: entity parent: ClothingUniformSkirtBase From 08e756294f8bfeea3ff0c1be38c815e23aba3bb5 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:56:05 +0000 Subject: [PATCH 3/3] Revert "Removes all big O2 tanks from non-emergency & fire lockers + removes counterpart N2 tanks (#25660)" This reverts commit fc6940ecdb9298fc58e7cfa90e1791ab0b0bfd4a. --- .../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, 46 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 87921a71d4f..b3415744c77 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -13,6 +13,9 @@ - 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 4ca95adff84..4d69f020417 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -6,6 +6,8 @@ - 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 e4d995e52ee..65dcff1bd65 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -82,6 +82,8 @@ contents: - id: ClothingOuterHardsuitAtmos - id: ClothingMaskGasAtmos + - id: OxygenTankFilled + - id: NitrogenTankFilled - id: ClothingOuterSuitAtmosFire - id: ClothingHeadHelmetAtmosFire - id: GasAnalyzer @@ -122,6 +124,8 @@ - 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 5c9aca23e45..d1cdda7ee79 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -170,6 +170,8 @@ 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 45a6bf4125f..bed25e96d03 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -28,6 +28,12 @@ - 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 @@ -52,6 +58,12 @@ - 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 @@ -72,6 +84,7 @@ - id: ClothingHeadHelmetFire - id: ClothingMaskGas - id: OxygenTankFilled + - id: NitrogenTankFilled - id: FireExtinguisher prob: 0.25 - type: entity @@ -85,6 +98,7 @@ - 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 ac5cb47cc97..fcc25fcd126 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -7,6 +7,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVA @@ -20,6 +21,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitEVA - id: ClothingHeadHelmetEVALarge @@ -33,6 +35,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath @@ -44,7 +47,8 @@ suffix: Prisoner EVA components: - type: StorageFill - contents: + contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitEVAPrisoner - id: ClothingHeadHelmetEVALarge @@ -58,6 +62,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndicate - id: ClothingHeadHelmetSyndicate @@ -71,6 +76,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas @@ -97,6 +103,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitBasic - id: ClothingMaskBreath @@ -109,6 +116,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitEngineering @@ -124,6 +132,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath @@ -138,6 +147,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit. - id: ClothingMaskBreath @@ -152,6 +162,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: JetpackVoidFilled - id: ClothingShoesBootsMagAdv @@ -168,6 +179,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitMedical - id: ClothingMaskBreathMedical @@ -182,6 +194,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitRd - id: ClothingMaskBreath @@ -196,6 +209,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: JetpackSecurityFilled - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. @@ -211,6 +225,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. - id: ClothingMaskBreath @@ -225,6 +240,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain @@ -239,6 +255,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitSpatio @@ -288,6 +305,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitSyndie - id: ClothingShoesBootsMagSyndie @@ -301,6 +319,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateCap - id: ClothingMaskGas @@ -313,6 +332,7 @@ components: - type: StorageFill contents: + - id: NitrogenTankFilled - id: OxygenTankFilled - id: ClothingOuterHardsuitWizard - id: ClothingMaskBreath