From 96ecf736b7ecbcb3cef53307748ae2ecee0c6504 Mon Sep 17 00:00:00 2001 From: ivanmixo Date: Thu, 28 Sep 2023 22:34:28 +0200 Subject: [PATCH] Admin proccall followup fix PR port (#14037) --- code/modules/admin/callproc.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/callproc.dm b/code/modules/admin/callproc.dm index 5b074744b884e..d17d109c55395 100644 --- a/code/modules/admin/callproc.dm +++ b/code/modules/admin/callproc.dm @@ -25,8 +25,9 @@ GLOBAL_PROTECT(AdminProcCallHandler) /mob/proccall_handler/Initialize(mapload) . = ..() - if(GLOB.AdminProcCallHandler) + if(GLOB.AdminProcCallHandler && GLOB.AdminProcCallHandler != src) return INITIALIZE_HINT_QDEL + GLOB.AdminProcCallHandler = src /mob/proccall_handler/vv_edit_var(var_name, var_value) if(GLOB.AdminProcCallHandler != src) @@ -43,9 +44,7 @@ GLOBAL_PROTECT(AdminProcCallHandler) if(GLOB.AdminProcCallHandler != src) return ..() if(!force) - #ifndef UNIT_TESTS stack_trace("Attempted deletion on [type] - [name], aborting.") - #endif return QDEL_HINT_LETMELIVE return ..()