diff --git a/code/modules/mob/abstract/observer/say.dm b/code/modules/mob/abstract/observer/say.dm
index 302d4c98845..4c0225d1bb7 100644
--- a/code/modules/mob/abstract/observer/say.dm
+++ b/code/modules/mob/abstract/observer/say.dm
@@ -1,6 +1,4 @@
/mob/abstract/observer/say(var/message)
- message = sanitize(message)
-
if (!message)
return
diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index cb5d4a3c50b..b765abc3885 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -164,8 +164,6 @@
/mob/living/bot/say(var/message)
var/verb = "beeps"
- message = sanitize(message)
-
..(message, null, verb)
/mob/living/bot/Collide(atom/A)
diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm
index ce062f8e250..1dd1a48d3f0 100644
--- a/code/modules/mob/living/carbon/brain/say.dm
+++ b/code/modules/mob/living/carbon/brain/say.dm
@@ -3,8 +3,6 @@
if (silent)
return
- message = sanitize(message)
-
if(!(container && istype(container, /obj/item/device/mmi)))
return //No MMI, can't speak, bucko./N
else
diff --git a/code/modules/mob/living/carbon/slime/say.dm b/code/modules/mob/living/carbon/slime/say.dm
index f157628f525..35b3a763e90 100644
--- a/code/modules/mob/living/carbon/slime/say.dm
+++ b/code/modules/mob/living/carbon/slime/say.dm
@@ -1,7 +1,5 @@
/mob/living/carbon/slime/say(var/message)
- message = sanitize(message)
-
var/verb = say_quote(message)
if(copytext(message,1,2) == "*")
@@ -36,4 +34,4 @@
speech_buffer = list()
speech_buffer.Add(speaker)
speech_buffer.Add(lowertext(html_decode(message)))
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/mob/living/parasite/meme_captive.dm b/code/modules/mob/living/parasite/meme_captive.dm
index ab9ddbf5566..67415f310ab 100644
--- a/code/modules/mob/living/parasite/meme_captive.dm
+++ b/code/modules/mob/living/parasite/meme_captive.dm
@@ -6,7 +6,6 @@
/mob/living/parasite/captive_brain/say(var/message)
if(istype(src.loc,/mob/living/parasite/meme))
- message = sanitize(message)
if (!message)
return
log_say("[key_name(src)] : [message]",ckey=key_name(src))
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 b6a17d13b52..c1af9fa02ff 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -3,8 +3,6 @@
return ..(message)
if(local_transmit)
- message = sanitize(message)
-
if(stat == DEAD)
return say_dead(message)
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 0b72a411335..e4420f23fc8 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -1,6 +1,3 @@
-/mob/living/silicon/say(message, sanitize = TRUE)
- return ..(sanitize ? sanitize(message) : message)
-
/mob/living/silicon/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
log_say("[key_name(src)] : [message]",ckey=key_name(src))
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 26a52b799f3..bb2d50174d5 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
@@ -8,7 +8,6 @@
/mob/living/captive_brain/say(var/message)
if(istype(src.loc,/mob/living/simple_animal/borer))
- message = sanitize(message)
if(!message)
return
log_say("[key_name(src)] : [message]", ckey=key_name(src))
diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm
index c504b285386..8f9af1a43c2 100644
--- a/code/modules/mob/living/simple_animal/borer/say.dm
+++ b/code/modules/mob/living/simple_animal/borer/say.dm
@@ -1,5 +1,4 @@
/mob/living/simple_animal/borer/say(var/message)
- message = sanitize(message)
message = capitalize(message)
if(!message)
@@ -41,4 +40,4 @@
for(var/mob/M in mob_list)
if(M.client && M.stat == DEAD && !isnewplayer(M) && (M.client.prefs.toggles & CHAT_GHOSTEARS))
- to_chat(M, "[src.truename] whispers to [host], \"[message]\"")
\ No newline at end of file
+ to_chat(M, "[src.truename] whispers to [host], \"[message]\"")
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 8143229ca64..9afbfe0a8c8 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -210,11 +210,8 @@
/mob/living/simple_animal/shade/bluespace/say(var/message)
if(!possessive)
- var/new_last_message_heard = sanitizeName(last_message_heard)
- var/new_message = sanitizeName(message)
-
- var/list/words_in_memory = dd_text2List(new_last_message_heard, " ")
- var/list/words_in_message = dd_text2List(new_message, " ")
+ var/list/words_in_memory = dd_text2List(last_message_heard, " ")
+ var/list/words_in_message = dd_text2List(message, " ")
for(var/word1 in words_in_message)
var/valid = 0
for(var/word2 in words_in_memory)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index e91accf9f1c..e687e32881e 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -738,7 +738,6 @@
if(speak_emote.len)
verb = pick(speak_emote)
- message = sanitize(message)
if(emote_sounds.len)
var/sound_chance = TRUE
if(client) // we do not want people who assume direct control to spam
diff --git a/html/changelogs/johnwildkins-sanitizeme.yml b/html/changelogs/johnwildkins-sanitizeme.yml
new file mode 100644
index 00000000000..a2ccd3b8cee
--- /dev/null
+++ b/html/changelogs/johnwildkins-sanitizeme.yml
@@ -0,0 +1,6 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+ - bugfix: "Fixed overactive sanitization on certain mob/say types."