diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml index 381bfbfbb3..daca6f2bbe 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml @@ -221,10 +221,10 @@ outputPressure: 101.3 air: # 20 minutes of agony - volume: 15 + volume: 45 moles: - 0 # oxygen - 0 # nitrogen - 0 # CO2 - - 18.74958767 # plasma - temperature: 96.22 + - 18.46241166 # plasma + temperature: 293.15 diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 169e767973..5a3b739355 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -245,11 +245,17 @@ - type: Sprite sprite: Objects/Tanks/plasma.rsi - type: Item + size: 25 sprite: Objects/Tanks/plasma.rsi - type: GasTank outputPressure: 101.3 + air: + volume: 45 + temperature: 293.15 - type: Clothing sprite: Objects/Tanks/plasma.rsi + slots: + - Back - type: Tag tags: - TankPlasma diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml index aee8b1c480..8b9f615314 100644 --- a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml +++ b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml @@ -5,7 +5,7 @@ noSpawn: true components: - type: GasProjectile - gasUsagePerTile: 1.05 + gasUsagePerTile: 0.9375 - type: Projectile damage: types: diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml index 701d96faee..1ca14edf61 100644 --- a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml +++ b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml @@ -28,7 +28,7 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg - type: GasAmmoProvider - gasUsage: 6.25 + gasUsage: 4.6875 proto: ProjectileFlamethrower - type: Flamethrower - type: ItemMapper diff --git a/Resources/Prototypes/White/Recipes/lathe_recipes.yml b/Resources/Prototypes/White/Recipes/lathe_recipes.yml index ad179fa11f..85f5284bf7 100644 --- a/Resources/Prototypes/White/Recipes/lathe_recipes.yml +++ b/Resources/Prototypes/White/Recipes/lathe_recipes.yml @@ -1,13 +1,13 @@ - type: latheRecipe id: OxygenTank result: OxygenTank - completetime: 5 + completetime: 3 materials: - Steel: 1000 + Steel: 500 - type: latheRecipe id: PlasmaTank result: PlasmaTank completetime: 5 materials: - Steel: 1000 + Steel: 1500