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
This commit is contained in:
DevanStrife
2022-11-15 12:01:01 +01:00
committed by GitHub
parent a702a0c391
commit 05c8ce2cd5
+6
View File
@@ -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)
. = ..()