From 75641d922e706930060ef03a45cb70a0ad2d85ef Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 3 Aug 2020 13:02:25 -0700 Subject: [PATCH] this'll probably be better --- code/datums/explosion.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index 1003150945..dc9569a4d5 100644 --- a/code/datums/explosion.dm +++ b/code/datums/explosion.dm @@ -196,10 +196,9 @@ GLOBAL_LIST_EMPTY(explosions) //------- EX_ACT AND TURF FIRES ------- - if((T == epicenter) && !QDELETED(explosion_source) && (get_turf(explosion_source) == T)) // Ensures explosives detonating from bags trigger other explosives in that bag + if((T == epicenter) && !QDELETED(explosion_source) && ismovable(explosion_source) && (get_turf(explosion_source) == T)) // Ensures explosives detonating from bags trigger other explosives in that bag var/list/atoms = list() - var/turf/the_source_turf = get_turf(explosion_source) // yeah this is two get turfs but this should only happen once - for(var/atom/A in the_source_turf) + for(var/atom/A in explosion_source.loc) // the ismovableatom check 2 lines above makes sure we don't nuke an /area atoms += A for(var/i in atoms) var/atom/A = i