restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/admin/verbs/adminpm.dm

@@ -37,14 +37,22 @@
 //Fetching a message if needed. src is the sender and C is the target client
 /client/proc/cmd_admin_pm(var/client/C, var/msg)
 	if(prefs.muted & MUTE_ADMINHELP)
-		src << "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>"
+		src << "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>"
 		return
 
 	if(!istype(C,/client))
-		if(holder)	src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
+		if(holder)	src << "<font color='red'>Error: Private-Message: Client not found.</font>"
 		else		adminhelp(msg)	//admin we are replying to left. adminhelp instead
 		return
 
+	if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder)
+		//send a warning to admins, but have a delay popup for mods
+		if(holder.rights & R_ADMIN)
+			src << "\red <b>Simultaneous PMs warning:</b> that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]"
+		else
+			if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel")
+				return
+
 	//get message text, limit it's length.and clean/escape html
 	if(!msg)
 		msg = input(src,"Message:", "Private message to [C.key]") as text|null
@@ -63,6 +71,57 @@
 		msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
 		if(!msg)	return
 
+	var/recieve_color = "purple"
+	var/send_pm_type = ""
+	var/recieve_pm_type = "Player"
+	//usr.client.holder.rights
+
+	if(holder)
+		//mod PMs are maroon
+		//PMs sent from admins and mods display their rank
+		if(holder)
+			if( holder.rights & R_MOD )
+				recieve_color = "maroon"
+			else
+				recieve_color = "red"
+			send_pm_type = holder.rank
+			recieve_pm_type = holder.rank
+
+	else if(!C.holder)
+		src << "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>"
+		return
+
+	var/recieve_message = "<font color='[recieve_color]'>[recieve_pm_type] PM from-<b>[key_name(src, C, 1)]</b>: [msg]</font>"
+
+	if(holder && !C.holder)
+		recieve_message = "<font color='[recieve_color]' size='4'><b>-- Administrator private message --</b></font>\n" + recieve_message
+
+		//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
+		if(config.popup_admin_pm)
+			spawn(0)	//so we don't hold the caller proc up
+				var/sender = src
+				var/sendername = key
+				var/reply = input(C, msg,"Admin PM from-[sendername]", "") as text|null		//show message and await a reply
+				if(C && reply)
+					if(sender)
+						C.cmd_admin_pm(sender,reply)										//sender is still about, let's reply to them
+					else
+						adminhelp(reply)													//sender has left, adminhelp instead
+				return
+
+	C << recieve_message
+	src << "<font color='blue'>[send_pm_type] PM to-<b>[key_name(C, src, 1)]</b>: [msg]</font>"
+
+	if(holder && !C.holder)
+		C.last_pm_recieved = world.time
+		C.ckey_last_pm = ckey
+
+	//play the recieving admin the adminhelp sound (if they have them enabled)
+	//non-admins shouldn't be able to disable this
+	if(C.prefs.toggles & SOUND_ADMINHELP)
+		C << 'sound/effects/adminhelp.ogg'
+
+	/*
 	if(C.holder)
 		if(holder)	//both are admins
 			if(holder.rank == "Moderator") //If moderator
@@ -111,11 +170,13 @@
 		else		//neither are admins
 			src << "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>"
 			return
+	*/
 
 	log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
 
 	//we don't use message_admins here because the sender/receiver might get it too
 	for(var/client/X in admins)
-		if(X.key!=key && X.key!=C.key)	//check client/X is an admin and isn't the sender or recipient
+		//check client/X is an admin and isn't the sender or recipient
+		//only admins can see PMs
+		if(X.key!=key && X.key!=C.key && X.holder.rights & R_ADMIN)
 			X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;[key_name(C, X, 0)]:</B> \blue [msg]</font>" //inform X
-