Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

code/modules/admin/admin.dm

@@ -910,7 +910,7 @@ proc/admin_notice(var/message, var/rights)
 			for(var/datum/antagonist/antag in ticker.mode.antag_templates)
 				if(antag.is_antagonist(M))
 					return 2
-		else if(M.special_role)
+		if(M.special_role)
 			return 1
 
 	if(isrobot(character))

code/modules/admin/verbs/adminhelp.dm

@@ -17,9 +17,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 
 	adminhelped = 1 //Determines if they get the message to reply by clicking the name.
 
-	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
-		return
-
 	//clean the input msg
 	if(!msg)
 		return

code/modules/admin/verbs/adminpm.dm

@@ -56,9 +56,6 @@
 			else		src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
 			return
 
-	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
-		return
-
 	//clean the message if it's not sent by a high-rank admin
 	//todo: sanitize for all???
 	if(!check_rights(R_SERVER|R_DEBUG,0))

code/modules/admin/verbs/deadsay.dm

@@ -15,9 +15,6 @@
 		src << "<span class='warning'>You have deadchat muted.</span>"
 		return
 
-	if (src.handle_spam_prevention(msg,MUTE_DEADCHAT))
-		return
-
 	var/stafftype = uppertext(holder.rank)
 
 	msg = sanitize(msg)

code/modules/admin/verbs/pray.dm

@@ -13,8 +13,6 @@
 		if(usr.client.prefs.muted & MUTE_PRAY)
 			usr << "\red You cannot pray (muted)."
 			return
-		if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
-			return
 
 	var/image/cross = image('icons/obj/storage.dmi',"bible")
 	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>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"