From e5249a98ed5d5923a0a4b0d34ed292f3d0d7831f Mon Sep 17 00:00:00 2001 From: danni-boy <32673848+danni-boy@users.noreply.github.com> Date: Wed, 7 Jul 2021 09:22:59 +0100 Subject: [PATCH 1/7] tested n ready --- code/_globalvars/lists/reagents.dm | 3 +- .../reagents/chemistry/reagents/alcohol.dm | 55 ++++++++++++++++++ .../reagents/chemistry/reagents/drink_cold.dm | 10 ++++ .../reagents/chemistry/recipes/drinks.dm | 48 +++++++++++++++ icons/obj/drinks.dmi | Bin 91296 -> 94156 bytes 5 files changed, 115 insertions(+), 1 deletion(-) diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index 0684be758cd..9477c91fd04 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -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")) //Liver Toxins list GLOBAL_LIST_INIT(liver_toxins, list("toxin", "plasma", "sacid", "facid", "cyanide","amanitin", "carpotoxin")) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 94172e14f0e..b5ebd67c0a4 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -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 + 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" diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index 3d225263359..8a27ec9f7a2 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -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" diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index 1bdb91f1ab6..f03ae9b316b 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -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' diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index fb7c28c3f6dac39e4a8ba9152269b2c8c1817d7d..02b2cff8a8dd00c36d1f815482fa44599b0818ef 100644 GIT binary patch delta 19544 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 b)i(s0XjU9q!uy>Q2>2x>E-zLgYT*BWD+X(q From c9d5e525b75d86451bee0021f28713f8c30dff92 Mon Sep 17 00:00:00 2001 From: danni boi <16391918+thatdanguy23@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:27:19 +0100 Subject: [PATCH 2/7] tab indents r e e Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- .../reagents/chemistry/reagents/alcohol.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index b5ebd67c0a4..8bb6270df0f 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1460,15 +1460,15 @@ 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" + 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" From e633a7a20d5deb894ee1fe106df3ffd0e4676a25 Mon Sep 17 00:00:00 2001 From: danni boi <16391918+thatdanguy23@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:27:31 +0100 Subject: [PATCH 3/7] tab indents r e e Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- .../reagents/chemistry/reagents/alcohol.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 8bb6270df0f..1f16d43c361 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1471,15 +1471,15 @@ 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" + 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" From bcee469b58b4d2c5194d77abff5e62bd51d06fce Mon Sep 17 00:00:00 2001 From: danni boi <16391918+thatdanguy23@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:27:40 +0100 Subject: [PATCH 4/7] tab indents r e e Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- .../reagents/chemistry/reagents/alcohol.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 1f16d43c361..0a642571f99 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1482,15 +1482,15 @@ 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" + 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 name = "Mint Julep" From 824b3c4cfccd2421017454a7572c36f937bfbcdb Mon Sep 17 00:00:00 2001 From: danni boi <16391918+thatdanguy23@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:27:49 +0100 Subject: [PATCH 5/7] tab indents r e e Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/modules/reagents/chemistry/reagents/drink_cold.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index 8a27ec9f7a2..2e91c336502 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -185,5 +185,5 @@ 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." + 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" From 90168d8d233ff3e0ef1e8fcc5716ed6f92b83197 Mon Sep 17 00:00:00 2001 From: danni boi <16391918+thatdanguy23@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:35:47 +0100 Subject: [PATCH 6/7] please be nice daddy github, we just want to fix indents Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/modules/reagents/chemistry/reagents/alcohol.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 0a642571f99..fa2765e54b4 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1484,7 +1484,7 @@ /datum/reagent/consumable/ethanol/whiskey_sour name = "Whiskey Sour" id = "whiskeysour" - description = "A tantalizing mixture of whiskey, sugar, lemon juice...and egg whites?" + 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" From c8fdbc32ff096c46a2c69133b2b53a9037217268 Mon Sep 17 00:00:00 2001 From: danni boi <16391918+thatdanguy23@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:43:34 +0100 Subject: [PATCH 7/7] Update code/modules/reagents/chemistry/reagents/drink_cold.dm Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- .../reagents/chemistry/reagents/drink_cold.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index 2e91c336502..e589b07cf03 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -179,11 +179,11 @@ 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" + 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" + taste_description = "sweet and fizzy"