Merge pull request #5325 from mwerezak/temperature-expose

Fixes FEA temperature_expose() being used instead of ZAS fire_act().
This commit is contained in:
Zuhayr
2014-06-23 00:19:15 +09:30
21 changed files with 24 additions and 24 deletions

View File

@@ -72,7 +72,7 @@ var/const/MAX_ACTIVE_TIME = 400
Die()
return
/obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/obj/item/clothing/mask/facehugger/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300)
Die()
return