diff --git a/code/__DEFINES/combat/stamina_combat.dm b/code/__DEFINES/combat/stamina_combat.dm
index 0467b656c5..1926c35d40 100644
--- a/code/__DEFINES/combat/stamina_combat.dm
+++ b/code/__DEFINES/combat/stamina_combat.dm
@@ -6,9 +6,9 @@
 /// Stamina buffer regen multiplier while in combat mode
 #define STAMINA_BUFFER_REGEN_PER_SECOND_COMBAT 3
 /// percent of regen to take away at stamcrit
-#define STAMINA_BUFFER_STAMCRIT_REGEN_PENALTY_PERCENT 0.5
+#define STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY 0.5
 /// percent of capacity to take away at stamcrit
-#define STAMINA_BUFFER_STAMCRIT_CAPACITY_PENALTY_PERCENT 0.5
+#define STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY 0.5
 
 // Standard amounts for stamina usage
 
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index b2fa88a343..b558b28cf2 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"COMBAT_FLAG_SPRINT_TOGGLED" = COMBAT_FLAG_SPRINT_TOGGLED,
 		"COMBAT_FLAG_SPRINT_ACTIVE" = COMBAT_FLAG_SPRINT_ACTIVE,
 		"COMBAT_FLAG_ATTEMPTING_CRAWL" = COMBAT_FLAG_ATTEMPTING_CRAWL,
-		"COMBAT_FLAG_SOFT_STAMCRIT" = COMBAT_FLAG_SOFT_STAMCRIT,
+		"COMBAT_FLAG_HARD_STAMCRIT" = COMBAT_FLAG_HARD_STAMCRIT,
 		"COMBAT_FLAG_INTENTIONALLY_RESTING" = COMBAT_FLAG_INTENTIONALLY_RESTING,
 		"COMBAT_FLAG_RESISTING_REST" = COMBAT_FLAG_RESISTING_REST,
 		"COMBAT_FLAG_SPRINT_FORCED" = COMBAT_FLAG_SPRINT_FORCED
diff --git a/code/_onclick/hud/screen_objects/stamina.dm b/code/_onclick/hud/screen_objects/stamina.dm
index 57152951db..c08f0dd2ce 100644
--- a/code/_onclick/hud/screen_objects/stamina.dm
+++ b/code/_onclick/hud/screen_objects/stamina.dm
@@ -11,7 +11,11 @@
 /obj/screen/staminas/Click(location,control,params)
 	if(isliving(usr))
 		var/mob/living/L = usr
-		to_chat(L, "<span class='notice'>You have <b>[L.getStaminaLoss()]</b> stamina loss.<br>Your stamina buffer can take <b>[L.stambuffer]</b> stamina loss, and recharges at no cost.<br>Your stamina buffer is <b>[(L.stambuffer*(100/L.stambuffer))-(L.bufferedstam*(100/L.stambuffer))]%</b> full.</span>")
+		to_chat(L, "<span class='notice'>You have <b>[L.getStaminaLoss()]</b> stamina loss.<br>\
+		Your stamina buffer is currently [L.stamina_buffer]/[L.stamina_buffer_max], and recharges at [L.stamina_buffer_regen] and [L.stamina_buffer_regen_combat] (combat mode on) per second.<br>\
+		Your stamina buffer will have its capacity reduced by up to [STAMINA_BUFFER_STAMCRIT_CAPACITY_PERCENT_PENALTY * 100] from stamina damage, up until stamcrit, and similarly will be impacted in regeneration by\
+		[STAMINA_BUFFER_STAMCRIT_REGEN_PERCENT_PENALTY]% from said damage.\
+		<br>Your stamina buffer is <b>[round((L.stamina_buffer / L.stamina_buffer_max) * 100, 0.1)]%</b> full.</span>")
 
 /obj/screen/staminas/update_icon_state()
 	var/mob/living/carbon/user = hud?.mymob
@@ -42,13 +46,17 @@
 	else if(user.hal_screwyhud == 5)
 		icon_state = "stambuffer29"
 	else
-		icon_state = "stambuffer[FLOOR((stamina_buffer / stamina_buffer_max) * 29, 1)]"
+		icon_state = "stambuffer[FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)]"
 
 /obj/screen/staminabuffer/update_overlays()
-	var/level = FLOOR((stamina_buffer / stamina_buffer_max) * 29, 1)
+	. = ..()
+	var/mob/living/carbon/user = hud?.mymob
+	if(!user)
+		return
+	var/level = FLOOR((user.stamina_buffer / user.stamina_buffer_max) * 29, 1)
 	if((user.stat == DEAD) || (user.combat_flags & COMBAT_FLAG_HARD_STAMCRIT) || (user.hal_screwyhud in 1 to 2) || (level <= 5))
-		. = list("stamina_alert3")
+		. += list("stamina_alert3") 
 	else if(level <= 8)
-		. = list("stamina_alert2")
+		. += list("stamina_alert2")
 	else if(level <= 12)
-		. = list("stamina_alert1")
+		. += list("stamina_alert1")
diff --git a/tgstation.dme b/tgstation.dme
index 294b31f6fb..36e37f6b48 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2577,7 +2577,6 @@
 #include "code\modules\mob\living\silicon\silicon.dm"
 #include "code\modules\mob\living\silicon\silicon_defense.dm"
 #include "code\modules\mob\living\silicon\silicon_movement.dm"
-#include "code\modules\mob\living\silicon\stamina_buffer.dm"
 #include "code\modules\mob\living\silicon\ai\ai.dm"
 #include "code\modules\mob\living\silicon\ai\ai_defense.dm"
 #include "code\modules\mob\living\silicon\ai\death.dm"