From 3d55fc58b91ccd0d3e150c4d812b07a67b6b618c Mon Sep 17 00:00:00 2001 From: volas Date: Sun, 8 Mar 2015 19:27:31 +0300 Subject: [PATCH] Additional checks for heartbeat, reduced volume --- code/modules/mob/living/carbon/human/life.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 5ad254b172..60d3bd90af 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1562,7 +1562,12 @@ return temp proc/handle_heartbeat() - if(pulse == PULSE_NONE) + if(pulse == PULSE_NONE || !species.has_organ["heart"]) + return + + var/datum/organ/internal/heart/H = internal_organs_by_name["heart"] + + if(!H || H.robotic >=2 ) return if(pulse >= PULSE_2FAST || shock_stage >= 10 || istype(get_turf(src), /turf/space)) @@ -1573,7 +1578,7 @@ if(heartbeat >= rate) heartbeat = 0 - src << sound('sound/effects/singlebeat.ogg',0,0,0,60) + src << sound('sound/effects/singlebeat.ogg',0,0,0,50) else heartbeat++