From ea200eaa98c18977ab795e03351325f8a121f6de Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 3 Feb 2017 12:09:03 -0500 Subject: [PATCH] Fixes hotspots runtiming when Destroyed in a wall --- code/modules/atmospherics/environmental/LINDA_fire.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index e796d3cf64a..4c52f127f52 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -149,15 +149,13 @@ /obj/effect/hotspot/Destroy() SetLuminosity(0) SSair.hotspots -= src - if(isturf(loc)) - var/turf/open/T = loc - if(T.active_hotspot == src) - T.active_hotspot = null + var/turf/open/T = loc + if(istype(T) && T.active_hotspot == src) + T.active_hotspot = null DestroyTurf() loc = null . = ..() - /obj/effect/hotspot/proc/DestroyTurf() if(isturf(loc)) var/turf/T = loc