From da832d269abe0acd72cdd4e8bf0447248f0f2b74 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 27 Oct 2022 15:43:17 -0400 Subject: [PATCH] fixes runtime when building things with proxy sensors that get deleted in the process (#70786) proximity_monitor.set_host() was being called after being deleted (qdel -> movetonullspace -> dropped()) --- code/modules/assembly/proximity.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 210cc4ec0e3..b90384f901f 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -21,7 +21,8 @@ /obj/item/assembly/prox_sensor/Destroy() STOP_PROCESSING(SSobj, src) - . = ..() + QDEL_NULL(proximity_monitor) + return ..() /obj/item/assembly/prox_sensor/examine(mob/user) . = ..() @@ -44,7 +45,7 @@ // assembly holder's attached object // assembly holder itself // us - proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src) + proximity_monitor?.set_host(connected?.holder || holder?.master || holder || src, src) /obj/item/assembly/prox_sensor/on_attach() . = ..()