From 23bbbb7e4cf561e4188a9c5c9edab6c12ac57345 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 29 Mar 2015 13:51:19 +0200 Subject: [PATCH] Moves sanitize(message) up a level for now. --- code/modules/mob/living/carbon/human/say.dm | 1 + code/modules/mob/living/say.dm | 2 -- code/modules/mob/living/simple_animal/simple_animal.dm | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index ed86eec72a..221fbc1224 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -7,6 +7,7 @@ src << "You're muzzled and cannot speak!" return + message = sanitize(message) ..(message, alt_name = alt_name) //ohgod we should really be passing a datum here. /mob/living/carbon/human/proc/forcesay(list/append) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 228412776f..1ce1085648 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -130,8 +130,6 @@ proc/get_radio_key_from_channel(var/channel) src << "\red You cannot speak in IC (Muted)." return - message = sanitize(message) - if(stat) if(stat == 2) return say_dead(message) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 45f95c9921..e94694295c 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -364,6 +364,8 @@ if(speak_emote.len) verb = pick(speak_emote) + message = sanitize(message) + ..(message, null, verb) /mob/living/simple_animal/get_speech_ending(verb, var/ending)