From 44c2121818200bdc028b0f9d6dfc5222c0d8c326 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Mon, 8 Jul 2024 04:19:50 -0700 Subject: [PATCH] [MIRROR] Crematoriums shouldn't break when they fail to open. (#8610) Co-authored-by: Cyantime Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/game/objects/structures/morgue.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 5799816aa6..6dcb5da2b8 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -227,8 +227,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) if (!( A.anchored )) A.forceMove(src) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - //src.connected = null - qdel(src.connected) + qdel_null(connected) else if (src.locked == 0) playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) src.connected = new /obj/structure/m_tray/c_tray( src.loc ) @@ -242,8 +241,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium) A.forceMove(src.connected.loc) src.connected.icon_state = "cremat" else - qdel(src.connected) - src.connected = null //CHOMPEdit - Fix morgues breaking for a while with something solid in front of door. + qdel_null(connected) src.add_fingerprint(user) update()