[MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold

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

@@ -54,7 +54,7 @@ Bonus
 /datum/symptom/fever/proc/Heat(mob/living/M, datum/disease/advance/A)
 	var/get_heat = 6 * power
 	if(!unsafe)
-		M.bodytemperature = min(M.bodytemperature + (get_heat * A.stage), BODYTEMP_HEAT_DAMAGE_LIMIT - 1)
+		M.adjust_bodytemperature(get_heat * A.stage, 0, BODYTEMP_HEAT_DAMAGE_LIMIT - 1)
 	else
-		M.bodytemperature += (get_heat * A.stage)
+		M.adjust_bodytemperature(get_heat * A.stage)
 	return 1

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

@@ -384,11 +384,11 @@
 		to_chat(M, "<span class='notice'>You feel yourself absorbing plasma inside and around you...</span>")
 
 	if(M.bodytemperature > BODYTEMP_NORMAL)
-		M.bodytemperature = max(BODYTEMP_NORMAL, M.bodytemperature - (20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT))
+		M.adjust_bodytemperature(-20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT,BODYTEMP_NORMAL)
 		if(prob(5))
 			to_chat(M, "<span class='notice'>You feel less hot.</span>")
 	else if(M.bodytemperature < (BODYTEMP_NORMAL + 1))
-		M.bodytemperature = min(BODYTEMP_NORMAL, M.bodytemperature + (20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT))
+		M.adjust_bodytemperature(20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT,0,BODYTEMP_NORMAL)
 		if(prob(5))
 			to_chat(M, "<span class='notice'>You feel warmer.</span>")
 

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

@@ -47,13 +47,13 @@ Bonus
 		to_chat(M, "<span class='warning'>[pick("You feel cold.", "You shiver.")]</span>")
 	else
 		to_chat(M, "<span class='userdanger'>[pick("You feel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently." )]</span>")
-	if(M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT || unsafe)
+	if(M.bodytemperature > BODYTEMP_COLD_DAMAGE_LIMIT || unsafe)
 		Chill(M, A)
 
 /datum/symptom/shivering/proc/Chill(mob/living/M, datum/disease/advance/A)
 	var/get_cold = 6 * power
-	if(!unsafe)
-		M.bodytemperature = min(M.bodytemperature - (get_cold * A.stage), BODYTEMP_COLD_DAMAGE_LIMIT + 1)
-	else
-		M.bodytemperature -= (get_cold * A.stage)
+	var/limit = BODYTEMP_COLD_DAMAGE_LIMIT + 1
+	if(unsafe)
+		limit = 0
+	M.adjust_bodytemperature(-get_cold * A.stage, limit)
 	return 1

code/datums/diseases/cold9.dm

@@ -14,7 +14,7 @@
 	..()
 	switch(stage)
 		if(2)
-			affected_mob.bodytemperature -= 10
+			affected_mob.adjust_bodytemperature(-10)
 			if(prob(1) && prob(10))
 				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
@@ -28,7 +28,7 @@
 			if(prob(5))
 				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
 		if(3)
-			affected_mob.bodytemperature -= 20
+			affected_mob.adjust_bodytemperature(-20)
 			if(prob(1))
 				affected_mob.emote("sneeze")
 			if(prob(1))

code/datums/diseases/fluspanish.dm

@@ -15,7 +15,7 @@
 	..()
 	switch(stage)
 		if(2)
-			affected_mob.bodytemperature += 10
+			affected_mob.adjust_bodytemperature(10)
 			if(prob(5))
 				affected_mob.emote("sneeze")
 			if(prob(5))
@@ -25,7 +25,7 @@
 				affected_mob.take_bodypart_damage(0,5)
 
 		if(3)
-			affected_mob.bodytemperature += 20
+			affected_mob.adjust_bodytemperature(20)
 			if(prob(5))
 				affected_mob.emote("sneeze")
 			if(prob(5))

code/datums/diseases/tuberculosis.dm

@@ -55,6 +55,6 @@
 				affected_mob.nutrition = max(affected_mob.nutrition - 100, 0)
 			if(prob(15))
 				to_chat(affected_mob, "<span class='danger'>[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]</span>")
-				affected_mob.bodytemperature += 40
+				affected_mob.adjust_bodytemperature(40)
 	return
 

code/datums/status_effects/gas.dm

@@ -28,7 +28,7 @@
 	if(!owner.stat)
 		to_chat(owner, "The cube melts!")
 	owner.cut_overlay(cube)
-	owner.bodytemperature += 100
+	owner.adjust_bodytemperature(100)
 	owner.update_canmove()
 
 /datum/status_effect/freon/watcher

code/datums/weather/weather_types/snow_storm.dm

@@ -24,5 +24,5 @@
 
 
 /datum/weather/snow_storm/weather_act(mob/living/L)
-	L.bodytemperature -=(rand(5,15))
+	L.adjust_bodytemperature(-rand(5,15))