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

Add syndicate headset messages, squashes both together.

Browse Source
This commit is contained in:
Jordan Brown
2018-06-15 13:52:12 -04:00
committed by letterjay
parent 4780f3a20b
commit b4edde2c0a
4 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+8
View File
@@ -34,6 +34,10 @@ 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*/
@@ -183,6 +187,10 @@ 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,