From e9534fb1565be38527025a2618631c673f511288 Mon Sep 17 00:00:00 2001 From: Robustin Date: Wed, 20 Sep 2017 11:58:16 -0400 Subject: [PATCH 1/2] Fix: No more beating sounds from dead hearts (#30871) * Automatic changelog generation for PR #30056 [ci skip] * Delete AutoChangeLog-pr-30056.yml * Removes beating from nonbeating hearts * single check --- code/modules/surgery/organs/heart.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index f8388a5dab..d1699cb257 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -50,11 +50,11 @@ return S /obj/item/organ/heart/on_life() - if(owner.client) + if(owner.client && beating) var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE) - var/sound/fastbeat = sound('sound/health/fastbeat.ogg', repeat = TRUE) var/mob/living/carbon/H = owner + if(H.health <= HEALTH_THRESHOLD_CRIT && beat != BEAT_SLOW) beat = BEAT_SLOW H.playsound_local(get_turf(H), slowbeat,40,0, channel = CHANNEL_HEARTBEAT)