From c48c6b59ff90f7a958dc2b8e807a4cb6d074bbbf Mon Sep 17 00:00:00 2001
From: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com>
Date: Sat, 3 Oct 2020 19:29:33 -0400
Subject: [PATCH] Update morgue.dm

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

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