cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 02:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update admin_verbs.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-13 11:40:22 -06:00
committed by GitHub
parent 3c35202b5e
commit 09f2c19f0f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/admin/admin_verbs.dm
View File

@@ -156,13 +156,9 @@ GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug())
/client/proc/toggle_medal_disable, /client/proc/toggle_medal_disable,
/client/proc/view_runtimes, /client/proc/view_runtimes,
/client/proc/pump_random_event, /client/proc/pump_random_event,
<<<<<<< HEAD
/client/proc/cmd_display_init_log
=======
/client/proc/cmd_display_init_log, /client/proc/cmd_display_init_log,
/client/proc/cmd_display_overlay_log, /client/proc/cmd_display_overlay_log,
/datum/admins/proc/create_or_modify_area /datum/admins/proc/create_or_modify_area
>>>>>>> 28e6359... makes blueprints work on station and able to expand old areas (#32280)
) )
GLOBAL_PROTECT(admin_verbs_possess) GLOBAL_PROTECT(admin_verbs_possess)
GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))