From 60b3384695d62f5bbaba19f984a7173fbd6b1cce Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 21 May 2018 17:27:15 -0400 Subject: [PATCH] Merge pull request #37965 from AnturK/whatthecommentsays Fixes fire_act working on deleted things. --- code/modules/atmospherics/environmental/LINDA_fire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index c58d14f4d4..a3c9c68d55 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -94,7 +94,7 @@ for(var/A in location) var/atom/AT = A - if(AT && AT != src) // It's possible that the item is deleted in temperature_expose + if(!QDELETED(AT) && AT != src) // It's possible that the item is deleted in temperature_expose AT.fire_act(temperature, volume) return