fixes

code/modules/mob/living/carbon/life.dm

@@ -503,7 +503,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 /mob/living/carbon/handle_status_effects()
 	..()
 	var/combat_mode = SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)
-	if(getStaminaLoss())
+	if(getStaminaLoss() && !HAS_TRAIT(src, TRAIT_NO_STAMINA_REGENERATION))
 		adjustStaminaLoss((!CHECK_MOBILITY(src, MOBILITY_STAND) ? ((combat_flags & COMBAT_FLAG_HARD_STAMCRIT) ? STAM_RECOVERY_STAM_CRIT : STAM_RECOVERY_RESTING) : STAM_RECOVERY_NORMAL) * (combat_mode? 0.25 : 1))
 
 	if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT) && incomingstammult != 1)

code/modules/mob/living/living_active_block.dm

@@ -8,6 +8,8 @@
 	active_block_item = null
 	REMOVE_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT)
 	REMOVE_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_BLOCK_TRAIT)
+	REMOVE_TRAIT(src, TRAIT_NO_STAMINA_BUFFER_REGENERATION, ACTIVE_BLOCK_TRAIT)
+	REMOVE_TRAIT(src, TRAIT_NO_STAMINA_REGENERATION, ACTIVE_BLOCK_TRAIT)
 	remove_movespeed_modifier(/datum/movespeed_modifier/active_block)
 	var/datum/block_parry_data/data = I.get_block_parry_data()
 	DelayNextAction(data.block_end_click_cd_add)
@@ -27,6 +29,10 @@
 		ADD_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT)		//probably should be something else at some point
 	if(data.block_lock_sprinting)
 		ADD_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_BLOCK_TRAIT)
+	if(data.block_no_stamina_regeneration)
+		ADD_TRAIT(src, TRAIT_NO_STAMINA_REGENERATION, ACTIVE_BLOCK_TRAIT)
+	if(data.block_no_stambuffer_regeneration)
+		ADD_TRAIT(src, TRAIT_NO_STAMINA_BUFFER_REGENERATION, ACTIVE_BLOCK_TRAIT)
 	add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/active_block, multiplicative_slowdown = data.block_slowdown)
 	active_block_effect_start()
 	return TRUE

code/modules/mob/living/living_blocking_parrying.dm

@@ -74,8 +74,12 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	/// Ratio of stamina incurred by chest (so after [block_stamina_limb_ratio] runs) that is buffered.
 	var/block_stamina_buffer_ratio = 1
 
-	/// Stamina dealt directly via adjustStaminaLossBuffered() per SECOND of block.
+	/// Stamina dealt directly via UseStaminaBuffer() per SECOND of block.
 	var/block_stamina_cost_per_second = 1.5
+	/// Prevent stamina buffer regeneration while block?
+	var/block_no_stambuffer_regeneration = TRUE
+	/// Prevent stamina regeneration while block?
+	var/block_no_stamina_regeneration = FALSE
 
 	/// Bitfield for attack types that we can block while down. This will work in any direction.
 	var/block_resting_attack_types_anydir = ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED | ATTACK_TYPE_TACKLE

code/modules/mob/living/living_defines.dm

@@ -165,3 +165,5 @@
 	var/stamina_buffer_regen_mod = 1
 	/// Last time stamina buffer regen was done
 	var/stamina_buffer_regen_last = 0
+	/// Last time we used stamina buffer
+	var/stamina_buffer_last_use = 0

code/modules/mob/living/stamina_buffer.dm

@@ -4,15 +4,20 @@
   *
   * Returns TRUE or FALSE based on if we have it.
   */
-/mob/living/proc/UseStaminaBuffer(amount, warn = FALSE)
+/mob/living/proc/UseStaminaBuffer(amount, warn = FALSE, considered_action = TRUE)
 	if(!(combat_flags & COMBAT_FLAG_STAMINA_BUFFER))
 		return TRUE
 	if(stamina_buffer < amount)
-		if(warn)
-			to_chat(src, "<span class='warning'>You do not have enough action stamina to do that!</span>")
-			return
-		return FALSE
-	stamina_buffer -= amount
+		var/stamina_health = getStaminaLoss()
+		if(stamina_health < STAMINA_NO_OVERDRAW_THRESHOLD)
+			if(warn)
+				to_chat(src, "<span class='warning'>You do not have enough action stamina to do that!</span>")
+			return FALSE
+		adjustStaminaLoss(amount * CONFIG_GET(number/stamina_combat/overdraw_penalty_factor))
+	else
+		stamina_buffer -= amount
+	if(considered_action)
+		stamina_buffer_last_use = world.time
 	UpdateStaminaBuffer()
 	return TRUE
 
@@ -20,15 +25,13 @@
   * Updates our stamina buffer amount.
   */
 /mob/living/proc/UpdateStaminaBuffer(updating_hud = TRUE)
-	if(!(combat_flags & COMBAT_FLAG_STAMINA_BUFFER))
-		return
 	var/time = world.time - stamina_buffer_regen_last
 	CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/buffer_max, buffer_max)
 	stamina_buffer_regen_last = world.time
-	if(stamina_buffer >= buffer_max)
+	if((stamina_buffer >= buffer_max) || !(combat_flags & COMBAT_FLAG_STAMINA_BUFFER))
 		stamina_buffer = buffer_max
 		return
-	else if(!time)
+	else if(!time || HAS_TRAIT(src, TRAIT_NO_STAMINA_BUFFER_REGENERATION))
 		return
 	CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/out_of_combat_timer, out_of_combat_timer)
 	CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/base_regeneration, base_regeneration)
@@ -37,7 +40,7 @@
 	CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_delay, post_action_penalty_delay)
 	CONFIG_CACHE_ENTRY_AND_FETCH_VALUE(number/stamina_combat/post_action_penalty_factor, post_action_penalty_factor)
 	var/base_regen = (SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))? base_regeneration : combat_regeneration
-	var/time_since_last_action = world.time - last_action
+	var/time_since_last_action = world.time - stamina_buffer_last_use
 	var/action_penalty = (((time_since_last_action) < (post_action_penalty_delay * 10)) && post_action_penalty_factor) || 1
 	var/out_of_combat_bonus = (time_since_last_action < (out_of_combat_timer * 10))? 0 : ((buffer_max * percent_regeneration_out_of_combat * 0.01))
 	var/regen = ((base_regen * action_penalty) + out_of_combat_bonus) * time * 0.1 * stamina_buffer_regen_mod