From e5082b645c152f84ed2171644e63a0503ecf8359 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Tue, 10 May 2022 16:49:11 -0400 Subject: [PATCH] Merge pull request #12950 from lm40/master Fixes heart damage/nonexistence having no impact on functional blood levels --- code/modules/organs/blood.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 264ef3d6b7..071bb05e91 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -77,12 +77,16 @@ var/const/CE_STABLE_THRESHOLD = 0.5 var/obj/item/organ/internal/heart/heart = internal_organs_by_name[O_HEART] if(!heart) + blood_volume_raw = 0 blood_volume = 0 else if(heart.is_broken()) + blood_volume_raw *= 0.3 blood_volume *= 0.3 else if(heart.is_bruised()) + blood_volume_raw *= 0.7 blood_volume *= 0.7 else if(heart.damage) + blood_volume_raw *= 0.8 blood_volume *= 0.8 //Effects of bloodloss