Merge branch 'Master' of https://github.com/izac112/YawnWiderStation into Master

code/game/verbs/ooc.dm

@@ -29,6 +29,8 @@
 		if(prefs.muted & MUTE_OOC)
 			src << "<span class='danger'>You cannot use OOC (muted).</span>"
 			return
+		if(handle_spam_prevention(msg,MUTE_OOC))
+			return
 		if(findtext(msg, "byond://"))
 			src << "<B>Advertising other servers is not allowed.</B>"
 			log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
@@ -100,6 +102,8 @@
 		if(prefs.muted & MUTE_OOC)
 			src << "<span class='danger'>You cannot use OOC (muted).</span>"
 			return
+		if(handle_spam_prevention(msg, MUTE_OOC))
+			return
 		if(findtext(msg, "byond://"))
 			src << "<B>Advertising other servers is not allowed.</B>"
 			log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")

code/modules/admin/verbs/adminhelp.dm

@@ -17,6 +17,9 @@ 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,6 +56,9 @@
 			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,6 +15,9 @@
 		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,6 +13,8 @@
 		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]"

code/modules/client/client procs.dm

@@ -74,6 +74,21 @@
 
 	..()	//redirect to hsrc.Topic()
 
+/client/proc/handle_spam_prevention(var/message, var/mute_type)
+	if(config.automute_on && !holder && src.last_message == message)
+		src.last_message_count++
+		if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
+			src << "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied."
+			cmd_admin_mute(src.mob, mute_type, 1)
+			return 1
+		if(src.last_message_count >= SPAM_TRIGGER_WARNING)
+			src << "\red You are nearing the spam filter limit for identical messages."
+			return 0
+	else
+		last_message = message
+		src.last_message_count = 0
+		return 0
+
 //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc.
 /client/AllowUpload(filename, filelength)
 	if(filelength > UPLOAD_LIMIT)

code/modules/mob/dead/observer/say.dm

@@ -11,6 +11,9 @@
 			src << "\red You cannot talk in deadchat (muted)."
 			return
 
+		if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
+			return
+
 	. = src.say_dead(message)
 
 
@@ -30,6 +33,9 @@
 			src << "\red You cannot emote in deadchat (muted)."
 			return
 
+		if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
+			return
+
 	. = src.emote_dead(message)
 
 /*

code/modules/mob/living/carbon/alien/emote.dm

@@ -18,6 +18,8 @@
 				if (client.prefs.muted & MUTE_IC)
 					src << "\red You cannot send IC messages (muted)."
 					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
 			if (stat)
 				return
 			if(!(message))

code/modules/mob/living/carbon/brain/emote.dm

@@ -19,6 +19,8 @@
 				if (client.prefs.muted & MUTE_IC)
 					src << "\red You cannot send IC messages (muted)."
 					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
 			if (stat)
 				return
 			if(!(message))

code/modules/mob/living/carbon/human/emote.dm

@@ -112,6 +112,8 @@
 				if (client.prefs.muted & MUTE_IC)
 					src << "\red You cannot send IC messages (muted)."
 					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
 			if (stat)
 				return
 			if(!(message))

code/modules/mob/living/carbon/metroid/emote.dm

@@ -18,6 +18,8 @@
 				if (client.prefs.muted & MUTE_IC)
 					src << "\red You cannot send IC messages (muted)."
 					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
 				if (stat)
 					return
 				if(!(message))

code/modules/mob/living/say.dm

@@ -141,6 +141,9 @@ proc/get_radio_key_from_channel(var/channel)
 			return say_dead(message)
 		return
 
+	if(src.client.handle_spam_prevention(message,MUTE_IC))
+		return
+
 	//Parse the mode
 	var/message_mode = parse_message_mode(message, "headset")
 

code/modules/mob/living/silicon/robot/drone/drone_say.dm

@@ -4,6 +4,8 @@
 			if(client.prefs.muted & MUTE_IC)
 				src << "You cannot send IC messages (muted)."
 				return 0
+			if (src.client.handle_spam_prevention(message,MUTE_IC))
+				return 0
 
 		message = sanitize(message)
 

code/modules/mob/living/silicon/robot/emote.dm

@@ -14,6 +14,8 @@
 				if(client.prefs.muted & MUTE_IC)
 					src << "You cannot send IC messages (muted)."
 					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
 			if (stat)
 				return
 			if(!(message))

code/modules/mob/living/simple_animal/borer/borer_captive.dm

@@ -9,6 +9,8 @@
 		if(client.prefs.muted & MUTE_IC)
 			src << "\red You cannot speak in IC (muted)."
 			return
+		if (src.client.handle_spam_prevention(message,MUTE_IC))
+			return
 
 	if(istype(src.loc,/mob/living/simple_animal/borer))
 

code/modules/mob/living/simple_animal/borer/say.dm

@@ -16,6 +16,8 @@
 		if(client.prefs.muted & MUTE_IC)
 			src << "\red You cannot speak in IC (muted)."
 			return
+		if (src.client.handle_spam_prevention(message,MUTE_IC))
+			return
 
 	if (copytext(message, 1, 2) == "*")
 		return emote(copytext(message, 2))

vorestation.dme

@@ -2185,7 +2185,6 @@
 #include "code\modules\vore\fluffstuff\custom_items_yw.dm"
 #include "code\modules\vore\fluffstuff\custom_permits_vr.dm"
 #include "code\modules\vore\fluffstuff\MadokaSpear.dm"
-#include "code\modules\vore\fluffstuff\nazirus_yw.dm"
 #include "code\modules\vore\resizing\grav_pull_vr.dm"
 #include "code\modules\vore\resizing\holder_micro_vr.dm"
 #include "code\modules\vore\resizing\resize_vr.dm"