From fb65835fa4fcd6346e66ecf733cc05088465ca8e Mon Sep 17 00:00:00 2001
From: Ty-Omaha <Ty-Omaha@users.noreply.github.com>
Date: Fri, 20 Sep 2019 21:14:06 -0400
Subject: [PATCH] Removes custom admin event info verbs (#12355)

---
 code/modules/admin/admin_verbs.dm        |  2 --
 code/modules/admin/verbs/custom_event.dm | 46 ------------------------
 code/modules/client/client procs.dm      |  2 --
 3 files changed, 50 deletions(-)

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 199d4cf276a..dd8fd145973 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -110,8 +110,6 @@ var/list/admin_verbs_event = list(
 	/client/proc/toggle_ert_calling,
 	/client/proc/show_tip,
 	/client/proc/cmd_admin_change_custom_event,
-	/client/proc/cmd_admin_custom_event_info,
-	/client/proc/cmd_view_custom_event_info,
 	/datum/admins/proc/access_news_network,	/*allows access of newscasters*/
 	/client/proc/cmd_admin_direct_narrate,	/*send text directly to a player with no padding. Useful for narratives and fluff-text*/
 	/client/proc/cmd_admin_world_narrate,	/*sends text to all players with no padding*/
diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm
index 10273b529a5..68d3301b11e 100644
--- a/code/modules/admin/verbs/custom_event.dm
+++ b/code/modules/admin/verbs/custom_event.dm
@@ -38,49 +38,3 @@
 	to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
 	to_chat(src, "<span class='alert'>[html_encode(custom_event_msg)]</span>")
 	to_chat(src, "<br>")
-
-//admin event info to be view by admins
-
-/client/proc/cmd_admin_custom_event_info()
-	set category = "Event"
-	set name = "Change Custom Admin Event Info"
-
-	if(!check_rights(R_EVENT))
-		to_chat(src, "Only administrators may use this command.")
-		return
-
-	var/input = input(usr, "Enter the description of the custom event. This is informations for admins only. Use it to notify other admins of event info but not players.", "Custom Event Info", custom_event_msg) as message|null
-	if(!input || input == "")
-		custom_event_admin_msg = null
-		log_admin("[key_name(usr)] has cleared the custom admin event info text.")
-		message_admins("[key_name_admin(usr)] has cleared the custom admin event text.")
-		return
-
-	log_admin("[key_name(usr)] has changed the custom admin event info text.")
-	message_admins("[key_name_admin(usr)] has changed the custom admin event info text.")
-
-	custom_event_admin_msg = input
-
-	for(var/client/X in GLOB.admins)
-		if(check_rights(R_EVENT,0,X.mob))
-			to_chat(X, "<h1 class='alert'>Custom Admin Event Info</h1>")
-			to_chat(X, "<h2 class='alert'>A custom event is starting. OOC Admin Info:</h2>")
-			to_chat(X, "<span class='alert'>[html_encode(custom_event_admin_msg)]</span>")
-			to_chat(X,"<br>")
-
-/client/proc/cmd_view_custom_event_info()
-	set category = "Event"
-	set name = "Custom Event Admin Info"
-
-	if(!check_rights(R_EVENT))
-		to_chat(src, "Only administrators may use this command.")
-		return
-
-	if(!custom_event_admin_msg || custom_event_admin_msg == "")
-		to_chat(src, "There currently is no known custom admin event taking place.")
-		return
-
-	to_chat(src, "<h1 class='alert'>Custom Event Info</h1>")
-	to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
-	to_chat(src, "<span class='alert'>[html_encode(custom_event_admin_msg)]</span>")
-	to_chat(src, "<br>")
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 18891c4959c..6f971d308fa 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -347,8 +347,6 @@
 		on_holder_add()
 		add_admin_verbs()
 		admin_memo_output("Show", 0, 1)
-		if(custom_event_admin_msg && custom_event_admin_msg != "" && check_rights(R_EVENT))
-			cmd_view_custom_event_info()
 
 	// Forcibly enable hardware-accelerated graphics, as we need them for the lighting overlays.
 	// (but turn them off first, since sometimes BYOND doesn't turn them on properly otherwise)