From 3bb3f988ee31b8be2502723ab803f27630d0cc07 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 24 Sep 2021 19:21:29 +0200
Subject: [PATCH] [MIRROR] Proccall handler hotfix (#8359)

* Proccall handler hotfix (#61642)

Fixes proccall handlers runtiming because GLOB.AdminProcCallHandler not being set

* Proccall handler hotfix

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
---
 code/modules/admin/callproc/callproc.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 1be57855969..158a9b2d6ee 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -26,8 +26,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)
@@ -49,9 +50,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 ..()