Merge pull request #3896 from Fox-McCloud/heart

Heart Tweaks
This commit is contained in:
TheDZD
2016-03-16 21:45:59 -04:00
3 changed files with 55 additions and 16 deletions
+1 -1
View File
@@ -242,7 +242,7 @@ REAGENT SCANNER
user.show_message("\red <b>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl")
else
user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl")
if(H.heart_attack)
if(H.heart_attack && H.stat != DEAD)
user.show_message("<span class='userdanger'>Subject suffering from heart attack: Apply defibrillator immediately.</span>")
user.show_message("\blue Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font>")
var/implant_detect