Skip to content

BugfixesGaloreV2 #5750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2025
Merged

BugfixesGaloreV2 #5750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
name = "Natural " + name
if(data["boozepwr"])
boozepwr = data["boozepwr"]
addiction_types = list(/datum/addiction/alcohol = 0.05 * boozepwr)
addiction_types += list(/datum/addiction/alcohol = 0.05 * boozepwr)
Copy link
Collaborator

@LikeLakers2 LikeLakers2 Mar 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addiction_types is null by default, so:

Suggested change
addiction_types += list(/datum/addiction/alcohol = 0.05 * boozepwr)
LAZYSET(addiction_types, /datum/addiction/alcohol, 0.05 * boozepwr) //MONKESTATION EDIT: Don't override the existing list

return ..()

/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
Expand Down Expand Up @@ -147,6 +147,7 @@
boozepwr = 45
ph = 6
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 4)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 4)
addiction_types = list(/datum/addiction/coffee = 4) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick)
Expand Down Expand Up @@ -196,6 +197,7 @@
overdose_threshold = 60
taste_description = "jitters and death"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(,/datum/addiction/coffee = 5)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(,/datum/addiction/coffee = 5)
addiction_types = list(/datum/addiction/coffee = 5) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
drinker.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick)
Expand Down Expand Up @@ -628,6 +630,7 @@
glass_price = DRINK_PRICE_EASY
metabolized_traits = list(TRAIT_FEARLESS, TRAIT_ANALGESIA)
var/tough_text
addiction_types = list(/datum/addiction/coffee = 1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 1)
addiction_types = list(/datum/addiction/coffee = 1) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/drinker)
. = ..()
Expand Down Expand Up @@ -792,6 +795,7 @@
taste_description = "angry and irish"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_EASY
addiction_types = list(/datum/addiction/coffee = 3)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 3)
addiction_types = list(/datum/addiction/coffee = 3) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/b52/on_mob_metabolize(mob/living/drinker)
. = ..()
Expand All @@ -805,6 +809,7 @@
quality = DRINK_NICE
taste_description = "giving up on the day"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 4)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 4)
addiction_types = list(/datum/addiction/coffee = 4) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/margarita
name = "Margarita"
Expand All @@ -824,6 +829,7 @@
quality = DRINK_NICE
taste_description = "bitterness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 2)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 2)
addiction_types = list(/datum/addiction/coffee = 2) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/manhattan
name = "Manhattan"
Expand Down Expand Up @@ -942,6 +948,7 @@
taste_description = "bitter iron"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
bypass_restriction = TRUE
addiction_types = list(/datum/addiction/coffee = 1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 1)
addiction_types = list(/datum/addiction/coffee = 1) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/devilskiss/on_mob_metabolize(mob/living/metabolizer)
. = ..()
Expand Down Expand Up @@ -1004,6 +1011,7 @@
quality = DRINK_GOOD
taste_description = "pineapple, coconut, and a hint of coffee"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 1)
addiction_types = list(/datum/addiction/coffee = 1) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/singulo
name = "Singulo"
Expand Down Expand Up @@ -1184,6 +1192,7 @@
quality = DRINK_GOOD
taste_description = "psychic links"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 2)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 2)
addiction_types = list(/datum/addiction/coffee = 2) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/erikasurprise
name = "Erika Surprise"
Expand Down Expand Up @@ -2162,6 +2171,7 @@
taste_description = "fiery, with an aftertaste of burnt flesh"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
bypass_restriction = TRUE
addiction_types = list(/datum/addiction/coffee = 1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 1)
addiction_types = list(/datum/addiction/coffee = 1) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
Expand Down Expand Up @@ -2285,6 +2295,7 @@
quality = DRINK_GOOD
taste_description = "strikes and gutters"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 1)
addiction_types = list(/datum/addiction/coffee = 1) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/drunken_espatier
name = "Drunken Espatier"
Expand Down Expand Up @@ -2786,6 +2797,7 @@
quality = DRINK_NICE
taste_description = "COCONUT"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 1)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 1)
addiction_types = list(/datum/addiction/coffee = 1) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/maui_sunrise //coconut rum, pineapple juice, yuyake, triple citrus, lemon-lime soda
name = "Maui Sunrise"
Expand Down Expand Up @@ -2813,6 +2825,7 @@
quality = DRINK_NICE
taste_description = "coconut coffee"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
addiction_types = list(/datum/addiction/coffee = 4)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
addiction_types = list(/datum/addiction/coffee = 4)
addiction_types = list(/datum/addiction/coffee = 4) //MONKESTATION EDIT: Add coffee addiction


/datum/reagent/consumable/ethanol/blue_hawaiian //pineapple juice, lemon juice, coconut rum, blue curacao
name = "Blue Hawaiian"
Expand Down
Loading