From f2126c6d9e22440bc6efc493b8164573d6f0c349 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 31 Dec 2018 06:07:46 -0500
Subject: [PATCH] Makes stamcrit completely unaffected by health (#7865)

* makes stamina completely unaffected by health

* oh, and these lines too
---
 modular_citadel/code/modules/mob/living/living.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm
index 955263b7af..b07b8ed64b 100644
--- a/modular_citadel/code/modules/mob/living/living.dm
+++ b/modular_citadel/code/modules/mob/living/living.dm
@@ -102,9 +102,9 @@
 			return FALSE
 
 /mob/living/carbon/update_stamina()
-	var/total_health = (min(health*2,100) - getStaminaLoss())
-	if(getStaminaLoss())
-		if(!recoveringstam && total_health <= STAMINA_CRIT_TRADITIONAL && !stat)
+	var/total_health = getStaminaLoss()
+	if(total_health)
+		if(!recoveringstam && total_health >= STAMINA_CRIT && !stat)
 			to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
 			resting = TRUE
 			if(combatmode)
@@ -112,7 +112,7 @@
 			recoveringstam = TRUE
 			filters += CIT_FILTER_STAMINACRIT
 			update_canmove()
-	if(recoveringstam && total_health >= STAMINA_SOFTCRIT_TRADITIONAL)
+	if(recoveringstam && total_health <= STAMINA_SOFTCRIT)
 		to_chat(src, "<span class='notice'>You don't feel nearly as exhausted anymore.</span>")
 		recoveringstam = FALSE
 		filters -= CIT_FILTER_STAMINACRIT