From 68d33c79deb3323c9c36630cea231cd4aeebfea0 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 16 Jun 2018 16:43:48 -0500 Subject: [PATCH] Update admin_verbs.dm --- code/modules/admin/admin_verbs.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 9860aa136c..21642784a3 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -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,