From 729c3a192335f39728b087eef3e62e3f79db3176 Mon Sep 17 00:00:00 2001
From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com>
Date: Sat, 3 Oct 2020 19:15:25 -0400
Subject: [PATCH] Morgue Destruction Fix

---
 code/game/objects/structures/morgue.dm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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)