From 0b1b249ebaeb4d60153277897665004a27f3cce0 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 24 Dec 2019 23:53:33 -0800 Subject: [PATCH] just makes alcohol toxic rather than drunk-inducing --- .../reagents/chemistry/reagents/alcohol_reagents.dm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 7ba4a74ff4..7a77ffd180 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -36,7 +36,9 @@ All effects don't start immediately, but rather get worse over time; the rate is */ /datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C) - if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER) + if(HAS_TRAIT(L, TRAIT_NO_ALCOHOL)) + C.adjustToxLoss((boozepwr/25)*REM,forced = TRUE) + else if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER) var/booze_power = boozepwr if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker booze_power *= 0.7 @@ -77,14 +79,6 @@ All effects don't start immediately, but rather get worse over time; the rate is // +10% success propability on each step, useful while operating in less-than-perfect conditions return ..() -/datum/reagent/consumable/ethanol/on_mob_add(mob/living/L,amount) - if(HAS_TRAIT(L, TRAIT_NO_ALCOHOL) && boozepwr > 0) - if(iscarbon(L)) - var/mob/living/carbon/C = L - C.vomit() - L.reagents.remove_all_type(/datum/reagent/consumable/ethanol, amount*4, 0, 1) - return ..() - /datum/reagent/consumable/ethanol/beer name = "Beer" id = "beer"