Skip to content
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

Jump to bottom

Changes nutrition with blood loss #4231

Merged
merged 3 commits into from
Aug 25, 2023
+2 −7
Merged

Changes nutrition with blood loss #4231

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b93749
Initial
morrowwolf Aug 22, 2023
a38fd4c
maybe a bit less
morrowwolf Aug 23, 2023
288e868
OK even less
morrowwolf Aug 25, 2023
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
9 changes: 2 additions & 7 deletions code/modules/mob/living/blood.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@

if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood.
//Blood regeneration if there is some space
if(blood_volume < max_blood)
if(blood_volume < max_blood && nutrition >= 1)
blood_volume += 0.1 // regenerate blood VERY slowly
nutrition -= 0.25
else if(blood_volume > max_blood)
blood_volume -= 0.1 // The reverse in case we've gotten too much blood in our body
if(blood_volume > limit_blood)
Expand Down Expand Up @@ -43,12 +44,6 @@
if(oxyloss < maximum_oxyloss)
oxyloss += round(max(additional_oxyloss, 0))

//Bloodloss effects on nutrition
if(nutrition >= 300)
nutrition -= 10
else if(nutrition >= 200)
nutrition -= 3

switch(b_volume)
if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
if(prob(1))
Expand Down