Switched verbs around, removed Fun tab, new Event tab for event coordinators

code/modules/admin/verbs/adminpm.dm

@@ -198,7 +198,7 @@
 		if(X.key!=key && X.key!=C.key)
 			switch(type)
 				if("Question")
-					if(X.holder.rights & (R_MOD|R_MENTOR))
+					if(X.holder.rights & R_MOD)
 						X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //inform X
 					else if(!modholders.len && X.holder.rights & R_ADMIN)
 						X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //inform X
@@ -211,7 +211,7 @@
 					else if(!debugholders.len && X.holder.rights & R_ADMIN)
 						X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //inform X
 				else
-					if((X.holder.rights & R_ADMIN) || (X.holder.rights & (R_MOD|R_MENTOR)) )
+					if((X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD) )
 						X << "<B><font color='blue'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]:</B> \blue [msg]</font>" //inform X
 
 /client/proc/cmd_admin_irc_pm()

code/modules/admin/verbs/adminsay.dm

@@ -24,7 +24,7 @@
 	set name = "Msay"
 	set hidden = 1
 
-	if(!check_rights(R_ADMIN|R_MOD|R_MENTOR))	return
+	if(!check_rights(R_ADMIN|R_MOD))	return
 
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	log_admin("MOD: [key_name(src)] : [msg]")
@@ -39,5 +39,5 @@
 	if(config.mods_are_mentors)
 		channel = "MENTOR:"
 	for(var/client/C in admins)
-		if((R_ADMIN|R_MOD|R_MENTOR) & C.holder.rights)
+		if((R_ADMIN|R_MOD) & C.holder.rights)
 			C << "<span class='[color]'><span class='prefix'>[channel]</span> <EM>[key_name(src,1)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"

code/modules/admin/verbs/cinematic.dm

@@ -1,6 +1,6 @@
 /client/proc/cinematic(var/cinematic as anything in list("explosion",null))
 	set name = "cinematic"
-	set category = "Fun"
+	set category = "Event"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
 	set hidden = 1
 	if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return

code/modules/admin/verbs/custom_event.dm

@@ -1,6 +1,6 @@
 // verb for admins to set custom event
 /client/proc/cmd_admin_change_custom_event()
-	set category = "Fun"
+	set category = "OOC"
 	set name = "Change Custom Event"
 
 	if(!holder)

code/modules/admin/verbs/deadsay.dm

@@ -22,11 +22,9 @@
 	var/stafftype = null
 
 	if(src.holder.rights & R_MOD && !(src.holder.rights & R_ADMIN))
-		stafftype = "MOD"
-
-	if (src.holder.rights & R_MENTOR)
 		stafftype = "MENTOR"
 
+
 	if (src.holder.rights & R_ADMIN)
 		stafftype = "ADMIN"
 

code/modules/admin/verbs/debug.dm

@@ -151,7 +151,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_robotize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Robot"
 
 	if(!ticker)
@@ -166,7 +166,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_animalize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Simple Animal"
 
 	if(!ticker)
@@ -187,7 +187,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 
 /client/proc/makepAI(var/turf/T in mob_list)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make pAI"
 	set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI"
 
@@ -214,7 +214,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_alienize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Alien"
 
 	if(!ticker)
@@ -231,7 +231,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_slimeize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make slime"
 
 	if(!ticker)
