Merge pull request #6828 from Citadel-Station-13/upstream-merge-37965

[MIRROR] Fixes fire_act working on deleted things.
2018-05-22 02:28:38 +00:00
parent c150988997 0a4f2f501e
commit ce0dac200b
1 changed files with 1 additions and 1 deletions
@@ -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