From 88222c0901d3b148f6e7d5a709d327a3bbbc194b Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 24 Dec 2019 23:58:22 -0800 Subject: [PATCH] uh, actually did that --- code/datums/traits/neutral.dm | 6 ++---- .../modules/reagents/chemistry/reagents/alcohol_reagents.dm | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 83ae3dd784..0ae8d5914f 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -153,12 +153,10 @@ /datum/quirk/alcohol_intolerance name = "Alcohol Intolerance" - desc = "Your body just can't handle alcohol at all. You don't get drunk faster, you just vomit it right back up as soon as you taste any." + desc = "You take toxin damage from alcohol rather than getting drunk." value = 0 mob_trait = TRAIT_NO_ALCOHOL - gain_text = "Just smelling alcohol makes you feel a little sick." - lose_text = "You no longer feel like vomiting just from the thought of alcohol." - medical_record_text = "Patient's body violently rejects ethyl alcohol." + medical_record_text = "Patient's body does not react properly to ethyl alcohol." /datum/quirk/alcohol_intolerance/add() var/mob/living/carbon/human/H = quirk_holder diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 7a77ffd180..077ab1fb7a 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -36,7 +36,7 @@ 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(HAS_TRAIT(L, TRAIT_NO_ALCOHOL)) + if(HAS_TRAIT(C, TRAIT_NO_ALCOHOL)) C.adjustToxLoss((boozepwr/25)*REM,forced = TRUE) else if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER) var/booze_power = boozepwr