From bc093ba01fb6324e38d8a31402ded1debd572e12 Mon Sep 17 00:00:00 2001 From: Emagged Date: Thu, 9 Feb 2023 12:32:17 +0100 Subject: [PATCH] added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent --- code/datums/emote.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/emote.dm b/code/datums/emote.dm index d2d443954e2..4945a4dc4a6 100644 --- a/code/datums/emote.dm +++ b/code/datums/emote.dm @@ -593,6 +593,10 @@ return FALSE if((emote_type & EMOTE_MOUTH) && !can_vocalize_emotes(user)) return FALSE + if(istype(user, /mob/living)) + var/mob/living/live_user = user + if(live_user.has_status_effect(STATUS_EFFECT_SILENCED)) + return FALSE return TRUE /datum/emote/proc/remove_ending_punctuation(msg)