Merge pull request #32071 from ShizCalev/heart-spam-fix

Fixes heartbeat message spam
This commit is contained in:
Leo
2017-10-25 11:40:10 -02:00
committed by CitadelStationBot
parent 95bae508aa
commit 1f83d3cbb7
+3 -4
View File
@@ -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"