From 170c0e1b6ba4f1f2efbcaa97b5441515200b97aa Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Fri, 15 Aug 2014 20:24:49 -0600
Subject: [PATCH] Removed Events from Admin Secrets menu. Trigger Event verb
 moved to Fun tab.

-No more need to maintain a list of events to trigger
-No more needing to use debug-verbs to trigger all events
---
 code/modules/admin/admin.dm          | 26 +-------------------------
 code/modules/admin/admin_verbs.dm    |  3 ++-
 code/modules/admin/verbs/mapping.dm  |  1 -
 code/modules/events/event_manager.dm |  7 ++++---
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d1363c55f80..999ece2b788 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -430,32 +430,8 @@ var/global/floorIsLava = 0
 			<BR>
 			"}
 
-	if(check_rights(R_FUN,0))//TODO: Make all this hardcoded random event panel stuff its own proc so we can actually remove poor events without making the code stop compiling
+	if(check_rights(R_FUN,0))
 		dat += {"
-			<B>'Random' Events</B><BR>
-			<BR>
-			<A href='?src=\ref[src];secretsfun=wave'>Spawn a wave of meteors (aka lagocolyptic shower)</A><BR>
-			<A href='?src=\ref[src];secretsfun=blackhole'>Spawn a vortex anomaly</A><BR>
-			<A href='?src=\ref[src];secretsfun=gravanomalies'>Spawn a gravitational anomaly</A><BR>
-			<A href='?src=\ref[src];secretsfun=pyroanomalies'>Spawn a pyroclastic anomaly</A><BR>
-			<A href='?src=\ref[src];secretsfun=energeticflux'>Spawn a flux wave anomaly</A><BR>
-			<A href='?src=\ref[src];secretsfun=bluespaceanomaly'>Spawn a bluespace anomaly</A><BR>
-			<A href='?src=\ref[src];secretsfun=timeanomalies'>Spawn wormholes</A><BR>
-			<A href='?src=\ref[src];secretsfun=goblob'>Spawn blob</A><BR>
-			<A href='?src=\ref[src];secretsfun=aliens'>Trigger an Alien infestation</A><BR>
-			<A href='?src=\ref[src];secretsfun=alien_silent'>Spawn an Alien silently</A><BR>
-			<A href='?src=\ref[src];secretsfun=spiders'>Trigger a Spider infestation</A><BR>
-			<A href='?src=\ref[src];secretsfun=spaceninja'>Send in a space ninja</A><BR>
-			<A href='?src=\ref[src];secretsfun=carp'>Trigger an Carp migration</A><BR>
-			<A href='?src=\ref[src];secretsfun=radiation'>Irradiate the station</A><BR>
-			<A href='?src=\ref[src];secretsfun=prison_break'>Trigger a Prison Break</A><BR>
-			<A href='?src=\ref[src];secretsfun=virus'>Trigger a Virus Outbreak</A><BR>
-			<A href='?src=\ref[src];secretsfun=immovable'>Spawn an Immovable Rod</A><BR>
-			<A href='?src=\ref[src];secretsfun=lightsout'>Toggle a "lights out" event</A><BR>
-			<A href='?src=\ref[src];secretsfun=ionstorm'>Spawn an Ion Storm</A><BR>
-			<A href='?src=\ref[src];secretsfun=spacevines'>Spawn Space-Vines</A><BR>
-			<A href='?src=\ref[src];secretsfun=comms_blackout'>Trigger a communication blackout</A><BR>
-			<BR>
 			<B>Fun Secrets</B><BR>
 			<BR>
 			<A href='?src=\ref[src];secretsfun=monkey'>Turn all humans into monkeys</A><BR>
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index c13e1ac79d4..b47e41b4d1c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -81,7 +81,8 @@ var/list/admin_verbs_fun = list(
 	/client/proc/cmd_admin_add_random_ai_law,
 	/client/proc/make_sound,
 	/client/proc/toggle_random_events,
-	/client/proc/set_ooc
+	/client/proc/set_ooc,
+	/client/proc/forceEvent
 	)
 var/list/admin_verbs_spawn = list(
 	/datum/admins/proc/spawn_atom,		/*allows us to spawn instances*/
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index a567d4eaec6..efe38fa2172 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -140,7 +140,6 @@ var/intercom_range_display_status = 0
 	src.verbs += /datum/admins/proc/show_traitor_panel
 	src.verbs += /client/proc/print_jobban_old
 	src.verbs += /client/proc/print_jobban_old_filter
-	src.verbs += /client/proc/forceEvent
 	src.verbs += /client/proc/kill_pipe_processing
 	src.verbs += /client/proc/kill_air_processing
 	src.verbs += /client/proc/disable_communication
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index b41e08d2d0c..2775524fce3 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -111,15 +111,16 @@ var/datum/controller/event/events
 
 //allows a client to trigger an event (For Debugging Purposes)
 /client/proc/forceEvent(var/datum/round_event_control/E in events.control)
-	set name = "Trigger Event (Debug Only)"
-	set category = "Debug"
+	set name = "Trigger Event"
+	set category = "Fun"
 
-	if(!holder)
+	if(!holder ||!check_rights(R_FUN))
 		return
 
 	if(istype(E))
 		E.runEvent()
 		message_admins("[key_name_admin(usr)] has triggered an event. ([E.name])", 1)
+		log_admin("[key_name(usr)] has triggered an event. ([E.name])")
 
 
 /*