cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stamina Exhaustion Adjustments (#12063)

Browse Source
This commit is contained in:
Doxxmedearly
2021-06-21 16:46:09 -04:00
committed by GitHub
parent 2719c9fce8
commit d2e10c4ecd
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -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!"))

4
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
View File

@@ -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)