Merge pull request #7045 from Neerti/let_them_eat_all_the_cake

Removes limits on eating, centralizes nutrition changing.
This commit is contained in:
Atermonera
2020-04-29 14:14:11 -07:00
committed by GitHub
38 changed files with 115 additions and 100 deletions
+2 -2
View File
@@ -133,9 +133,9 @@ var/const/CE_STABLE_THRESHOLD = 0.5
// Without enough blood you slowly go hungry.
if(blood_volume < BLOOD_VOLUME_SAFE)
if(nutrition >= 300)
nutrition -= 10
adjust_nutrition(-10)
else if(nutrition >= 200)
nutrition -= 3
adjust_nutrition(-3)
//Bleeding out
var/blood_max = 0
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/item/organ/internal/cell/emp_act(severity)
..()
owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
owner.adjust_nutrition(-rand(10 / severity, 50 / severity))
// Used for an MMI or posibrain being installed into a human.
/obj/item/organ/internal/mmi_holder