diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 31baaa1dee..009a774dd7 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -207,7 +207,7 @@ namespace Content.Shared.Atmos
///
/// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs)
///
- public const float MinimumTritiumOxyburnEnergy = 143000f;
+ public const float MinimumTritiumOxyburnEnergy = 430000f;
public const float TritiumBurnOxyFactor = 100f;
public const float TritiumBurnTritFactor = 10f;
diff --git a/Content.Shared/PneumaticCannon/PneumaticCannonComponent.cs b/Content.Shared/PneumaticCannon/PneumaticCannonComponent.cs
index 8c760abe58..ebcba59878 100644
--- a/Content.Shared/PneumaticCannon/PneumaticCannonComponent.cs
+++ b/Content.Shared/PneumaticCannon/PneumaticCannonComponent.cs
@@ -30,7 +30,7 @@ public sealed partial class PneumaticCannonComponent : Component
///
[DataField("gasUsage")]
[ViewVariables(VVAccess.ReadWrite)]
- public float GasUsage = 0.142f;
+ public float GasUsage = 2f;
///
/// Base projectile speed at default power.
diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index daca6f2bbe..72274e10b6 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -28,10 +28,10 @@
- type: GasTank
outputPressure: 21.3
air:
- # 31 minutes
- volume: 5
+ # 94 minutes
+ volume: 15
moles:
- - 2.051379050 # oxygen
+ - 6.154137219 # oxygen
temperature: 293.15
- type: entity
@@ -46,14 +46,14 @@
parent: EmergencyOxygenTank
suffix: Filled
components:
- - type: GasTank
- outputPressure: 21.3
- air:
- # 4 minutes
- volume: 0.66
- moles:
- - 0.270782035 # oxygen
- temperature: 293.15
+ - type: GasTank
+ outputPressure: 21.3
+ air:
+ # 13 minutes
+ volume: 2
+ moles:
+ - 0.820551629 # oxygen
+ temperature: 293.15
- type: entity
id: EmergencyNitrogenTankFilled
@@ -76,14 +76,14 @@
parent: ExtendedEmergencyOxygenTank
suffix: Filled
components:
- - type: GasTank
- outputPressure: 21.3
- air:
- # 9 minutes
- volume: 1.5
- moles:
- - 0.615413715 # oxygen
- temperature: 293.15
+ - type: GasTank
+ outputPressure: 21.3
+ air:
+ # 38 minutes
+ volume: 6
+ moles:
+ - 2.461654887 # oxygen
+ temperature: 293.15
- type: entity
id: ExtendedEmergencyNitrogenTankFilled
@@ -106,14 +106,14 @@
parent: DoubleEmergencyOxygenTank
suffix: Filled
components:
- - type: GasTank
- outputPressure: 21.3
- air:
- # 15 minutes
- volume: 2.5
- moles:
- - 1.025689525 # oxygen
- temperature: 293.15
+ - type: GasTank
+ outputPressure: 21.3
+ air:
+ # 63 minutes
+ volume: 10
+ moles:
+ - 4.102758145 # oxygen
+ temperature: 293.15
- type: entity
id: DoubleEmergencyNitrogenTankFilled
@@ -157,16 +157,16 @@
parent: AirTank
suffix: Filled
components:
- - type: GasTank
- outputPressure: 101.3
- air:
- # 6 minutes due to output pressure
- volume: 5
- moles:
- - 0.451303391 # 22% oxygen
- - 1.600075659 # 78% nitrogen
- # 2.051379050 total
- temperature: 293.15
+ - type: GasTank
+ outputPressure: 101.3
+ air:
+ # 20 minutes due to output pressure
+ volume: 15
+ moles:
+ - 1.353910188 # 22% oxygen
+ - 4.800227031 # 78% nitrogen
+ # 6.154137219 total
+ temperature: 293.15
- type: entity
id: NitrogenTankFilled
@@ -174,14 +174,15 @@
suffix: Filled
name: nitrogen tank
components:
- - type: GasTank
- air:
- # 31 minutes
- volume: 5
- moles:
- - 0 # oxygen not included
- - 2.051379050 # nitrogen
- temperature: 293.15
+ - type: GasTank
+ outputPressure: 21.3
+ air:
+ # 94 minutes
+ volume: 15
+ moles:
+ - 0 # oxygen not included
+ - 6.154137219 # nitrogen
+ temperature: 293.15
- type: entity
id: NitrousOxideTankFilled
@@ -189,27 +190,27 @@
suffix: Filled
name: nitrous oxide tank
components:
- - type: GasTank
- # 0.21 | % oxygen in normal atmosphere
- # / 0.7 | % oxygen in this mixture
- # * 101.325 | one atmosphere
- # __________
- # 30.3975 optimal output pressure
- outputPressure: 30.4
- air:
- # only 22 minutes due to pressure
- volume: 5
- moles:
- - 1.435965335 # 70% oxygen
- - 0 # nitrogen
- - 0 # CO2
- - 0 # plasma
- - 0 # tritium
- - 0 # water vapor
- - 0 # ammonia
- - 0.615413715 # 30% N2O
- # 2.051379050 total
- temperature: 293.15
+ - type: GasTank
+ # 0.21 | % oxygen in normal atmosphere
+ # / 0.7 | % oxygen in this mixture
+ # * 101.325 | one atmosphere
+ # __________
+ # 30.3975 optimal output pressure
+ outputPressure: 30.4
+ air:
+ # only 66 minutes due to pressure
+ volume: 15
+ moles:
+ - 4.30789605 # 70% oxygen
+ - 0 # nitrogen
+ - 0 # CO2
+ - 0 # plasma
+ - 0 # tritium
+ - 0 # water vapor
+ - 0 # ammonia
+ - 1.84624116 # 30% N2O
+ # 6.15413721 total
+ temperature: 293.15
- type: entity
id: PlasmaTankFilled
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index c5f22f8f82..72234c63b9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -22,12 +22,6 @@
- key: enum.SharedGasTankUiKey.Key
type: GasTankBoundUserInterface
- type: GasTank
- outputPressure: 21.3
- air:
- # If gas tank volume is changed, adjust MinimumTritiumOxyburnEnergy in Atmospherics.cs by the same proportions
- volume: 5
- temperature: 293.15
- tankLowPressure: 30.0
- type: Explosive
explosionType: Default
maxIntensity: 20
@@ -63,8 +57,12 @@
sprite: Objects/Tanks/oxygen.rsi
- type: Item
sprite: Objects/Tanks/oxygen.rsi
- - type: Clothing
- sprite: Objects/Tanks/oxygen.rsi
+ - type: GasTank
+ outputPressure: 21.3
+ air:
+ volume: 15
+ temperature: 293.15
+ tankLowPressure: 30.0
- type: entity
parent: OxygenTank
@@ -80,7 +78,7 @@
sprite: Objects/Tanks/yellow.rsi
- type: entity
- parent: GasTankRoundBase
+ parent: OxygenTank
id: NitrogenTank
name: nitrogen tank
description: A standard cylindrical gas tank for nitrogen.
@@ -93,7 +91,7 @@
sprite: Objects/Tanks/red.rsi
- type: entity
- parent: GasTankRoundBase
+ parent: OxygenTank
id: EmergencyOxygenTank
name: emergency oxygen tank
description: An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only.
@@ -105,7 +103,7 @@
sprite: Objects/Tanks/emergency.rsi
- type: GasTank
air:
- volume: 0.66
+ volume: 2
temperature: 293.15
- type: Clothing
sprite: Objects/Tanks/emergency.rsi
@@ -146,7 +144,7 @@
sprite: Objects/Tanks/emergency_extended.rsi
- type: GasTank
air:
- volume: 1.5
+ volume: 6
temperature: 293.15
- type: Clothing
sprite: Objects/Tanks/emergency_extended.rsi
@@ -176,7 +174,7 @@
sprite: Objects/Tanks/emergency_double.rsi
- type: GasTank
air:
- volume: 2.5
+ volume: 10
temperature: 293.15
- type: Clothing
sprite: Objects/Tanks/emergency_double.rsi
@@ -220,6 +218,9 @@
components:
- type: GasTank
outputPressure: 101.3
+ air:
+ volume: 15
+ temperature: 293.15
- type: entity
parent: GasTankRoundBase
@@ -233,6 +234,9 @@
sprite: Objects/Tanks/anesthetic.rsi
- type: GasTank
outputPressure: 30.4
+ air:
+ volume: 15
+ temperature: 293.15
- type: Clothing
sprite: Objects/Tanks/anesthetic.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index f40f47115b..5e6de0aebf 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -48,12 +48,11 @@
slots:
- Back
- type: GasTank
- outputPressure: 21.3
+ outputPressure: 21.27825
air:
- volume: 5
+ volume: 70
temperature: 293.15
- type: Jetpack
- moleUsage: 0.00085
- type: Appearance
- type: StaticPrice
price: 100
@@ -98,12 +97,11 @@
- type: GasTank
outputPressure: 42.6
air:
- # 13 minutes of thrust
- volume: 5
+ volume: 70
temperature: 293.15
moles:
- - 1.025689525 # oxygen
- - 1.025689525 # nitrogen
+ - 11.315
+ - 11.315
#Empty black
- type: entity
@@ -131,12 +129,11 @@
- type: GasTank
outputPressure: 42.6
air:
- # 13 minutes of thrust
- volume: 5
+ volume: 70
temperature: 293.15
moles:
- - 1.025689525 # oxygen
- - 1.025689525 # nitrogen
+ - 11.315
+ - 11.315
#Empty captain
- type: entity
@@ -171,12 +168,11 @@
- type: GasTank
outputPressure: 42.6
air:
- # 13 minutes of thrust
- volume: 5
+ volume: 70
temperature: 293.15
moles:
- - 1.025689525 # oxygen
- - 1.025689525 # nitrogen
+ - 11.315
+ - 11.315
#Empty mini
- type: entity
@@ -198,7 +194,7 @@
- type: GasTank
outputPressure: 42.6
air:
- volume: 1.5
+ volume: 20
# Filled mini
- type: entity
@@ -210,12 +206,11 @@
- type: GasTank
outputPressure: 42.6
air:
- # 4 minutes of thrust
- volume: 1.5
temperature: 293.15
+ volume: 20
moles:
- - 0.307706858 # oxygen
- - 0.307706858 # nitrogen
+ - 0.747
+ - 0.747
#Empty security
- type: entity
@@ -243,12 +238,11 @@
- type: GasTank
outputPressure: 42.6
air:
- # 13 minutes thrust
- volume: 5
+ volume: 70
temperature: 293.15
moles:
- - 1.025689525 # oxygen
- - 1.025689525 # nitrogen
+ - 11.315
+ - 11.315
#Empty void
- type: entity
@@ -278,9 +272,8 @@
- type: GasTank
outputPressure: 42.6
air:
- # 13 minutes of thrust
- volume: 5
+ volume: 70
temperature: 293.15
moles:
- - 1.025689525 # oxygen
- - 1.025689525 # nitrogen
+ - 11.315
+ - 11.315