Fixes FEA temperature_expose() being used...

...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
@@ -227,7 +227,7 @@ Alien plants should do something if theres a lot of poison
del(src)
/obj/effect/alien/flesh/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/effect/alien/flesh/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
health -= 5
healthcheck()