From 80fb5c73825c415308778b6a815560f10041498a Mon Sep 17 00:00:00 2001 From: BonniePandora Date: Sat, 30 Nov 2024 19:38:00 +0000 Subject: [PATCH] Jank --- code/__DEFINES/chemistry.dm | 3 ++- code/modules/reagents/chemistry_properties/prop_neutral.dm | 6 +++--- code/modules/reagents/chemistry_reagents/alcohol.dm | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/chemistry.dm b/code/__DEFINES/chemistry.dm index ab5500c3069..937e6d0fcad 100644 --- a/code/__DEFINES/chemistry.dm +++ b/code/__DEFINES/chemistry.dm @@ -32,7 +32,8 @@ #define REAGENTS_OVERDOSE_CRITICAL 50 #define HIGH_REAGENTS_OVERDOSE 60 #define HIGH_REAGENTS_OVERDOSE_CRITICAL 100 - +#define VHIGH_REAGENTS_OVERDOSE 100 +#define VHIGH_REAGENTS_OVERDOSE_CRITICAL 150 // How many units of reagent are consumed per tick, by default. #define REAGENTS_METABOLISM AMOUNT_PER_TIME(1, 10 SECONDS) diff --git a/code/modules/reagents/chemistry_properties/prop_neutral.dm b/code/modules/reagents/chemistry_properties/prop_neutral.dm index 9410f6f43ce..5019f9404af 100644 --- a/code/modules/reagents/chemistry_properties/prop_neutral.dm +++ b/code/modules/reagents/chemistry_properties/prop_neutral.dm @@ -162,8 +162,8 @@ mob.slurring = min(mob.slurring + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_HIGHEXTREMEINTER * potency) /datum/chem_property/neutral/alcoholic/process_critical(mob/living/mob, potency = 1, delta_time) - mob.apply_damage(POTENCY_MULTIPLIER_LOW * potency * delta_time, TOX) - mob.apply_damage(potency * delta_time, OXY) + mob.apply_damage(POTENCY_MULTIPLIER_VVLOW * potency * delta_time, TOX) + mob.apply_damage(POTENCY_MULTIPLIER_VLOW * potency * delta_time, OXY) mob.confused = min(mob.confused + POTENCY_MULTIPLIER_MEDIUM * potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) mob.dizziness = min(mob.dizziness + POTENCY_MULTIPLIER_LOW * potency * delta_time, POTENCY_MULTIPLIER_EXTREME * potency) @@ -181,7 +181,7 @@ var/mob/living/carbon/human/human = mob var/datum/internal_organ/liver/liver = human.internal_organs_by_name["liver"] if(liver) - liver.take_damage(POTENCY_MULTIPLIER_LOW * potency, TRUE) + liver.take_damage(POTENCY_MULTIPLIER_VLOW * potency, TRUE) /datum/chem_property/neutral/hallucinogenic name = PROPERTY_HALLUCINOGENIC diff --git a/code/modules/reagents/chemistry_reagents/alcohol.dm b/code/modules/reagents/chemistry_reagents/alcohol.dm index b5db671b626..a1940994264 100644 --- a/code/modules/reagents/chemistry_reagents/alcohol.dm +++ b/code/modules/reagents/chemistry_reagents/alcohol.dm @@ -19,8 +19,8 @@ burncolor = "#6897f7" burncolormod = 2 properties = list(PROPERTY_ALCOHOLIC = 5, PROPERTY_FUELING = 3, PROPERTY_OXIDIZING = 3, PROPERTY_FLOWING = 2) - overdose = HIGH_REAGENTS_OVERDOSE - overdose_critical = HIGH_REAGENTS_OVERDOSE_CRITICAL + overdose = VHIGH_REAGENTS_OVERDOSE //I weep for every corpsman on greenshifts + overdose_critical = VHIGH_REAGENTS_OVERDOSE_CRITICAL ///higher numbers mean the booze will have an effect faster. var/boozepwr = 5 ///If it's a normal drink, let them drink a bit before they start feeling it.