Stamina Exhaustion Adjustments (#12063)

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

@@ -553,6 +553,7 @@
 	if (!H.exhaust_threshold)
 		return 1 // Handled.
 
+	cost += H.getOxyLoss() * 0.1 //The less oxygen we get, the more we strain. 
 	cost *= H.sprint_cost_factor
 	if (H.stamina == -1)
 		log_debug("Error: Species with special sprint mechanics has not overridden cost function.")
@@ -588,14 +589,15 @@
 		if(O.is_bruised())
 			H.adjustOxyLoss(remainder*0.15)
 			H.adjustHalLoss(remainder*0.25)
+		H.adjustOxyLoss(remainder * 0.2) //Keeping oxyloss small when out of stamina to prevent old issue where running until exhausted sometimes gave you brain damage.
 
 	if(!pre_move)
-		H.adjustHalLoss(remainder*0.25)
+		H.adjustHalLoss(remainder*0.3)
 		H.updatehealth()
 		if((H.get_shock() >= 10) && prob(H.get_shock() *2))
 			H.flash_pain(H.get_shock())
 
-	if((H.get_shock() + H.getOxyLoss()) >= (exhaust_threshold * 0.8))
+	if((H.get_shock() + H.getOxyLoss()*2) >= (exhaust_threshold * 0.8))
 		H.m_intent = M_WALK
 		H.hud_used.move_intent.update_move_icon(H)
 		to_chat(H, SPAN_DANGER("You're too exhausted to run anymore!"))

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm

@@ -923,10 +923,6 @@
 	messagedelay = MEDICATION_MESSAGE_DELAY * 0.75
 	goodmessage = list("You feel good.","You feel relaxed.","You feel alert and focused.")
 
-/decl/reagent/mental/nicotine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)
-	. = ..()
-	M.add_chemical_effect(CE_PAINKILLER, 5)
-
 /decl/reagent/mental/nicotine/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/scale, var/datum/reagents/holder)
 	. = ..()
 	M.adjustOxyLoss(10 * removed * scale)

html/changelogs/Doxxmedearly - stamina_related_changes.yml

@@ -0,0 +1,8 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+  - tweak: "Tweaked some things regarding running with no stamina. It now does oxy damage and takes oxy damage more into account when determining your exhaustion threshold. It's also very slightly more painful. Overall, this reduces the total time you can do this by a small amount."
+  - rscdel: "Nicotine no longer acts as a painkiller."
+  - bugfix: "The above changes fix a bug where smoking could practically give you unlimited sprinting."