Event Hosts

+Fun has more fun.

code/modules/admin/verbs/adminhelp.dm

@@ -104,6 +104,11 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 			if(X.prefs.toggles & SOUND_ADMINHELP)
 				X << 'sound/effects/adminhelp.ogg'
 			X << msg
+			continue
+		if((R_FUN) & X.holder.rights)
+			if(X.prefs.toggles & SOUND_ADMINHELP)
+				X << 'sound/effects/adminhelp.ogg'
+			X << msg
 
 	//show it to the person adminhelping too
 	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"

code/modules/admin/verbs/adminsay.dm

@@ -22,7 +22,7 @@
 	set name = "Msay"
 	set hidden = 1
 
-	if(!check_rights(R_ADMIN|R_MOD))	return
+	if(!check_rights(R_ADMIN|R_MOD|R_FUN))	return
 
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	log_admin("MOD: [key_name(src)] : [msg]")
@@ -33,7 +33,7 @@
 	if (check_rights(R_ADMIN,0))
 		color = "adminmod"
 	for(var/client/C in admins)
-		if((R_ADMIN|R_MOD) & C.holder.rights)
+		if((R_ADMIN|R_MOD|R_FUN) & C.holder.rights)
 			C << "<span class='[color]'><span class='prefix'>MOD:</span> <EM>[key_name(src,1)]</EM> (<A HREF='?src=\ref[C.holder];adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
 
 /client/proc/cmd_dev_say(msg as text)

code/modules/admin/verbs/deadsay.dm

@@ -22,11 +22,12 @@
 
 	if (src.holder.rights & R_MOD)
 		stafftype = "MOD"
-
 	if (src.holder.rights & R_ADMIN)
 		stafftype = "ADMIN"
 	if (src.holder.rights & R_DEV)
 		stafftype = "DEV" // lol I find it necessary k? <.<
+	if ((src.holder.rights & R_FUN) && !(R_ADMIN & src.holder.rights))
+		stafftype = "EVENT"
 
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	log_admin("[key_name(src)] : [msg]")

code/modules/admin/verbs/debug.dm

@@ -409,7 +409,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set name = "Assume direct control"
 	set desc = "Direct intervention"
 
-	if(!check_rights(R_DEBUG|R_ADMIN|R_DEV))	return
+	if(!check_rights(R_DEBUG|R_ADMIN|R_DEV|R_FUN))	return
 	if(M.ckey)
 		if(alert("This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.",,"Yes","No") != "Yes")
 			return

code/modules/admin/verbs/modifyvariables.dm

@@ -147,7 +147,7 @@ var/list/forbidden_varedit_object_types = list(
 	var/dir
 
 	if(variable in locked)
-		if(!check_rights(R_DEBUG|R_DEV))	return
+		if(!check_rights(R_DEBUG|R_DEV|R_FUN))	return
 
 	if(isnull(variable))
 		usr << "Unable to determine variable type."
@@ -291,7 +291,7 @@ var/list/forbidden_varedit_object_types = list(
 			return
 
 		if(param_var_name == "holder" || (param_var_name in locked))
-			if(!check_rights(R_DEBUG|R_DEV))	return
+			if(!check_rights(R_DEBUG|R_DEV|R_FUN))	return
 
 		variable = param_var_name
 
@@ -349,7 +349,7 @@ var/list/forbidden_varedit_object_types = list(
 		var_value = O.vars[variable]
 
 		if(variable == "holder" || (variable in locked))
-			if(!check_rights(R_DEBUG|R_DEV))	return
+			if(!check_rights(R_DEBUG|R_DEV|R_FUN))	return
 
 	if(!autodetect_class)
 

code/modules/admin/verbs/pray.dm

@@ -20,7 +20,7 @@
 	msg = "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
 
 	for(var/client/C in admins)
-		if(((R_ADMIN & C.holder.rights) || (R_MOD & C.holder.rights)) && (C.prefs.toggles & CHAT_PRAYER))
+		if(((R_ADMIN & C.holder.rights) || (R_MOD & C.holder.rights)) || (R_FUN & C.holder.rights) && (C.prefs.toggles & CHAT_PRAYER))
 			C << msg
 	usr << "Your prayers have been received by the gods."
 
@@ -35,12 +35,12 @@
 	else
 		msg = "\blue <b><font color=orange>CENTCOMM[iamessage ? " IA" : ""]:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)
-		if((R_ADMIN & C.holder.rights) || (R_MOD & C.holder.rights))
+		if((R_ADMIN & C.holder.rights) || (R_MOD & C.holder.rights) || (R_FUN & C.holder.rights))
 			C << msg
 
 /proc/Syndicate_announce(var/text , var/mob/Sender)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
 	msg = "\blue <b><font color=crimson>SYNDICATE:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 	for(var/client/C in admins)
-		if((R_ADMIN & C.holder.rights) || (R_MOD & C.holder.rights))
+		if((R_ADMIN & C.holder.rights) || (R_MOD & C.holder.rights) || (R_FUN & C.holder.rights))
 			C << msg

code/modules/admin/verbs/randomverbs.dm

@@ -992,7 +992,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Toggle random events on/off"
 
 	set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
-	if(!check_rights(R_SERVER))	return
+	if(!check_rights(R_SERVER|R_FUN))	return
 
 	if(!config.allow_random_events)
 		config.allow_random_events = 1