Merge branch 'master' of git://github.com/Baystation12/Baystation12

Conflicts:
	code/game/vote.dm

Because I did it derpily.

code/modules/admin/admin_verbs.dm

@@ -226,7 +226,7 @@
 			verbs += /client/proc/cmd_admin_create_centcom_report
 			verbs += /client/proc/toggle_hear_deadcast
 			verbs += /client/proc/toggle_hear_radio
-
+			verbs += /client/proc/cmd_admin_change_custom_event
 
 		if (holder.level >= 0)//Mod********************************************************************
 			verbs += /obj/admins/proc/toggleAI				//Toggle the AI
@@ -392,6 +392,7 @@
 	verbs -= /client/proc/toggle_hear_deadcast
 	verbs -= /client/proc/toggle_hear_radio
 	verbs -= /client/proc/tension_report
+	verbs -= /client/proc/cmd_admin_change_custom_event
 	return
 
 

code/modules/admin/verbs/custom_event.dm

@@ -0,0 +1,35 @@
+// verb for admins to set custom event
+/client/proc/cmd_admin_change_custom_event()
+	set category = "Fun"
+	set name = "Change Custom Event"
+
+	if(!authenticated || !holder)
+		src << "Only administrators may use this command."
+		return
+
+	var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null
+	if(!input || input == "")
+		custom_event_msg = null
+		return
+
+	custom_event_msg = input
+
+	world << "<h1 class='alert'>Custom Event</h1>"
+	world << "<h2 class='alert'>A custom event is starting. OOC Info:</h2>"
+	world << "<span class='alert'>[html_encode(custom_event_msg)]</span>"
+	world << "<br>"
+
+// normal verb for players to view info
+/client/verb/cmd_view_custom_event()
+	set category = "OOC"
+	set name = "Custom Event Info"
+
+	if(!custom_event_msg || custom_event_msg == "")
+		src << "There currently is no known custom event taking place."
+		src << "Keep in mind: it is possible that an admin has not properly set this."
+		return
+
+	src << "<h1 class='alert'>Custom Event</h1>"
+	src << "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>"
+	src << "<span class='alert'>[html_encode(custom_event_msg)]</span>"
+	src << "<br>"