From 613f55c56abd0aa5241ba7c7f622c720aa27e1b1 Mon Sep 17 00:00:00 2001 From: Erki Date: Sun, 13 May 2018 22:15:55 +0300 Subject: [PATCH] Reverts alcohol changes partially (#4722) Restores old rates of gaining and losing intoxication. The strength of alcohol was implemented with the original formula in mind, you cannot simply add another curve and expect it to fit. The rate of getting drunk was way too fast (increased 7 fold!). I also doubled the rate of losing alcohol, since gains and losses typically work in balance with one another. Fixes a bug which spammed, "You're drunk" --- code/__defines/chemistry.dm | 6 +++--- code/modules/mob/living/carbon/human/intoxication.dm | 2 +- .../Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index ab44ee8387a..19cefd82cdf 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -52,9 +52,9 @@ var/list/cheartstopper = list("potassium_chloride") // Thi #define INTOX_DEATH 0.45 //How many units of intoxication to remove per second -#define INTOX_FILTER_HEALTHY 0.015 -#define INTOX_FILTER_BRUISED 0.010 -#define INTOX_FILTER_DAMAGED 0.05 +#define INTOX_FILTER_HEALTHY 0.035 +#define INTOX_FILTER_BRUISED 0.02 +#define INTOX_FILTER_DAMAGED 0.010 #define BASE_DIZZY 50 //Base dizziness from getting drunk. #define DIZZY_ADD_SCALE 15 //Amount added for every 0.01 percent over the JUDGEIMP limit diff --git a/code/modules/mob/living/carbon/human/intoxication.dm b/code/modules/mob/living/carbon/human/intoxication.dm index 8a924ce3f28..f4c3123ae58 100644 --- a/code/modules/mob/living/carbon/human/intoxication.dm +++ b/code/modules/mob/living/carbon/human/intoxication.dm @@ -136,7 +136,7 @@ var/mob/living/carbon/human/alcohol_clumsy = 0 /datum/modifier/drunk/custom_validity() var/mob/living/carbon/human/H = target - if(istype(H)) + if(!istype(H)) return 0 if(H.get_blood_alcohol() >= INTOX_MUSCLEIMP*H.species.ethanol_resistance) return 1 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 8c659f09025..43364c3665d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -130,7 +130,7 @@ /datum/reagent/alcohol/affect_ingest(mob/living/carbon/M, alien, removed) - M.intoxication += (strength * removed) * 0.075 + M.intoxication += (strength / 100) * removed if (druggy != 0) M.druggy = max(M.druggy, druggy)