Merge branch 'master' into upstream-merge-27344

2017-05-20 23:26:28 -05:00
parent a430e24555 64192be7a5
commit 45ba084c6a
95 changed files with 3681 additions and 1609 deletions
@@ -108,7 +108,11 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		return call(target, procname)(arglist(arguments))

 /proc/IsAdminAdvancedProcCall()
+#ifdef TESTING
+	return FALSE
+#else
 	return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey
+#endif

 /client/proc/callproc_datum(datum/A as null|area|mob|obj|turf)
 	set category = "Debug"