From 34e8f3632763b757a3fd58d3de3b2d1e076c69ab Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Sat, 9 Jul 2022 07:07:58 -0700 Subject: [PATCH] Ensure emotes are only routed to the user (#18285) --- code/modules/mob/hear_say.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 1ddef5d4597..d8453a38f01 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -95,6 +95,13 @@ if(client.prefs.toggles & PREFTOGGLE_CHAT_GHOSTEARS && (speaker in view(src))) message = "[message]" + // Ensure only the speaker is forced to emote, and that the spoken language is inname + if(speaker == src) + for(var/datum/multilingual_say_piece/SP in message_pieces) + if(SP.speaking && SP.speaking.flags & INNATE) + custom_emote(EMOTE_AUDIBLE, message_clean, TRUE) + return + if(!can_hear()) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set // if(!language || !(language.flags & INNATE))