cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4638 from Verkister/patch-32

Browse Source 
Fixes movement draining nutrition below negatives
This commit is contained in:
Spades
2019-01-06 10:41:15 -05:00
committed by GitHub
parent fc2f451bd4 890803e0c6
commit a0cb0a347d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/life_vr.dm
View File

@@ -1,5 +1,5 @@
/mob/living/carbon/human/proc/weightgain() /mob/living/carbon/human/proc/weightgain()
if (nutrition > 0 && stat != 2) if (nutrition >= 0 && stat != 2)
if (nutrition > MIN_NUTRITION_TO_GAIN && weight < MAX_MOB_WEIGHT && weight_gain) if (nutrition > MIN_NUTRITION_TO_GAIN && weight < MAX_MOB_WEIGHT && weight_gain)
weight += species.metabolism*(0.01*weight_gain) weight += species.metabolism*(0.01*weight_gain)
@@ -68,6 +68,8 @@
M.nutrition -= M.species.hunger_factor/10 M.nutrition -= M.species.hunger_factor/10
if(M.m_intent == "run") if(M.m_intent == "run")
M.nutrition -= M.species.hunger_factor/10 M.nutrition -= M.species.hunger_factor/10
if(M.nutrition < 0)
M.nutrition = 0
else else
src.nutrition -= DEFAULT_HUNGER_FACTOR/10 src.nutrition -= DEFAULT_HUNGER_FACTOR/10
if(src.m_intent == "run") if(src.m_intent == "run")