changes

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

@@ -623,7 +623,7 @@
 		filters -= CIT_FILTER_STAMINACRIT
 		update_mobility()
 	update_health_hud()
-
+	
 /mob/living/carbon/update_sight()
 	if(!client)
 		return

code/modules/mob/living/carbon/human/species.dm

@@ -1593,7 +1593,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		return FALSE
 
 	else if(aim_for_mouth && ( target_on_help || target_restrained || target_aiming_for_mouth))
-		if(!UseStaminaBuffer(3, warn = TRUE))
+		if(!user.UseStaminaBuffer(3, warn = TRUE))
 			return
 		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
 
@@ -1874,9 +1874,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(CHECK_MOBILITY(user, MOBILITY_STAND))
 			to_chat(user, "<span class='notice'>You can only force yourself up if you're on the ground.</span>")
 			return
+		if(!user.UseStaminaBuffer(STAMINA_COST_SHOVE_UP, TRUE))
+			return
 		user.visible_message("<span class='notice'>[user] forces [p_them()]self up to [p_their()] feet!</span>", "<span class='notice'>You force yourself up to your feet!</span>")
 		user.set_resting(FALSE, TRUE)
-		user.adjustStaminaLossBuffered(user.stambuffer) //Rewards good stamina management by making it easier to instantly get up from resting
 		playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
 /datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)

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

@@ -531,12 +531,6 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 		incomingstammult = max(0.01, incomingstammult)
 		incomingstammult = min(1, incomingstammult*2)
 
-	//CIT CHANGES START HERE. STAMINA BUFFER STUFF
-	if(bufferedstam && world.time > stambufferregentime)
-		var/drainrate = max((bufferedstam*(bufferedstam/(5)))*0.1,1)
-		bufferedstam = max(bufferedstam - drainrate, 0)
-	//END OF CIT CHANGES
-
 	var/restingpwr = 1 + 4 * !CHECK_MOBILITY(src, MOBILITY_STAND)
 
 	//Dizziness

code/modules/projectiles/gun.dm

@@ -594,6 +594,9 @@
 		update_icon()
 
 /obj/item/gun/proc/getinaccuracy(mob/living/user, bonus_spread, stamloss)
+	return 0		// Replacement TBD: Exponential curved aim instability system.
+
+/*
 	if(inaccuracy_modifier == 0)
 		return bonus_spread
 	var/base_inaccuracy = weapon_weight * 25 * inaccuracy_modifier
@@ -610,6 +613,7 @@
 	if(mult < 0) //accurate weapons should provide a proper bonus with negative inaccuracy. the opposite is true too.
 		mult *= 1/inaccuracy_modifier
 	return max(bonus_spread + (base_inaccuracy * mult), 0) //no negative spread.
+*/
 
 /obj/item/gun/proc/getstamcost(mob/living/carbon/user)
 	. = recoil