From c4e8b87f4494412210e36d93bdd8558376908d82 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 30 Jun 2017 09:18:18 -0500 Subject: [PATCH 1/2] Heartbeat fix --- code/modules/mob/living/carbon/life.dm | 2 ++ code/modules/surgery/organs/heart.dm.rej | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 code/modules/surgery/organs/heart.dm.rej diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 373107edf3..0e0f5f7328 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -16,6 +16,8 @@ for(var/V in internal_organs) var/obj/item/organ/O = V O.on_life() + if(stat == DEAD) + stop_sound_channel(CHANNEL_HEARTBEAT) //Updates the number of stored chemicals for powers handle_changeling() diff --git a/code/modules/surgery/organs/heart.dm.rej b/code/modules/surgery/organs/heart.dm.rej new file mode 100644 index 0000000000..8ba9e69848 --- /dev/null +++ b/code/modules/surgery/organs/heart.dm.rej @@ -0,0 +1,13 @@ +diff a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm (rejected hunks) +@@ -51,9 +51,9 @@ + + /obj/item/organ/heart/on_life() + if(owner.client) +- var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = 1) ++ var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE) + +- var/sound/fastbeat = sound('sound/health/fastbeat.ogg', repeat = 1) ++ 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 From 0390dce2e6f95b9a1efa775e098419cd85e5ef2c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 30 Jun 2017 10:35:24 -0500 Subject: [PATCH 2/2] Update heart.dm --- code/modules/surgery/organs/heart.dm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 9ffe8b6d06..1e81c1c609 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -47,6 +47,25 @@ var/obj/S = ..() S.icon_state = "heart-off" return S + +/obj/item/organ/heart/on_life() + if(owner.client) + 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) + to_chat(owner, "You feel your heart slow down...") + if(beat == BEAT_SLOW && H.health > HEALTH_THRESHOLD_CRIT) + H.stop_sound_channel(CHANNEL_HEARTBEAT) + beat = BEAT_NONE + + if(H.jitteriness) + if(!beat || beat == BEAT_SLOW) + H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT) + beat = BEAT_FAST /obj/item/organ/heart/cursed