Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reverts Nitrogen Tank Removal #1007

Closed
wants to merge 8 commits into from
Closed

Reverts Nitrogen Tank Removal #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f691377
do the chnage
DangerRevolution Mar 17, 2024
1d8d57a
Revert "do the chnage"
DangerRevolution Mar 17, 2024
a3824d3
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 17, 2024
f2fdf5d
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 19, 2024
f779908
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 22, 2024
3c1f314
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 24, 2024
08e7562
Revert "Removes all big O2 tanks from non-emergency & fire lockers + …
DangerRevolution Mar 25, 2024
3372f2e
Merge branch 'master' into i-hate-specism
DangerRevolution Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSpatio
- id: OxygenTankFilled
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these. They can use tank dispensers. If dispensers aren't mapped, we will fix that.

- id: NitrogenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingMaskGasExplorer
- id: ClothingBeltUtilityFilled
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
contents:
- id: ClothingOuterHardsuitAtmos
- id: ClothingMaskGasAtmos
- id: OxygenTankFilled
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove these. They can use tank dispensers. If dispensers aren't mapped, we will fix that.

- id: NitrogenTankFilled
- id: ClothingOuterSuitAtmosFire
- id: ClothingHeadHelmetAtmosFire
- id: GasAnalyzer
Expand Down Expand Up @@ -122,6 +124,8 @@
- id: ClothingOuterHardsuitEngineering
- id: ClothingHandsGlovesColorYellow
- id: ClothingMaskGas
- id: OxygenTankFilled
- id: NitrogenTankFilled
- id: ClothingShoesBootsMag
- id: RCD
- id: RCDAmmo
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@
contents:
- id: ClothingOuterHardsuitEngineeringWhite
- id: ClothingMaskBreath
- id: OxygenTankFilled
- id: NitrogenTankFilled
- id: ClothingEyesGlassesMeson
- id: ClothingBeltChiefEngineerFilled
- id: ClothingShoesBootsMagAdv
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -72,6 +84,7 @@
- id: ClothingHeadHelmetFire
- id: ClothingMaskGas
- id: OxygenTankFilled
- id: NitrogenTankFilled
- id: FireExtinguisher
prob: 0.25
- type: entity
Expand All @@ -85,6 +98,7 @@
- id: ClothingHeadHelmetFire
- id: ClothingMaskGas
- id: OxygenTankFilled
- id: NitrogenTankFilled
- id: FireExtinguisher
prob: 0.25
- type: entity
Expand Down
22 changes: 21 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitEVA
- id: ClothingHeadHelmetEVA
Expand All @@ -20,6 +21,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitEVA
- id: ClothingHeadHelmetEVALarge
Expand All @@ -33,6 +35,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterSuitEmergency
- id: ClothingMaskBreath
Expand All @@ -44,7 +47,8 @@
suffix: Prisoner EVA
components:
- type: StorageFill
contents:
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitEVAPrisoner
- id: ClothingHeadHelmetEVALarge
Expand All @@ -58,6 +62,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitSyndicate
- id: ClothingHeadHelmetSyndicate
Expand All @@ -71,6 +76,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitPirateEVA
- id: ClothingMaskGas
Expand All @@ -97,6 +103,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitBasic
- id: ClothingMaskBreath
Expand All @@ -109,6 +116,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitEngineering
Expand All @@ -124,6 +132,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitAtmos
- id: ClothingMaskBreath
Expand All @@ -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
Expand All @@ -152,6 +162,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: JetpackVoidFilled
- id: ClothingShoesBootsMagAdv
Expand All @@ -168,6 +179,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitMedical
- id: ClothingMaskBreathMedical
Expand All @@ -182,6 +194,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitRd
- id: ClothingMaskBreath
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -225,6 +240,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitCap
- id: ClothingMaskGasCaptain
Expand All @@ -239,6 +255,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
- id: ClothingOuterHardsuitSpatio
Expand Down Expand Up @@ -288,6 +305,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitSyndie
- id: ClothingShoesBootsMagSyndie
Expand All @@ -301,6 +319,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitPirateCap
- id: ClothingMaskGas
Expand All @@ -313,6 +332,7 @@
components:
- type: StorageFill
contents:
- id: NitrogenTankFilled
- id: OxygenTankFilled
- id: ClothingOuterHardsuitWizard
- id: ClothingMaskBreath
Loading