Merge pull request #12200 from Ghommie/Ghommie-cit738

nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
parent 40d2d35ffa 667c12d413
commit 395d434e6e
40 changed files with 94 additions and 95 deletions
@@ -144,7 +144,7 @@
 	return ..()

 /datum/nanite_program/metabolic_synthesis/active_effect()
-	host_mob.nutrition -= 0.5
+	host_mob.adjust_nutrition(-0.5)
 	nanites.adjust_nanites(src, 0.5)

 /datum/nanite_program/research
@@ -917,7 +917,7 @@ datum/status_effect/stabilized/blue/on_remove()
 			healing_types += CLONE
 		if(length(healing_types))
 			owner.apply_damage_type(-heal_amount, damagetype=pick(healing_types))
-		owner.nutrition += 3
+		owner.adjust_nutrition(3)
 		M.adjustCloneLoss(heal_amount * 1.2) //This way, two people can't just convert each other's damage away.
 	else
 		messagedelivered = FALSE
@@ -35,7 +35,7 @@ Burning extracts:
 	S.visible_message("<span class='danger'>A baby slime emerges from [src], and it nuzzles [user] before burbling hungrily!</span>")
 	S.Friends[user] = 20 //Gas, gas, gas
 	S.bodytemperature = T0C + 400 //We gonna step on the gas.
-	S.nutrition = S.get_hunger_nutrition() //Tonight, we fight!
+	S.set_nutrition(S.get_hunger_nutrition()) //Tonight, we fight!
 	..()

 /obj/item/slimecross/burning/orange
@@ -128,7 +128,7 @@ Regenerative extracts:
 	colour = "silver"

 /obj/item/slimecross/regenerative/silver/core_effect(mob/living/target, mob/user)
-	target.nutrition = NUTRITION_LEVEL_FULL - 1
+	target.set_nutrition(NUTRITION_LEVEL_FULL - 1)
 	to_chat(target, "<span class='notice'>You feel satiated.</span>")

 /obj/item/slimecross/regenerative/bluespace
@@ -186,7 +186,7 @@
 /obj/item/slime_extract/purple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
-			user.nutrition += 50
+			user.adjust_nutrition(50)
 			user.blood_volume += 50
 			to_chat(user, "<span class='notice'>You activate [src], and your body is refilled with fresh slime jelly!</span>")
 			return 150
@@ -636,7 +636,7 @@
 		qdel(src)
 		return
 	M.docile = 1
-	M.nutrition = 700
+	M.set_nutrition(700)
 	to_chat(M, "<span class='warning'>You absorb the potion and feel your intense desire to feed melt away.</span>")
 	to_chat(user, "<span class='notice'>You feed the slime the potion, removing its hunger and calming it.</span>")
 	var/newname = reject_bad_name(stripped_input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime", MAX_NAME_LEN), TRUE)