Skip to content
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

Jump to bottom

Adds 2 spacemas related alcoholic beverages #17363

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Adds 2 spacemas related alcoholic beverages #17363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e6bfaa
added drinks
Valtsu0 Dec 17, 2023
aeb173e
Renamed Glögg to more general Mulled Wine
Valtsu0 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions code/modules/chemistry/Chemistry-Recipes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,6 +1950,30 @@
mix_sound = 'sound/misc/drinkfizz.ogg'
drinkrecipe = TRUE

cocktail_mulled_wine
name = "Mulled Wine"
id = "mulled_wine"
result = "mulled_wine"
required_reagents = list("wine" = 1, "cinnamon" = 1, "sugar" = 1)
result_amount = 3
mix_phrase = "You feel slightly warmer already."
mix_sound = 'sound/misc/drinkfizz.ogg'
drinkrecipe = TRUE

cocktail_spacemas_spirit
name = "Spacemas Spirit"
id = "spacemas_spirit"
result = "spacemas_spirit"
required_reagents = list("mulled_wine" = 1, "vodka" = 1)
result_amount = 2
#ifdef XMAS
mix_phrase = "You feel like giving gifts already."
#else
mix_phrase = "It's not spacemas yet!."
#endif
mix_sound = 'sound/misc/drinkfizz.ogg'
drinkrecipe = TRUE

cola
name = "cola"
id = "cola"
Expand Down
38 changes: 38 additions & 0 deletions code/modules/chemistry/Reagents-FoodDrink.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,6 +1985,44 @@ datum
reagent_state = LIQUID
taste ="medicinal"

fooddrink/alcoholic/mulled_wine
name = "Mulled Wine"
id = "mulled_wine"
fluid_r = 188
fluid_g = 0
fluid_b = 22
alch_strength = 0.13
description = "A traditional drink during winter."
reagent_state = LIQUID
taste = "sweet"

fooddrink/alcoholic/spacemas_spirit
name = "Spacemas Spirit"
id = "spacemas_spirit"
fluid_r = 226
fluid_g = 0
fluid_b = 26
alch_strength = 0.5
#ifdef XMAS
description = "Will warm your heart."
#else
description = "It's not spacemas yet!."
#endif
reagent_state = LIQUID
taste = "sweet"

on_mob_life(var/mob/M, var/mult = 1)
if (prob(5))
if (M.mind.special_role == ROLE_GRINCH)
boutput(M, pick("You lament your past memories with nostalgia and deep regret.", "You think about how your greed and selfishness hurts others.",
"You imagine yourself dying alone."))
else
boutput(M, pick("You feel like your heart grew a size!", "You are overcome with joy!", "You feel generous!", "You feel compassionate!"))
modify_christmas_cheer(1)

..()
return

fooddrink/sodawater
name = "soda water"
id = "sodawater"
Expand Down