diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index fd9a37935e..2308798345 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -29,8 +29,6 @@
if(prefs.muted & MUTE_OOC)
src << "You cannot use OOC (muted)."
return
- if(handle_spam_prevention(msg,MUTE_OOC))
- return
if(findtext(msg, "byond://"))
src << "Advertising other servers is not allowed."
log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
@@ -99,8 +97,6 @@
if(prefs.muted & MUTE_OOC)
src << "You cannot use OOC (muted)."
return
- if(handle_spam_prevention(msg, MUTE_OOC))
- return
if(findtext(msg, "byond://"))
src << "Advertising other servers is not allowed."
log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 504a8419bf..8f8532590e 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/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
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 898cc4e835..bcb87f06d8 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -56,9 +56,6 @@
else src << "Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!"
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))
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 11193a3f09..08eda6bb34 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -15,9 +15,6 @@
src << "You have deadchat muted."
return
- if (src.handle_spam_prevention(msg,MUTE_DEADCHAT))
- return
-
var/stafftype = uppertext(holder.rank)
msg = sanitize(msg)
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 600549cdfa..23f5a75e2c 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/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] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]"
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 643483bb79..336231e530 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -74,21 +74,6 @@
..() //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)
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 9dfd3deb44..ada597f46b 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -11,9 +11,6 @@
src << "\red You cannot talk in deadchat (muted)."
return
- if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
- return
-
. = src.say_dead(message)
@@ -33,9 +30,6 @@
src << "\red You cannot emote in deadchat (muted)."
return
- if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
- return
-
. = src.emote_dead(message)
/*
diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm
index 62fa2cf108..e31a293047 100644
--- a/code/modules/mob/living/carbon/alien/emote.dm
+++ b/code/modules/mob/living/carbon/alien/emote.dm
@@ -18,8 +18,6 @@
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))
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index f29167f1f3..5725dd4ec7 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -19,8 +19,6 @@
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))
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 87c0524571..4488f65388 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -112,8 +112,6 @@
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))
diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm
index a6ea5498cd..d82372e52f 100644
--- a/code/modules/mob/living/carbon/metroid/emote.dm
+++ b/code/modules/mob/living/carbon/metroid/emote.dm
@@ -18,8 +18,6 @@
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))
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 19b623c817..a2355b1820 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -141,9 +141,6 @@ 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")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index b0f89a70ea..5cdcd3dbd8 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -4,8 +4,6 @@
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)
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 23b6cc0d67..7f2102a860 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -14,8 +14,6 @@
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))
diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
index 2d6bfc34b3..f07b9d32ce 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
@@ -9,8 +9,6 @@
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))
diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm
index 0d4cdad06e..e76a02a7e2 100644
--- a/code/modules/mob/living/simple_animal/borer/say.dm
+++ b/code/modules/mob/living/simple_animal/borer/say.dm
@@ -16,8 +16,6 @@
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))