Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Reduce gas and jetpack capacity (#18288)"

Browse Source 
This reverts commit 02b06cce39.
This commit is contained in:
Aviu00
2024-01-27 14:36:11 +03:00
parent b58575c2f6
commit 673d3ed3c3
5 changed files with 107 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Atmos/Atmospherics.cs
View File

@@ -207,7 +207,7 @@ namespace Content.Shared.Atmos
/// <summary> /// <summary>
/// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs) /// This is calculated to help prevent singlecap bombs (Overpowered tritium/oxygen single tank bombs)
/// </summary> /// </summary>
public const float MinimumTritiumOxyburnEnergy = 143000f; public const float MinimumTritiumOxyburnEnergy = 430000f;
public const float TritiumBurnOxyFactor = 100f; public const float TritiumBurnOxyFactor = 100f;
public const float TritiumBurnTritFactor = 10f; public const float TritiumBurnTritFactor = 10f;

2
Content.Shared/PneumaticCannon/PneumaticCannonComponent.cs
View File

@@ -30,7 +30,7 @@ public sealed partial class PneumaticCannonComponent : Component
/// </summary> /// </summary>
[DataField("gasUsage")] [DataField("gasUsage")]
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public float GasUsage = 0.142f; public float GasUsage = 2f;
/// <summary> /// <summary>
/// Base projectile speed at default power. /// Base projectile speed at default power.

133
Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
View File

@@ -28,10 +28,10 @@
- type: GasTank - type: GasTank
outputPressure: 21.3 outputPressure: 21.3
air: air:
# 31 minutes # 94 minutes
volume: 5 volume: 15
moles: moles:
- 2.051379050 # oxygen - 6.154137219 # oxygen
temperature: 293.15 temperature: 293.15
- type: entity - type: entity
@@ -46,14 +46,14 @@
parent: EmergencyOxygenTank parent: EmergencyOxygenTank
suffix: Filled suffix: Filled
components: components:
- type: GasTank - type: GasTank
outputPressure: 21.3 outputPressure: 21.3
air: air:
# 4 minutes # 13 minutes
volume: 0.66 volume: 2
moles: moles:
- 0.270782035 # oxygen - 0.820551629 # oxygen
temperature: 293.15 temperature: 293.15
- type: entity - type: entity
id: EmergencyNitrogenTankFilled id: EmergencyNitrogenTankFilled
@@ -76,14 +76,14 @@
parent: ExtendedEmergencyOxygenTank parent: ExtendedEmergencyOxygenTank
suffix: Filled suffix: Filled
components: components:
- type: GasTank - type: GasTank
outputPressure: 21.3 outputPressure: 21.3
air: air:
# 9 minutes # 38 minutes
volume: 1.5 volume: 6
moles: moles:
- 0.615413715 # oxygen - 2.461654887 # oxygen
temperature: 293.15 temperature: 293.15
- type: entity - type: entity
id: ExtendedEmergencyNitrogenTankFilled id: ExtendedEmergencyNitrogenTankFilled
@@ -106,14 +106,14 @@
parent: DoubleEmergencyOxygenTank parent: DoubleEmergencyOxygenTank
suffix: Filled suffix: Filled
components: components:
- type: GasTank - type: GasTank
outputPressure: 21.3 outputPressure: 21.3
air: air:
# 15 minutes # 63 minutes
volume: 2.5 volume: 10
moles: moles:
- 1.025689525 # oxygen - 4.102758145 # oxygen
temperature: 293.15 temperature: 293.15
- type: entity - type: entity
id: DoubleEmergencyNitrogenTankFilled id: DoubleEmergencyNitrogenTankFilled
@@ -157,16 +157,16 @@
parent: AirTank parent: AirTank
suffix: Filled suffix: Filled
components: components:
- type: GasTank - type: GasTank
outputPressure: 101.3 outputPressure: 101.3
air: air:
# 6 minutes due to output pressure # 20 minutes due to output pressure
volume: 5 volume: 15
moles: moles:
- 0.451303391 # 22% oxygen - 1.353910188 # 22% oxygen
- 1.600075659 # 78% nitrogen - 4.800227031 # 78% nitrogen
# 2.051379050 total # 6.154137219 total
temperature: 293.15 temperature: 293.15
- type: entity - type: entity
id: NitrogenTankFilled id: NitrogenTankFilled
@@ -174,14 +174,15 @@
suffix: Filled suffix: Filled
name: nitrogen tank name: nitrogen tank
components: components:
- type: GasTank - type: GasTank
air: outputPressure: 21.3
# 31 minutes air:
volume: 5 # 94 minutes
moles: volume: 15
- 0 # oxygen not included moles:
- 2.051379050 # nitrogen - 0 # oxygen not included
temperature: 293.15 - 6.154137219 # nitrogen
temperature: 293.15
- type: entity - type: entity
id: NitrousOxideTankFilled id: NitrousOxideTankFilled
@@ -189,27 +190,27 @@
suffix: Filled suffix: Filled
name: nitrous oxide tank name: nitrous oxide tank
components: components:
- type: GasTank - type: GasTank
# 0.21 | % oxygen in normal atmosphere # 0.21 | % oxygen in normal atmosphere
# / 0.7 | % oxygen in this mixture # / 0.7 | % oxygen in this mixture
# * 101.325 | one atmosphere # * 101.325 | one atmosphere
# __________ # __________
# 30.3975 optimal output pressure # 30.3975 optimal output pressure
outputPressure: 30.4 outputPressure: 30.4
air: air:
# only 22 minutes due to pressure # only 66 minutes due to pressure
volume: 5 volume: 15
moles: moles:
- 1.435965335 # 70% oxygen - 4.30789605 # 70% oxygen
- 0 # nitrogen - 0 # nitrogen
- 0 # CO2 - 0 # CO2
- 0 # plasma - 0 # plasma
- 0 # tritium - 0 # tritium
- 0 # water vapor - 0 # water vapor
- 0 # ammonia - 0 # ammonia
- 0.615413715 # 30% N2O - 1.84624116 # 30% N2O
# 2.051379050 total # 6.15413721 total
temperature: 293.15 temperature: 293.15
- type: entity - type: entity
id: PlasmaTankFilled id: PlasmaTankFilled

30
Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
View File

@@ -22,12 +22,6 @@
- key: enum.SharedGasTankUiKey.Key - key: enum.SharedGasTankUiKey.Key
type: GasTankBoundUserInterface type: GasTankBoundUserInterface
- type: GasTank - 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 - type: Explosive
explosionType: Default explosionType: Default
maxIntensity: 20 maxIntensity: 20
@@ -63,8 +57,12 @@
sprite: Objects/Tanks/oxygen.rsi sprite: Objects/Tanks/oxygen.rsi
- type: Item - type: Item
sprite: Objects/Tanks/oxygen.rsi sprite: Objects/Tanks/oxygen.rsi
- type: Clothing - type: GasTank
sprite: Objects/Tanks/oxygen.rsi outputPressure: 21.3
air:
volume: 15
temperature: 293.15
tankLowPressure: 30.0
- type: entity - type: entity
parent: OxygenTank parent: OxygenTank
@@ -80,7 +78,7 @@
sprite: Objects/Tanks/yellow.rsi sprite: Objects/Tanks/yellow.rsi
- type: entity - type: entity
parent: GasTankRoundBase parent: OxygenTank
id: NitrogenTank id: NitrogenTank
name: nitrogen tank name: nitrogen tank
description: A standard cylindrical gas tank for nitrogen. description: A standard cylindrical gas tank for nitrogen.
@@ -93,7 +91,7 @@
sprite: Objects/Tanks/red.rsi sprite: Objects/Tanks/red.rsi
- type: entity - type: entity
parent: GasTankRoundBase parent: OxygenTank
id: EmergencyOxygenTank id: EmergencyOxygenTank
name: emergency oxygen tank name: emergency oxygen tank
description: An easily portable tank for emergencies. Contains very little oxygen, rated for survival use only. 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 sprite: Objects/Tanks/emergency.rsi
- type: GasTank - type: GasTank
air: air:
volume: 0.66 volume: 2
temperature: 293.15 temperature: 293.15
- type: Clothing - type: Clothing
sprite: Objects/Tanks/emergency.rsi sprite: Objects/Tanks/emergency.rsi
@@ -146,7 +144,7 @@
sprite: Objects/Tanks/emergency_extended.rsi sprite: Objects/Tanks/emergency_extended.rsi
- type: GasTank - type: GasTank
air: air:
volume: 1.5 volume: 6
temperature: 293.15 temperature: 293.15
- type: Clothing - type: Clothing
sprite: Objects/Tanks/emergency_extended.rsi sprite: Objects/Tanks/emergency_extended.rsi
@@ -176,7 +174,7 @@
sprite: Objects/Tanks/emergency_double.rsi sprite: Objects/Tanks/emergency_double.rsi
- type: GasTank - type: GasTank
air: air:
volume: 2.5 volume: 10
temperature: 293.15 temperature: 293.15
- type: Clothing - type: Clothing
sprite: Objects/Tanks/emergency_double.rsi sprite: Objects/Tanks/emergency_double.rsi
@@ -220,6 +218,9 @@
components: components:
- type: GasTank - type: GasTank
outputPressure: 101.3 outputPressure: 101.3
air:
volume: 15
temperature: 293.15
- type: entity - type: entity
parent: GasTankRoundBase parent: GasTankRoundBase
@@ -233,6 +234,9 @@
sprite: Objects/Tanks/anesthetic.rsi sprite: Objects/Tanks/anesthetic.rsi
- type: GasTank - type: GasTank
outputPressure: 30.4 outputPressure: 30.4
air:
volume: 15
temperature: 293.15
- type: Clothing - type: Clothing
sprite: Objects/Tanks/anesthetic.rsi sprite: Objects/Tanks/anesthetic.rsi

49
Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
View File

@@ -48,12 +48,11 @@
slots: slots:
- Back - Back
- type: GasTank - type: GasTank
outputPressure: 21.3 outputPressure: 21.27825
air: air:
volume: 5 volume: 70
temperature: 293.15 temperature: 293.15
- type: Jetpack - type: Jetpack
moleUsage: 0.00085
- type: Appearance - type: Appearance
- type: StaticPrice - type: StaticPrice
price: 100 price: 100
@@ -98,12 +97,11 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
# 13 minutes of thrust volume: 70
volume: 5
temperature: 293.15 temperature: 293.15
moles: moles:
- 1.025689525 # oxygen - 11.315
- 1.025689525 # nitrogen - 11.315
#Empty black #Empty black
- type: entity - type: entity
@@ -131,12 +129,11 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
# 13 minutes of thrust volume: 70
volume: 5
temperature: 293.15 temperature: 293.15
moles: moles:
- 1.025689525 # oxygen - 11.315
- 1.025689525 # nitrogen - 11.315
#Empty captain #Empty captain
- type: entity - type: entity
@@ -171,12 +168,11 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
# 13 minutes of thrust volume: 70
volume: 5
temperature: 293.15 temperature: 293.15
moles: moles:
- 1.025689525 # oxygen - 11.315
- 1.025689525 # nitrogen - 11.315
#Empty mini #Empty mini
- type: entity - type: entity
@@ -198,7 +194,7 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
volume: 1.5 volume: 20
# Filled mini # Filled mini
- type: entity - type: entity
@@ -210,12 +206,11 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
# 4 minutes of thrust
volume: 1.5
temperature: 293.15 temperature: 293.15
volume: 20
moles: moles:
- 0.307706858 # oxygen - 0.747
- 0.307706858 # nitrogen - 0.747
#Empty security #Empty security
- type: entity - type: entity
@@ -243,12 +238,11 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
# 13 minutes thrust volume: 70
volume: 5
temperature: 293.15 temperature: 293.15
moles: moles:
- 1.025689525 # oxygen - 11.315
- 1.025689525 # nitrogen - 11.315
#Empty void #Empty void
- type: entity - type: entity
@@ -278,9 +272,8 @@
- type: GasTank - type: GasTank
outputPressure: 42.6 outputPressure: 42.6
air: air:
# 13 minutes of thrust volume: 70
volume: 5
temperature: 293.15 temperature: 293.15
moles: moles:
- 1.025689525 # oxygen - 11.315
- 1.025689525 # nitrogen - 11.315