Skip to content

Fix issues with blood volume calculations #5278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MistakeNot4892 merged 1 commit into from
Jan 24, 2026
Merged

Fix issues with blood volume calculations #5278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions code/modules/mob/living/human/human_blood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@

//Percentage of maximum blood volume, affected by the condition of circulation organs
/mob/living/human/proc/get_blood_circulation()


var/obj/item/organ/internal/heart/heart = get_organ(BP_HEART, /obj/item/organ/internal/heart)
if(!heart)
return 0.25 * get_blood_volume()
Expand All @@ -210,8 +208,7 @@
if(PULSE_2FAST, PULSE_THREADY)
pulse_mod *= 1.25
blood_volume *= pulse_mod
if(current_posture.prone)
blood_volume *= 1.25
blood_volume *= current_posture.blood_volume_multiplier

var/min_efficiency = recent_pump ? 0.5 : 0.3
blood_volume *= max(min_efficiency, (1-(heart.get_organ_damage() / heart.max_damage)))
Expand All @@ -236,7 +233,8 @@
else
blood_volume = 100

var/blood_volume_mod = max(0, 1 - getOxyLossPercent()/(species.total_health/2))
// blood_volume_mod is 1 with no oxyloss, 0 at half species health (50%), and cannot go below 0
var/blood_volume_mod = max(0, (1 - getOxyLossFraction()*2))
var/oxygenated_mult = 0
switch(GET_CHEMICAL_EFFECT(src, CE_OXYGENATED))
if(1)
Expand All @@ -245,6 +243,6 @@
oxygenated_mult = 0.7
if(3)
oxygenated_mult = 0.9
blood_volume_mod = blood_volume_mod + oxygenated_mult - (blood_volume_mod * oxygenated_mult)
blood_volume = blood_volume * blood_volume_mod
return min(blood_volume, 100)
blood_volume_mod += oxygenated_mult * (1 - blood_volume_mod) // give us back a fraction of our missing oxygenation
blood_volume *= blood_volume_mod
return clamp(blood_volume, 0, 100)
5 changes: 4 additions & 1 deletion code/modules/mob/living/human/human_damage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@
..()

/mob/living/human/proc/getOxyLossPercent()
return (get_damage(OXY) / species.total_health) * 100
return getOxyLossFraction() * 100

/mob/living/human/proc/getOxyLossFraction()
return (get_damage(OXY) / species.total_health)

/mob/living/human/getOxyLoss()
if(need_breathe())
Expand Down
2 changes: 2 additions & 0 deletions code/modules/posture/_posture.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
var/selectable_type
/// String to use in Change Posture.
var/posture_change_message
/// Postural multiplier to effective blood circulation volume, a generalization of the old feature of 'laying down increases your effective blood volume'.
var/blood_volume_multiplier = 1

/decl/posture/proc/can_be_selected_by(mob/mob)
return is_user_selectable
2 changes: 2 additions & 0 deletions code/modules/posture/posture_subtypes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
prone = TRUE
posture_change_message = "lying down"
selectable_type = /decl/posture/lying/deliberate
blood_volume_multiplier = 1.25

/decl/posture/lying/deliberate
name = "resting"
Expand All @@ -21,3 +22,4 @@
is_user_selectable = TRUE
deliberate = TRUE
prone = TRUE
blood_volume_multiplier = 1.1 // sitting is a little less intense than standing
Loading