cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

atmos: fix everlasting fires

Browse Source 
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/ZAS/Fire.dm
	code/modules/reagents/Chemistry-Reagents.dm
This commit is contained in:
Mloc-Argent
2014-06-22 10:54:19 -04:00
committed by ZomgPonies
parent 55df84eb35
commit 8a5079d006
3 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+11 -11
View File
@@ -1473,19 +1473,19 @@ datum
if (egg.grown)
egg.Hatch()*/
if((!O) || (!volume)) return 0
// var/turf/the_turf = get_turf(O)
// var/datum/gas_mixture/napalm = new
// var/datum/gas/volatile_fuel/fuel = new
// fuel.moles = 5
// napalm.trace_gases += fuel
// the_turf.assume_air(napalm)
var/turf/the_turf = get_turf(O)
var/datum/gas_mixture/napalm = new
var/datum/gas/volatile_fuel/fuel = new
fuel.moles = volume
napalm.trace_gases += fuel
the_turf.assume_air(napalm)
reaction_turf(var/turf/T, var/volume)
src = null
// var/datum/gas_mixture/napalm = new
// var/datum/gas/volatile_fuel/fuel = new
// fuel.moles = 5
// napalm.trace_gases += fuel
// T.assume_air(napalm)
var/datum/gas_mixture/napalm = new
var/datum/gas/volatile_fuel/fuel = new
fuel.moles = volume
napalm.trace_gases += fuel
T.assume_air(napalm)
return
reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel!
if(!istype(M, /mob/living))
code/modules/reagents/Chemistry-Recipes.dm
+7 -7
View File
@@ -421,15 +421,15 @@ datum
var/turf/location = get_turf(holder.my_atom.loc)
for(var/turf/simulated/floor/target_tile in range(0,location))
// var/datum/gas_mixture/napalm = new
// var/datum/gas/volatile_fuel/fuel = new
// fuel.moles = created_volume
// napalm.trace_gases += fuel
var/datum/gas_mixture/napalm = new
var/datum/gas/volatile_fuel/fuel = new
fuel.moles = created_volume
napalm.trace_gases += fuel
// napalm.temperature = 400+T0C
// napalm.update_values()
napalm.temperature = 400+T0C
napalm.update_values()
// target_tile.assume_air(napalm)
target_tile.assume_air(napalm)
spawn (0) target_tile.hotspot_expose(700, 400)
holder.del_reagent("napalm")
return