Cleans Up Rejected Mirror files (#414)
* bang * updates tgstation.dme * fixes missing stylesheet entries * updates the map includes backup map file * removes ten billion runtimes
This commit is contained in:
@@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, AVerbsDefault())
|
||||
/client/proc/reestablish_db_connection,/*reattempt a connection to the database*/
|
||||
/client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
|
||||
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/
|
||||
/client/proc/mentor_memo, /*mentor memo system. show/delete/write. +SERVER needed to delete mentor memos of others*/
|
||||
// /client/proc/mentor_memo, /*mentor memo system. show/delete/write. +SERVER needed to delete mentor memos of others*/
|
||||
/client/proc/stop_sounds
|
||||
)
|
||||
GLOBAL_PROTECT(admin_verbs_admin)
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
diff a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm (rejected hunks)
|
||||
@@ -90,14 +90,16 @@ GLOBAL_PROTECT(AdminProcCall)
|
||||
UNTIL(!GLOB.AdminProcCall)
|
||||
to_chat(usr, "<span class='adminnotice'>Running your proc</span>")
|
||||
GLOB.AdminProcCall = usr.client.ckey //if this runtimes, too bad for you
|
||||
- try
|
||||
- if(target == GLOBAL_PROC)
|
||||
- . = call(procname)(arglist(arguments))
|
||||
- else
|
||||
- . = call(procname)(arglist(arguments))
|
||||
- catch(exception/E)
|
||||
+ world.WrapAdminProcCall(target, procname, arguments)
|
||||
GLOB.AdminProcCall = null
|
||||
|
||||
+//adv proc call this, ya nerds
|
||||
+/world/proc/WrapAdminProcCall(target, procname, list/arguments)
|
||||
+ if(target == GLOBAL_PROC)
|
||||
+ return call(procname)(arglist(arguments))
|
||||
+ else
|
||||
+ return call(procname)(arglist(arguments))
|
||||
+
|
||||
/proc/IsAdminAdvancedProcCall()
|
||||
return usr && usr.client && GLOB.AdminProcCall == usr.client.ckey
|
||||
|
||||
Reference in New Issue
Block a user