From 1da7d26b1e9b7ad44f67d7b572581018b7adaff6 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 31 Jul 2016 11:56:42 -0400 Subject: [PATCH] tweaks --- code/controllers/Processes/fires.dm | 2 +- code/modules/reagents/newchem/pyro.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/controllers/Processes/fires.dm b/code/controllers/Processes/fires.dm index ab723221367..4566143a906 100644 --- a/code/controllers/Processes/fires.dm +++ b/code/controllers/Processes/fires.dm @@ -15,7 +15,7 @@ var/global/datum/controller/process/fire/fire_master /datum/controller/process/fire/doWork() for(var/obj/burningobj in burning) - if(burningobj && (burningobj.burn_state == ON_FIRE)) + if(burningobj.burn_state == ON_FIRE) if(burningobj.burn_world_time < world.time) burningobj.burn() SCHECK diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index db96b63c5cc..6dece72544c 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -417,6 +417,10 @@ for(var/turf/simulated/turf in range(min(created_volume/10,4),T)) new /obj/effect/hotspot(turf) +/datum/reagent/phlogiston/reaction_mob(mob/living/M, method=TOUCH, volume) + M.IgniteMob() + ..() + /datum/reagent/phlogiston/on_mob_life(mob/living/M) M.adjust_fire_stacks(1) var/burndmg = max(0.3*M.fire_stacks, 0.3)