From 1f83d3cbb73aa243de10996bdfab40c2af898f37 Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Wed, 25 Oct 2017 11:40:10 -0200
Subject: [PATCH] Merge pull request #32071 from ShizCalev/heart-spam-fix

Fixes heartbeat message spam
---
 code/modules/surgery/organs/heart.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 9308154c48..19bed38293 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -63,10 +63,9 @@
 			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
+		if(H.jitteriness && H.health > HEALTH_THRESHOLD_FULLCRIT && (!beat || beat == BEAT_SLOW))
+			H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
+			beat = BEAT_FAST
 
 /obj/item/organ/heart/cursed
 	name = "cursed heart"