From c00c1dcc00908de12f3978cf342c09868a06faf5 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Sat, 28 Oct 2017 11:33:51 +1300
Subject: [PATCH 1/2] Merge pull request #32127 from
 tgstation/Cyberboss-patch-3

[s] Blocks world proc calls
---
 code/modules/admin/verbs/debug.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 980dfd0a59..ebb200e8e4 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -128,8 +128,10 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 /world/proc/WrapAdminProcCall(target, procname, list/arguments)
 	if(target == GLOBAL_PROC)
 		return call(procname)(arglist(arguments))
-	else
+	else if(target != world)
 		return call(target, procname)(arglist(arguments))
+	else
+		log_admin_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]")
 
 /proc/IsAdminAdvancedProcCall()
 #ifdef TESTING