diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 5849d96a158..5817894c752 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -155,9 +155,13 @@ return /obj/structure/morgue/Destroy() - QDEL_NULL(connected) + var/turf/T = src.loc + if(!connected) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(T) return ..() + /obj/structure/morgue/container_resist(var/mob/living/L) var/mob/living/carbon/CM = L if(!istype(CM)) @@ -389,7 +393,10 @@ return /obj/structure/crematorium/Destroy() - QDEL_NULL(connected) + var/turf/T = src.loc + if(!connected) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(T) return ..() /obj/structure/crematorium/container_resist(var/mob/living/L)