shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update admin_verbs.dm

Browse Source
This commit is contained in:
LetterJay
2018-06-16 16:43:48 -05:00
committed by GitHub
parent 7f6f8eb21f
commit 68d33c79de
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,10 +34,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
/client/proc/toggle_view_range, /*changes how far we can see*/
/client/proc/getserverlogs, /*for accessing server logs*/
/client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/
<<<<<<< HEAD
=======
/client/proc/cmd_admin_headset_message, /*send an message to somebody through their headset as CentCom*/
>>>>>>> 78e7c5f... Merge pull request #38482 from DaxDupont/syndicatemess
/client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/
/client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/
/client/proc/check_antagonists, /*shows all antags*/
@@ -187,10 +184,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
/client/proc/admin_ghost,
/client/proc/toggle_view_range,
/client/proc/cmd_admin_subtle_message,
<<<<<<< HEAD
=======
/client/proc/cmd_admin_headset_message,
>>>>>>> 78e7c5f... Merge pull request #38482 from DaxDupont/syndicatemess
/client/proc/cmd_admin_check_contents,
/datum/admins/proc/access_news_network,
/client/proc/admin_call_shuttle,