cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes FEA temperature_expose() being used...

Browse Source 
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
This commit is contained in:
mwerezak
2014-06-22 00:13:22 -04:00
committed by ZomgPonies
parent f83fa70684
commit b64441cb26
19 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/lighting.dm
+1 -1
View File
@@ -619,7 +619,7 @@
// called when on fire
/obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/machinery/light/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C
broken()
code/modules/reagents/reagent_dispenser.dm
+15 -14
View File
@@ -106,20 +106,6 @@
ex_act()
explode()
temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature >= AUTOIGNITION_WELDERFUEL)
explode()
proc/explode()
if (reagents.total_volume > 500)
explosion(src.loc,1,2,4)
else if (reagents.total_volume > 100)
explosion(src.loc,0,1,3)
else
explosion(src.loc,-1,1,2)
if(src)
del(src)
/obj/structure/reagent_dispensers/fueltank/examine()
set src in view()
@@ -171,6 +157,21 @@
return ..()
/obj/structure/reagent_dispensers/fueltank/proc/explode()
if (reagents.total_volume > 500)
explosion(src.loc,1,2,4)
else if (reagents.total_volume > 100)
explosion(src.loc,0,1,3)
else
explosion(src.loc,-1,1,2)
if(src)
del(src)
/obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
if(temperature > T0C+500)
explode()
return ..()
/obj/structure/reagent_dispensers/fueltank/Move()
..()
if(modded)