From 38cc02322e496ea8bfbe6ac0c20db5dfbf475310 Mon Sep 17 00:00:00 2001 From: Leland Kemble <70413276+lelandkemble@users.noreply.github.com> Date: Fri, 17 Apr 2026 21:53:13 -0400 Subject: [PATCH] Fixes stimulants not regenerating stamina in otherwise healthy people (#95764) ## About The Pull Request Stimulants only updated health if non-stamina damage was healed. ## Why It's Good For The Game fixes #95761 ## Changelog :cl: fix: stimulants properly regenerate stamina in otherwise healthy people /:cl: --- .../reagents/chemistry/reagents/medicine_reagents.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 7a888f9f951..b80f70594d3 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1381,17 +1381,18 @@ /datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() + var/need_mob_update if(affected_mob.health < 50 && affected_mob.health > 0) var/heal = -1 * metabolization_ratio * seconds_per_tick - var/need_mob_update need_mob_update += affected_mob.adjust_oxy_loss(heal, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) need_mob_update += affected_mob.adjust_tox_loss(heal, updating_health = FALSE, required_biotype = affected_biotype) need_mob_update += affected_mob.adjust_brute_loss(heal, updating_health = FALSE, required_bodytype = affected_bodytype) need_mob_update += affected_mob.adjust_fire_loss(heal, updating_health = FALSE, required_bodytype = affected_bodytype) - if(need_mob_update) - . = UPDATE_MOB_HEALTH + affected_mob.AdjustAllImmobility(-60 * metabolization_ratio * seconds_per_tick) - affected_mob.adjust_stamina_loss(-12 * metabolization_ratio * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype) + need_mob_update += affected_mob.adjust_stamina_loss(-12 * metabolization_ratio * seconds_per_tick, updating_stamina = FALSE, required_biotype = affected_biotype) + if(need_mob_update) + return UPDATE_MOB_HEALTH /datum/reagent/medicine/stimulants/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) . = ..()