@@ -249,7 +249,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 /*
 /client/proc/cmd_admin_monkeyize(var/mob/M in world)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Monkey"
 
 	if(!ticker)
@@ -264,7 +264,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_changelinginize(var/mob/M in world)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Changeling"
 
 	if(!ticker)
@@ -299,7 +299,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 */
 /*
 /client/proc/make_cultist(var/mob/M in world) // -- TLE, modified by Urist
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Cultist"
 	set desc = "Makes target a cultist"
 	if(!cultwords["travel"])
@@ -525,7 +525,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		world << "* [areatype]"
 
 /client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Select equipment"
 	if(!ishuman(M))
 		alert("Invalid mob")
@@ -1089,7 +1089,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		alert("Invalid mob")
 
 /client/proc/gib_money()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Dispense Money"
 	set desc = "Honk"
 

code/modules/admin/verbs/playsound.dm

@@ -1,5 +1,5 @@
 /client/proc/play_sound(S as sound)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Play Global Sound"
 	if(!check_rights(R_SOUNDS))	return
 
@@ -16,7 +16,7 @@
 
 
 /client/proc/play_local_sound(S as sound)
-	set category = "Fun"
+	set category = "Event"
 	set name = "Play Local Sound"
 	if(!check_rights(R_SOUNDS))	return
 
@@ -28,7 +28,7 @@
 
 /*
 /client/proc/cuban_pete()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Cuban Pete Time"
 
 	message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1)
@@ -44,7 +44,7 @@
 
 
 /client/proc/bananaphone()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Banana Phone"
 
 	message_admins("[key_name_admin(usr)] has activated Banana Phone!", 1)
@@ -55,7 +55,7 @@
 
 
 client/proc/space_asshole()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Space Asshole"
 
 	message_admins("[key_name_admin(usr)] has played the Space Asshole Hymn.", 1)
@@ -66,7 +66,7 @@ client/proc/space_asshole()
 
 
 client/proc/honk_theme()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Honk"
 
 	message_admins("[key_name_admin(usr)] has creeped everyone out with Blackest Honks.", 1)

code/modules/admin/verbs/randomverbs.dm

@@ -73,7 +73,7 @@
 
 	var/age = alert(src, "Age check", "Show accounts yonger then _____ days","7", "30" , "All")
 
-	if(age == "All") 
+	if(age == "All")
 		age = 9999999
 	else
 		age = text2num(age)
@@ -86,7 +86,7 @@
 			continue
 		if(C.player_age < age)
 			msg += "[key_name_admin(C)]: account is [C.player_age] days old<br>"
-	
+
 	if(missing_ages)
 		src << "Some accounts did not have proper ages set in their clients.  This function requires database to be present"
 
@@ -202,7 +202,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
 
 
 /client/proc/cmd_admin_add_random_ai_law()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Add Random AI Law"
 	if(!holder)
 		src << "Only administrators may use this command."
@@ -624,7 +624,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1)
 
 /client/proc/cmd_admin_add_freeform_ai_law()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Add Custom AI law"
 	if(!holder)
 		src << "Only administrators may use this command."
@@ -730,7 +730,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Special Verbs"
 	set name = "Explosion"
 
-	if(!check_rights(R_DEBUG|R_FUN))	return
+	if(!check_rights(R_DEBUG|R_EVENT))	return
 
 	var/devastation = input("Range of total devastation. -1 to none", text("Input"))  as num|null
 	if(devastation == null) return
@@ -758,7 +758,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Special Verbs"
 	set name = "EM Pulse"
 
-	if(!check_rights(R_DEBUG|R_FUN))	return
+	if(!check_rights(R_DEBUG|R_EVENT))	return
 
 	var/heavy = input("Range of heavy pulse.", text("Input"))  as num|null
 	if(heavy == null) return
@@ -780,7 +780,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Special Verbs"
 	set name = "Gib"
 
-	if(!check_rights(R_ADMIN|R_FUN))	return
+	if(!check_rights(R_ADMIN|R_EVENT))	return
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
@@ -799,7 +799,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/cmd_admin_gib_self()
 	set name = "Gibself"
-	set category = "Fun"
+	set category = "Event"
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm == "Yes")
@@ -999,11 +999,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 
 /client/proc/everyone_random()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Make Everyone Random"
 	set desc = "Make everyone have a random appearance. You can only use this before rounds!"
 
-	if(!check_rights(R_FUN))	return
+	if(!check_rights(R_SERVER|R_EVENT))	return
 
 	if (ticker && ticker.mode)
 		usr << "Nope you can't do this, the game's already started. This only works before rounds!"

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -3,7 +3,7 @@
 var/const/syndicate_commandos_possible = 6 //if more Commandos are needed in the future
 var/global/sent_syndicate_strike_team = 0
 /client/proc/syndicate_strike_team()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Spawn Syndicate Strike Team"
 	set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event."
 	if(!src.holder)

code/modules/admin/verbs/tripAI.dm

@@ -1,5 +1,5 @@
 /client/proc/triple_ai()
-	set category = "Fun"
+	set category = "Event"
 	set name = "Create AI Triumvirate"
 
 	if(ticker.current_state > GAME_STATE_PREGAME)