Merge pull request #10 from Merrokitsune/patch-1

Fixes pull no.4 (“ some Nitrogen tanks, while replacing some locker oxygen tanks with air tanks.”)
RonRonstation · Mar 29, 2024 · e3ed611 · e3ed611
2 parents d4dbef1 + e48e2b9
commit e3ed611
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 22 deletions.
diff --git 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
@@ -8,6 +8,7 @@
       - id: ClothingOuterHardsuitSpatio
       - id: ClothingShoesBootsMag
       - id: ClothingMaskGasExplorer
+      - id: AirTankFilled
       - id: ClothingBeltUtilityFilled
       - id: SurvivalKnife
       - id: HandheldGPSBasic

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -133,6 +133,7 @@
     contents:
       - id: ClothingOuterHardsuitEngineeringWhite
       - id: ClothingMaskBreath
+      - id: AirTankFilled
       - id: ClothingEyesGlassesMeson
       - id: ClothingBeltChiefEngineerFilled
       - id: ClothingShoesBootsMagAdv

diff --git 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: EmergencyNitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyNitrogenOrRegularNitrogen
+      - id: NitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyNitrogenOrRegularNitrogen
       - id: ToolboxEmergencyFilled
         prob: 0.4
       - id: MedkitOxygenFilled
@@ -71,7 +83,7 @@
         - id: ClothingOuterSuitFire
         - id: ClothingHeadHelmetFire
         - id: ClothingMaskGas
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: FireExtinguisher
           prob: 0.25
 - type: entity
@@ -84,7 +96,7 @@
         - id: ClothingOuterSuitFire
         - id: ClothingHeadHelmetFire
         - id: ClothingMaskGas
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - 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
@@ -7,7 +7,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVA
         - id: ClothingMaskBreath
@@ -20,7 +20,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
@@ -33,7 +33,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterSuitEmergency
         - id: ClothingMaskBreath
 
@@ -45,7 +45,7 @@
   components:
   - type: StorageFill
     contents:   
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
         - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
@@ -58,7 +58,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitSyndicate
         - id: ClothingHeadHelmetSyndicate
         - id: ClothingMaskGasSyndicate
@@ -71,7 +71,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitPirateEVA
         - id: ClothingMaskGas
 
@@ -97,7 +97,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitBasic
         - id: ClothingMaskBreath
 
@@ -109,7 +109,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
@@ -124,7 +124,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
   - type: AccessReader
@@ -138,7 +138,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitSecurity
         - id: ClothingMaskBreath
   - type: AccessReader
@@ -152,7 +152,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: JetpackVoidFilled
         - id: ClothingShoesBootsMagAdv
         - id: ClothingOuterHardsuitEngineeringWhite
@@ -168,7 +168,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitMedical
         - id: ClothingMaskBreathMedical
   - type: AccessReader
@@ -182,7 +182,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitRd
         - id: ClothingMaskBreath
   - type: AccessReader
@@ -196,7 +196,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: JetpackSecurityFilled
         - id: ClothingOuterHardsuitSecurityRed
         - id: ClothingMaskGasSwat
@@ -211,7 +211,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
   - type: AccessReader
@@ -225,7 +225,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
   - type: AccessReader
@@ -239,7 +239,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingShoesBootsMag
       - id: ClothingOuterHardsuitSpatio
       - id: ClothingMaskGasExplorer
@@ -254,7 +254,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitSyndie
         - id: ClothingShoesBootsMagSyndie
         - id: ClothingMaskGasSyndicate
@@ -267,7 +267,7 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitPirateCap
         - id: ClothingMaskGas
 
@@ -279,6 +279,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath