diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 3a5982712bd..f47f470580b 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -248,7 +248,7 @@
var/heart_strength
var/pulse_pressure
-
+ var/having_heart_attack = carbon_patient.has_status_effect(/datum/status_effect/heart_attack)
var/heart_noises = TRUE
var/obj/item/organ/heart/heart = carbon_patient.get_organ_slot(ORGAN_SLOT_HEART)
@@ -292,6 +292,8 @@
if(isnull(heart) || !heart.is_beating() || carbon_patient.stat == DEAD)
render_list += "You don't hear a heartbeat!\n"//they're dead or their heart isn't beating
heart_noises = FALSE
+ else if(having_heart_attack)
+ render_list += "You hear a rapid, irregular heartbeat.\n"
else if(heart.damage > 10 || carbon_patient.blood_volume <= BLOOD_VOLUME_OKAY)
render_list += "You hear a weak heartbeat.\n"//their heart is damaged, or they have critical blood
else
@@ -304,28 +306,25 @@
user.visible_message(span_notice("[user] presses their hands against [carbon_patient]'s abdomen."), ignored_mobs = user)
//assess abdominal organs
- if(body_part == BODY_ZONE_PRECISE_GROIN)
- var/appendix_okay = TRUE
- var/liver_okay = TRUE
- if(!liver)//sanity check, ensure the patient actually has a liver
- render_list += "You can't feel anything where [target.p_their()] liver would be.\n"
+ var/appendix_okay = TRUE
+ var/liver_okay = TRUE
+ if(!liver)//sanity check, ensure the patient actually has a liver
+ render_list += "You can't feel anything where [target.p_their()] liver would be.\n"
+ liver_okay = FALSE
+ else
+ if(liver.damage > 10)
+ render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged
liver_okay = FALSE
- else
- if(liver.damage > 10)
- render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged
- liver_okay = FALSE
-
- if(!appendix)//sanity check, ensure the patient actually has an appendix
- render_list += "You can't feel anything where [target.p_their()] appendix would be.\n"
+ if(!appendix)//sanity check, ensure the patient actually has an appendix
+ render_list += "You can't feel anything where [target.p_their()] appendix would be.\n"
+ appendix_okay = FALSE
+ else
+ if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS)
+ render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake
+ target.emote("scream")
appendix_okay = FALSE
- else
- if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS)
- render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake
- target.emote("scream")
- appendix_okay = FALSE
-
- if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage
- render_list += "You don't find anything abnormal.\n"//they're okay :D
+ if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage
+ render_list += "You don't find anything abnormal.\n"//they're okay :D
if(BODY_ZONE_PRECISE_EYES)
balloon_alert(user, "can't do that!")
@@ -347,12 +346,14 @@
if(isnull(heart) || !heart.is_beating() || carbon_patient.blood_volume <= BLOOD_VOLUME_OKAY || carbon_patient.stat == DEAD)
render_list += "You can't find a pulse!\n"//they're dead, their heart isn't beating, or they have critical blood
else
- if(heart.damage > 10)
- heart_strength = span_danger("irregular")//their heart is damaged
+ if(having_heart_attack)
+ heart_strength = span_danger("irregular")
+ else if(heart.damage > 10)
+ heart_strength = span_danger("weak")//their heart is damaged
else
heart_strength = span_notice("regular")//they're okay :D
- if(carbon_patient.blood_volume <= BLOOD_VOLUME_SAFE && carbon_patient.blood_volume > BLOOD_VOLUME_OKAY)
+ if((carbon_patient.blood_volume <= BLOOD_VOLUME_SAFE && carbon_patient.blood_volume > BLOOD_VOLUME_OKAY) || having_heart_attack)
pulse_pressure = span_danger("thready")//low blood
else
pulse_pressure = span_notice("strong")//they're okay :D