From 42d59532b68936f7863b727171f58109bea1ac27 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 26 Oct 2017 15:03:43 -0400 Subject: [PATCH 1/2] 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 980dfd0a596..65ccf2b72ed 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 + admin_log_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]") /proc/IsAdminAdvancedProcCall() #ifdef TESTING From 58602ced749882adfa5dc1fd9502cb4e9773ffe2 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 26 Oct 2017 15:10:57 -0400 Subject: [PATCH 2/2] Fix log call --- code/modules/admin/verbs/debug.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 65ccf2b72ed..ebb200e8e41 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -131,7 +131,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) else if(target != world) return call(target, procname)(arglist(arguments)) else - admin_log_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]") + log_admin_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]") /proc/IsAdminAdvancedProcCall() #ifdef TESTING