From e0cb0e98759792f8569a9d379cdba07b479da9bb Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Thu, 17 Oct 2019 18:27:30 +0100
Subject: [PATCH 1/2] Stop double-sanitization of muffled emotes

Fixes #6073
---
 code/modules/mob/say.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index f38cf5f1c19..d14acc6399d 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -22,12 +22,13 @@
 		usr << "<font color='red'>Speech is currently admin-disabled.</font>"
 		return
 	
-	message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason)
+	//message = sanitize(message) //VOREStation removal - moving this to after muffled check to avoid double-sanitization problems.
 
 	set_typing_indicator(FALSE)
 	//VOREStation Edit Start
 	if(muffled)
 		return me_verb_subtle(message)
+	message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason)
 	//VOREStation Edit End
 	if(use_me)
 		usr.emote("me",usr.emote_type,message)

From bfaceaaec21c0d7f20d280bb6b59285559224553 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 18 Oct 2019 01:35:11 -0400
Subject: [PATCH 2/2] Update say.dm

---
 code/modules/mob/say.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index d14acc6399d..947853055c4 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -21,15 +21,14 @@
 	if(say_disabled)	//This is here to try to identify lag problems
 		usr << "<font color='red'>Speech is currently admin-disabled.</font>"
 		return
-	
-	//message = sanitize(message) //VOREStation removal - moving this to after muffled check to avoid double-sanitization problems.
 
-	set_typing_indicator(FALSE)
 	//VOREStation Edit Start
 	if(muffled)
 		return me_verb_subtle(message)
 	message = sanitize_or_reflect(message,src) //VOREStation Edit - Reflect too-long messages (within reason)
 	//VOREStation Edit End
+
+	set_typing_indicator(FALSE)
 	if(use_me)
 		usr.emote("me",usr.emote_type,message)
 	else