From 75cf80baed54cbb59e7325b8c9873c8ca5288732 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Tue, 27 Jan 2026 14:23:46 -0600 Subject: [PATCH] Epinephrine and Inexorable interacts better, also gives `NOCRITDAMAGE` to Atropine (#94851) --- code/datums/mutations/body.dm | 4 +++- code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 4fe07773ca8..c20046d3fe2 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -701,7 +701,9 @@ /datum/mutation/inexorable/on_life(seconds_per_tick) if(owner.health > owner.crit_threshold || owner.stat != CONSCIOUS || HAS_TRAIT(owner, TRAIT_STASIS)) return - // Gives you 30 seconds of being in soft crit... give or take + if(HAS_TRAIT(owner, TRAIT_NOCRITDAMAGE) && owner.health <= owner.hardcrit_threshold + 10) + return + // Gives you 30 seconds of being in fake soft crit... give or take if(HAS_TRAIT(owner, TRAIT_TOXIMMUNE) || HAS_TRAIT(owner, TRAIT_TOXINLOVER)) owner.adjust_brute_loss(1 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE) else diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index c5357772f04..93d5420c3ec 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -951,7 +951,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED inverse_chem_val = 0.35 inverse_chem = /datum/reagent/inverse/atropine - added_traits = list(TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION) + added_traits = list(TRAIT_NOCRITDAMAGE, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION) /datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..()