From 86d15d8fb3e9afa846ee19690be576fdc591ac6a Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Mon, 19 Oct 2020 02:46:36 -0700 Subject: [PATCH] Fixed species-specific drinks not giving a mood boost if right species (#13585) * Species drink moodboost fix * code cleanup * Revert "code cleanup" This reverts commit fa308a2acd213b085308ebf3595d08463cbcd7be. * code cleanup * meant to make this 26 not 30 * Committing Putnam's suggestion Co-authored-by: Putnam3145 Co-authored-by: Putnam3145 --- .../chemistry/reagents/alcohol_reagents.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index bbc44730b6..a8d5c3d277 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2279,15 +2279,16 @@ All effects don't start immediately, but rather get worse over time; the rate is //////////////////// /datum/reagent/consumable/ethanol/species_drink var/species_required - var/disgust = 25 + var/disgust = 26 boozepwr = 50 -/datum/reagent/consumable/ethanol/species_drink/on_mob_life(mob/living/carbon/C) - if(C.dna.species && C.dna.species.species_category == species_required) //species have a species_category variable that refers to one of the drinks - quality = RACE_DRINK - else - C.adjust_disgust(disgust) - return ..() +/datum/reagent/consumable/ethanol/species_drink/reaction_mob(mob/living/carbon/C, method=TOUCH) + if(method == INGEST) + if(C?.dna?.species?.species_category == species_required) //species have a species_category variable that refers to one of the drinks + quality = RACE_DRINK + else + C.adjust_disgust(disgust) + return ..() /datum/reagent/consumable/ethanol/species_drink/coldscales name = "Coldscales"