diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 3d98a82914..6248be0de5 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -96,7 +96,7 @@
 		return
 	if(is_species(L, /datum/species/lizard/ashwalker))
 		if(L.getStaminaLoss() < (STAMINA_CRIT - 40))
-			L.adjustStaminaLos(4)
+			L.adjustStaminaLoss(4)
 		return
 	L.adjustFireLoss(4)
 
diff --git a/code/game/objects/items/electrostaff.dm b/code/game/objects/items/electrostaff.dm
index bc2c965b12..0ee58c6b16 100644
--- a/code/game/objects/items/electrostaff.dm
+++ b/code/game/objects/items/electrostaff.dm
@@ -170,7 +170,7 @@
 		turn_off()
 
 /obj/item/electrostaff/attack(mob/living/target, mob/living/user)
-	if(IS_STAMCRIT(user) || !UseStaminaBuffer(stam_cost))//CIT CHANGE - makes it impossible to baton in stamina softcrit
+	if(IS_STAMCRIT(user) || !user.UseStaminaBuffer(stam_cost))//CIT CHANGE - makes it impossible to baton in stamina softcrit
 		to_chat(user, "<span class='danger'>You're too exhausted to use [src] properly.</span>")//CIT CHANGE - ditto
 		return //CIT CHANGE - ditto
 	if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index 1e8668b6e2..bd83404356 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -77,7 +77,7 @@
 		to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
 		return FALSE
 	var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT)
-	if(!UseStaminaBuffer(weight, warn = TRUE))
+	if(!user.UseStaminaBuffer(weight, warn = TRUE))
 		return FALSE
 	var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
 	var/turf/T = get_turf(src)
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 4a9c4e6311..e02bde2abc 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -68,12 +68,13 @@
 	// can always implement it later, whatever.
 	if((data.parry_respect_clickdelay && !CheckActionCooldown()) || ((parry_end_time_last + data.parry_cooldown) > world.time))
 		to_chat(src, "<span class='warning'>You are not ready to parry (again)!</span>")
-		return
+		return FALSE
 	// Point of no return, make sure everything is set.
 	parrying = method
 	if(method == ITEM_PARRY)
 		active_parry_item = using_item
-	adjustStaminaLossBuffered(data.parry_stamina_cost)
+	if(!UseStaminaBuffer(data.parry_stamina_cost, TRUE))
+		return FALSE
 	parry_start_time = world.time
 	successful_parries = list()
 	addtimer(CALLBACK(src, .proc/end_parry_sequence), full_parry_duration)
diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm
index 47dae8849d..3bc7943c67 100644
--- a/code/modules/mob/living/living_blocking_parrying.dm
+++ b/code/modules/mob/living/living_blocking_parrying.dm
@@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 /mob/living/proc/handle_block_parry(seconds = 1)
 	if(combat_flags & COMBAT_FLAG_ACTIVE_BLOCKING)
 		var/datum/block_parry_data/data = return_block_parry_datum(active_block_item.block_parry_data)
-		adjustStaminaLossBuffered(data.block_stamina_cost_per_second * seconds)
+		UseStaminaBuffer(data.block_stamina_cost_per_second * seconds)
 
 /mob/living/on_item_dropped(obj/item/I)
 	if(I == active_block_item)