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.

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

Already on GitHub? Sign in to your account

six new drinks #16320

Merged
merged 8 commits into from Sep 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion code/_globalvars/lists/reagents.dm
Expand Up @@ -44,7 +44,8 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li
"vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead",
"mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte",
"cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk",
"silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe"))
"silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe",
"arnold_palmer","gimlet","sidecar","whiskeysour","mintjulep","pinacolada"))
Copy link
Contributor

Choose a reason for hiding this comment

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

out of scope but MY GOD that entire list needs spaces after to commas.


//Liver Toxins list
GLOBAL_LIST_INIT(liver_toxins, list("toxin", "plasma", "sacid", "facid", "cyanide","amanitin", "carpotoxin"))
Expand Down
55 changes: 55 additions & 0 deletions code/modules/reagents/chemistry/reagents/alcohol.dm
Expand Up @@ -1458,3 +1458,58 @@
drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside."
taste_description = "low class heaven"
remove_nutrition = 1

/datum/reagent/consumable/ethanol/gimlet
name = "Gimlet"
id = "gimlet"
description = "A sharp cocktail dating back to the 19th century. Gin and lime, nothing else."
color = "#DEF8AB" // rgb (222, 248, 171)
alcohol_perc = 0.3
drink_icon = "gimlet"
drink_name = "Gimlet"
drink_desc = "There are debates on whether this drink should be half gin and half lime, or three parts gin and one part lime. All you know is, it's alcohol."
taste_description = "sharpness"

/datum/reagent/consumable/ethanol/sidecar
name = "Sidecar"
id = "sidecar"
description = "A citrus cocktail of cognac, lemon and orange."
color = "#D7A61E" // rgb (215, 166, 30)
alcohol_perc = 0.4
drink_icon = "sidecar"
drink_name = "Sidecar"
drink_desc = "You can smell the citrus from here!"
taste_description = "smooth cognac and tart citrus"

/datum/reagent/consumable/ethanol/whiskey_sour
name = "Whiskey Sour"
id = "whiskeysour"
description = "A tantalizing mixture of whiskey, sugar, lemon juice... and egg whites?"
color = "#E4D629" // rgb (228, 214, 41)
alcohol_perc = 0.6
drink_icon = "whiskeysour"
drink_name = "Whiskey Sour"
drink_desc = "Lemon and whiskey, with a cute foamy head!"
taste_description = "warm whiskey and sweetness"

/datum/reagent/consumable/ethanol/mint_julep
Copy link
Contributor

Choose a reason for hiding this comment

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

This and the Pina Colada are fine actually, just the others. 馃憤

name = "Mint Julep"
id = "mintjulep"
description = "A refreshing, cold mix of whiskey and mint. Perfect for summer!"
color = "#EAE2C8" // rgb (243, 226, 200)
alcohol_perc = 0.4
drink_icon = "mintjulep"
drink_name = "Mint Julep"
drink_desc = "A dainty glass of whiskey and mint on the rocks. Perfect for summer!"
taste_description = "sweet and cooling mint"

/datum/reagent/consumable/ethanol/pina_colada
name = "Pina Colada"
id = "pinacolada"
description = "Tropical deliciousness."
color = "#F9D17D" // rgb (249, 209, 125)
alcohol_perc = 0.4
drink_icon = "pinacolada"
drink_name = "Pina Colada"
drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name."
taste_description = "tart and tropical pineapple"
10 changes: 10 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_cold.dm
Expand Up @@ -177,3 +177,13 @@
/datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(5)
return ..()

/datum/reagent/consumable/drink/cold/arnold_palmer
name = "Arnold Palmer"
id = "arnold_palmer"
description = "A wholesome mixture of lemonade and iced tea."
color = "#8B5427" // rgb: 139, 84, 39
drink_icon = "arnoldpalmer"
drink_name = "Arnold Palmer"
drink_desc = "A wholesome mixture of lemonade and iced tea... looks like somebody didn't stir this one very well."
taste_description = "sweet and fizzy"
48 changes: 48 additions & 0 deletions code/modules/reagents/chemistry/recipes/drinks.dm
Expand Up @@ -902,3 +902,51 @@
result_amount = 3
mix_message = "The ingredients mix into a dark brown godly substance"
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/chemical_reaction/arnold_palmer
name = "Arnold Palmer"
id = "arnold_palmer"
result = "arnold_palmer"
required_reagents = list("icetea" = 1, "lemonade" = 1)
result_amount = 2
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/chemical_reaction/gimlet
name = "Gimlet"
id = "gimlet"
result = "gimlet"
required_reagents = list("gin" = 1, "limejuice" = 1)
result_amount = 2
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/chemical_reaction/sidecar
name = "Sidecar"
id = "sidecar"
result = "sidecar"
required_reagents = list("cognac" = 1, "orangejuice" = 1, "lemonjuice" = 1)
result_amount = 3
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/chemical_reaction/whiskey_sour
name = "Whiskey Sour"
id = "whiskeysour"
result = "whiskeysour"
required_reagents = list("whiskey" = 1, "lemonjuice" = 1, "sugar" = 1, "egg" = 1)
result_amount = 4
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/chemical_reaction/mint_julep
name = "Mint Julep"
id = "mintjulep"
result = "mintjulep"
required_reagents = list("whiskey" = 1, "sugar" = 1, "ice" = 1, "mint" = 1)
result_amount = 4
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'

/datum/chemical_reaction/pina_colada
name = "Pina Colada"
id = "pinacolada"
result = "pinacolada"
required_reagents = list("rum" = 3, "pineapplejuice" = 2, "cream" = 1)
result_amount = 6
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
Binary file modified icons/obj/drinks.dmi
Binary file not shown.