Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

code/datums/diseases/advance/symptoms/heal.dm

@@ -126,7 +126,7 @@
 		var/datum/reagent/R = E
 		M.reagents.remove_reagent(R.type, actual_power)
 		if(food_conversion)
-			M.nutrition += 0.3
+			M.adjust_nutrition(0.3)
 		if(prob(2))
 			to_chat(M, "<span class='notice'>You feel a mild warmth as your blood purifies itself.</span>")
 	return 1
@@ -164,7 +164,7 @@
 		C.reagents.metabolize(C, can_overdose=TRUE)
 	C.overeatduration = max(C.overeatduration - 2, 0)
 	var/lost_nutrition = 9 - (reduced_hunger * 5)
-	C.nutrition = max(C.nutrition - (lost_nutrition * HUNGER_FACTOR), 0) //Hunger depletes at 10x the normal speed
+	C.adjust_nutrition(-lost_nutrition * HUNGER_FACTOR) //Hunger depletes at 10x the normal speed
 	if(prob(2))
 		to_chat(C, "<span class='notice'>You feel an odd gurgle in your stomach, as if it was working much faster than normal.</span>")
 	return 1
@@ -454,7 +454,7 @@
 	"Transmission 6" = "Additionally heals cellular damage and toxin lovers.",
 	"Resistance 7" = "Increases healing speed.",
 	)
-	
+
 /datum/symptom/heal/radiation/Start(datum/disease/advance/A)
 	if(!..())
 		return

code/datums/diseases/advance/symptoms/weight.dm

@@ -50,4 +50,4 @@ Bonus
 		else
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
-			M.nutrition = max(M.nutrition - 100, 0)
+			M.adjust_nutrition(-100)