From b3bec16c2c0b00e9fca5e7e5df4d43af98239b1d Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Sat, 24 Feb 2024 21:24:31 +0300 Subject: [PATCH] Fix non-consumable Ahdomai's Eclipse (#24277) * Fix non-consumable Ahdomai's Eclipse * Apply some refactoring * Better call parent first * Apply DGamerL suggestions Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/modules/reagents/chemistry/reagents/alcohol.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 7314ed61bdb..ac51cdc9cad 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1567,13 +1567,12 @@ drink_name = "Ahdomai's Eclipse" drink_desc = "Blizzard in a glass. Tajaran signature drink!" taste_description = "ice" + var/min_achievable_temp = 250 /datum/reagent/consumable/ethanol/ahdomai_eclipse/on_mob_life(mob/living/M) - if(!istajaran(M)) - return ..() - if(M.bodytemperature > 250) - M.bodytemperature = max(250, M.bodytemperature - (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) - + . = ..() + if(istajaran(M) && M.bodytemperature > min_achievable_temp) + M.bodytemperature = max(min_achievable_temp, M.bodytemperature - (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) /datum/reagent/consumable/ethanol/beach_feast name = "Feast by the Beach"