shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Heartbeat fix

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-30 09:18:18 -05:00
parent 881acdbecc
commit c4e8b87f44
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/life.dm
View File

@@ -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()

13
code/modules/surgery/organs/heart.dm.rej Normal file
View File

@@ -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