From 1aaf3d631568d6ea716b36cab95a5f8b2f992d59 Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Sun, 26 Jun 2022 07:33:10 -0700 Subject: [PATCH] Make monkey death/gasps not travel through walls (#18080) * Make monkey death/gasps not travel throguh walls * based off of mind instead of monke --- code/modules/mob/living/carbon/human/human_emote.dm | 5 +++++ code/modules/mob/living/living_emote.dm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index fe34dabb376..6f740510db1 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -146,6 +146,11 @@ else return pick(H.dna.species.male_dying_gasp_sounds) +/datum/emote/living/carbon/human/gasp/play_sound_effect(mob/user, intentional, sound_path, sound_volume) + var/mob/living/carbon/human/H = user + // special handling here: we don't want monkeys' gasps to sound through walls so you can actually walk past xenobio + playsound(user.loc, sound_path, sound_volume, TRUE, frequency = H.get_age_pitch(), ignore_walls = !isnull(user.mind)) + /datum/emote/living/carbon/human/shake key = "shake" key_third_person = "shakes" diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm index 50f94777ecf..baaf8c074df 100644 --- a/code/modules/mob/living/living_emote.dm +++ b/code/modules/mob/living/living_emote.dm @@ -110,6 +110,11 @@ var/mob/living/silicon/SI = user return SI.death_sound +/datum/emote/living/deathgasp/play_sound_effect(mob/user, intentional, sound_path, sound_volume) + var/mob/living/carbon/human/H = user + // special handling here: we don't want monkeys' gasps to sound through walls so you can actually walk past xenobio + playsound(user.loc, sound_path, sound_volume, TRUE, frequency = H.get_age_pitch(), ignore_walls = !isnull(user.mind)) + /datum/emote/living/drool key = "drool" key_third_person = "drools"