From 05c8ce2cd5b79693b09b97742adaaf24abce6544 Mon Sep 17 00:00:00 2001 From: DevanStrife <113341203+DevanStrife@users.noreply.github.com> Date: Tue, 15 Nov 2022 12:01:01 +0100 Subject: [PATCH] Removes the deathgasp sound if one is muffled (#19465) * No deathgasp sound while muffled! * Makes actual death still emit sound * Lewcc requested changes * Farie comment --- code/modules/mob/living/living_emote.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm index 62df24c9b5c..963ad699dd7 100644 --- a/code/modules/mob/living/living_emote.dm +++ b/code/modules/mob/living/living_emote.dm @@ -71,6 +71,7 @@ cooldown = 10 SECONDS volume = 40 unintentional_stat_allowed = DEAD + muzzle_ignore = TRUE // makes sure that sound is played upon death bypass_unintentional_cooldown = TRUE // again, this absolutely MUST play when a user dies, if it can. message = "seizes up and falls limp, their eyes dead and lifeless..." message_alien = "seizes up and falls limp, their eyes dead and lifeless..." @@ -85,6 +86,11 @@ /mob/living/carbon/brain, ) +/datum/emote/living/deathgasp/should_play_sound(mob/user, intentional) + . = ..() + if(user.is_muzzled() && intentional) + return FALSE + /datum/emote/living/deathgasp/get_sound(mob/living/user) . = ..()