From 7d99cf8637e3e3e76eaabf59bd5efcc8a814778d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 23 Sep 2023 20:34:57 +0200 Subject: [PATCH] [MIRROR] Fixes Epinephrine Healing [MDB IGNORE] (#23866) * Fixes Epinephrine Healing (#78479) ## About The Pull Request As described in #78474, epinephrine wasn't properly updating health when it healed people in crit. This meant that people stayed in crit despite not being damaged enough to reach the crit threshold (at least until something else updated their health). This fixes that. Closes #78474. ## Why It's Good For The Game Epinephrine should actually get people out of crit. ## Changelog :cl: fix: Epinephrine will now update health properly. /:cl: * Fixes Epinephrine Healing --------- Co-authored-by: GPeckman <21979502+GPeckman@users.noreply.github.com> --- code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 6e2b12a95eb..19edf2ec157 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -854,7 +854,6 @@ ..() /datum/reagent/medicine/epinephrine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) - . = TRUE if(holder.has_reagent(/datum/reagent/toxin/lexorin)) holder.remove_reagent(/datum/reagent/toxin/lexorin, 2 * REM * seconds_per_tick) holder.remove_reagent(/datum/reagent/medicine/epinephrine, 1 * REM * seconds_per_tick) @@ -877,7 +876,8 @@ affected_mob.adjustStaminaLoss(-0.5 * REM * seconds_per_tick, 0) if(SPT_PROB(10, seconds_per_tick)) affected_mob.AdjustAllImmobility(-20) - return ..() + ..() + return TRUE /datum/reagent/medicine/epinephrine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired) if(SPT_PROB(18, REM * seconds_per_tick))