From af3b212339b012f5fe9d1ee50d1aa191bf1a6a81 Mon Sep 17 00:00:00 2001 From: Mako Date: Sun, 5 Jun 2022 14:41:45 -0700 Subject: [PATCH 1/8] initial reagent Stout Beer --- .../reagents/chemistry/reagents/alcohol_reagents.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 0fd1dbdc2ded..a470dc2cdb3a 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -87,6 +87,14 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of beer" glass_desc = "A freezing pint of beer." +/datum/reagent/consumable/ethanol/beer/stout + name = "Stout Beer" + description = "a darker colored beer, made of barley and roast malt." + color = "#221915" // rgb: 34, 25, 21 + taste_description = "malt and chocolate" + glass_name = "glass of stout" + glass_desc = "a cold pint of 'genius' brand stout." + /datum/reagent/consumable/ethanol/beer/light name = "Light Beer" description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content." @@ -2358,4 +2366,3 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "Glass of Amber Moon" glass_desc = "A strange cocktail with a cracked egg believed to treat hangovers." shot_glass_icon_state = "ambermoonshotglass" - From 17054285ff05baab8b2f917c6ba3a82e7cbf6fa2 Mon Sep 17 00:00:00 2001 From: Mako Date: Sun, 5 Jun 2022 15:11:31 -0700 Subject: [PATCH 2/8] bottle for stout --- code/modules/food_and_drinks/drinks/drinks/bottle.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 25c16e1a8d64..c220e5882651 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -565,4 +565,10 @@ name = "Luini Amaretto" desc = "A gentle and syrup like drink, tastes of almonds and apricots" icon_state = "disaronno" - list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100) \ No newline at end of file + list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100) + +/obj/item/reagent_containers/food/drinks/bottle/beer/stout + name = "Genius Dry Stout" + desc = "A fresh bottle of stout, popularized by inhabitants of Space Ireland." + icon_state = "Guinness" + list_reagents = list(/datum/reagent/consumable/ethanol/beer/stout = 50) \ No newline at end of file From c7f5e31bbecc1825a9930d46882ca802350be195 Mon Sep 17 00:00:00 2001 From: Mako Date: Sun, 5 Jun 2022 15:48:02 -0700 Subject: [PATCH 3/8] minor edits --- code/modules/food_and_drinks/drinks/drinks/bottle.dm | 6 +++--- code/modules/vending/boozeomat.dm | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index c220e5882651..21b168e63f59 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -567,8 +567,8 @@ icon_state = "disaronno" list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100) -/obj/item/reagent_containers/food/drinks/bottle/beer/stout +/obj/item/reagent_containers/food/drinks/beer/stout name = "Genius Dry Stout" desc = "A fresh bottle of stout, popularized by inhabitants of Space Ireland." - icon_state = "Guinness" - list_reagents = list(/datum/reagent/consumable/ethanol/beer/stout = 50) \ No newline at end of file + icon_state = "beer" //remember to replace!! + list_reagents = list(/datum/reagent/consumable/ethanol/beer/stout = 40) \ No newline at end of file diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 64fc5fddef3b..06b9519e5fc7 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -18,6 +18,7 @@ /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, /obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/beer = 6, + /obj/item/reagent_containers/food/drinks/beer/stout = 12, /obj/item/reagent_containers/food/drinks/bottle/maltliquor = 6, /obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, @@ -35,7 +36,7 @@ /obj/item/reagent_containers/food/drinks/bottle/sake = 5, /obj/item/reagent_containers/food/drinks/bottle/applejack = 5, /obj/item/reagent_containers/food/drinks/bottle = 15, - /obj/item/reagent_containers/food/drinks/bottle/small = 15) + /obj/item/reagent_containers/food/drinks/bottle/small = 15,) contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12, /obj/item/reagent_containers/food/drinks/bottle/fernet = 5) premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4, From e36f22ddd9234ede7a3f677810c6f361a851eeb3 Mon Sep 17 00:00:00 2001 From: Mako Date: Sun, 5 Jun 2022 20:52:06 -0700 Subject: [PATCH 4/8] adds first cocktail and sprites --- .../food_and_drinks/drinks/drinks/bottle.dm | 2 +- .../food_and_drinks/recipes/drinks_recipes.dm | 6 ++++++ .../chemistry/reagents/alcohol_reagents.dm | 10 ++++++++++ icons/obj/drinks.dmi | Bin 101572 -> 102261 bytes 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 21b168e63f59..c5939aa507ab 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -570,5 +570,5 @@ /obj/item/reagent_containers/food/drinks/beer/stout name = "Genius Dry Stout" desc = "A fresh bottle of stout, popularized by inhabitants of Space Ireland." - icon_state = "beer" //remember to replace!! + icon_state = "stout_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/beer/stout = 40) \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 046850a3e98f..b933dd3aff5b 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -864,3 +864,9 @@ id = /datum/reagent/consumable/ethanol/ambermoon results = list(/datum/reagent/consumable/ethanol/ambermoon = 10) required_reagents = list(/datum/reagent/consumable/eggyolk = 5, /datum/reagent/consumable/ethanol/whiskey = 5, /datum/reagent/consumable/capsaicin = 1) + +/datum/chemical_reaction/irishflip + name = "Irish Flip" + id = /datum/reagent/consumable/ethanol/beer/stout/irishflip + results = list(/datum/reagent/consumable/ethanol/beer/stout/irishflip = 5) + required_reagents = list(/datum/reagent/consumable/eggyolk = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/ethanol/irish_cream = 3 ) \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index a470dc2cdb3a..51cdb93cd309 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -87,6 +87,7 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of beer" glass_desc = "A freezing pint of beer." +//////////STOUT AND ITS COCKTAILS////////// /datum/reagent/consumable/ethanol/beer/stout name = "Stout Beer" description = "a darker colored beer, made of barley and roast malt." @@ -95,6 +96,15 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "glass of stout" glass_desc = "a cold pint of 'genius' brand stout." +/datum/reagent/consumable/ethanol/beer/stout/irishflip + name = "Irish Flip" + description = "A creamy stout drink with... an egg?" + color = "#deaf57" // rgb: 222, 175, 87 + taste_description = "chocolate cream and egg" + glass_icon_state = "irish_flip" + glass_name = "glass of irish flip" + glass_desc = "a fancy glass of creamy cocktail." +/////////////////////////////////////////// /datum/reagent/consumable/ethanol/beer/light name = "Light Beer" description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a5fe8b9786c4ccd06b5bd7b4112867cffb127fbd..e69adca5a11c9e91bd03316d764c50b75abb9504 100644 GIT binary patch delta 6722 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 NrlkGqi=s{B{{i&{LQ4Pu delta 6054 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 From c3a8f05a77a48dab442336d941f8c95c2ecb2d05 Mon Sep 17 00:00:00 2001 From: Mako Date: Mon, 6 Jun 2022 23:26:04 -0700 Subject: [PATCH 5/8] last two cocktails --- .../chemistry/reagents/alcohol_reagents.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 51cdb93cd309..2149d7d67811 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -104,6 +104,24 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "irish_flip" glass_name = "glass of irish flip" glass_desc = "a fancy glass of creamy cocktail." + +/datum/reagent/consumable/ethanol/beer/stout/blackvelvet + name = "Black Velvet" + description = "A interesting mix of Champagne and Stout, made for the mourning of Prince Albert." + color = "#963900" // rgb: 150, 57, 0 + taste_description = "Champagne with a hint of chocolate." + glass_icon_state = "black_velvet" + glass_name = "glass of black velvet" + glass_desc = "a fancy drink with a melancholic past." + +/datum/reagent/consumable/ethanol/beer/stout/espressomartini + name = "Espresso Martini" + description = "A interesting mix of Champagne and Stout, made for the mourning of Prince Albert." + color = "#963900" // rgb: 150, 57, 0 + taste_description = "Champagne with a hint of chocolate." + glass_icon_state = "black_velvet" + glass_name = "glass of black velvet" + glass_desc = "a fancy drink with a melancholic past." /////////////////////////////////////////// /datum/reagent/consumable/ethanol/beer/light name = "Light Beer" From 2233613e6eba284aacb60b3c595ff1b7466c1737 Mon Sep 17 00:00:00 2001 From: Mako Date: Mon, 6 Jun 2022 23:42:42 -0700 Subject: [PATCH 6/8] drinks defined and sprites are now made --- .../food_and_drinks/recipes/drinks_recipes.dm | 14 +++++++++++++- .../chemistry/reagents/alcohol_reagents.dm | 12 ++++++------ icons/obj/drinks.dmi | Bin 102261 -> 103024 bytes 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index b933dd3aff5b..3d273ae36163 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -869,4 +869,16 @@ name = "Irish Flip" id = /datum/reagent/consumable/ethanol/beer/stout/irishflip results = list(/datum/reagent/consumable/ethanol/beer/stout/irishflip = 5) - required_reagents = list(/datum/reagent/consumable/eggyolk = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/ethanol/irish_cream = 3 ) \ No newline at end of file + required_reagents = list(/datum/reagent/consumable/eggyolk = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/ethanol/irish_cream = 3 ) + +/datum/chemical_reaction/blackvelvet + name = "Black Velvet" + id = /datum/reagent/consumable/ethanol/beer/stout/blackvelvet + results = list(/datum/reagent/consumable/ethanol/beer/stout/blackvelvet = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 1, /datum/reagent/consumable/ethanol/beer/stout = 1) + + /datum/chemical_reaction/espressomartini + name = "Espresso Martini" + id = /datum/reagent/consumable/ethanol/beer/stout/espressomartini + results = list(/datum/reagent/consumable/ethanol/beer/stout/espressomartini = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/irishcoffee = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/grenadine = 1) \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 2149d7d67811..96b4c8bdf225 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -116,12 +116,12 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/beer/stout/espressomartini name = "Espresso Martini" - description = "A interesting mix of Champagne and Stout, made for the mourning of Prince Albert." - color = "#963900" // rgb: 150, 57, 0 - taste_description = "Champagne with a hint of chocolate." - glass_icon_state = "black_velvet" - glass_name = "glass of black velvet" - glass_desc = "a fancy drink with a melancholic past." + description = "A wake-me-the-fuck-up cocktail mix, guaranteed strong." + color = "#652a05" + taste_description = "bitterness, chocolate, and cream." + glass_icon_state = "espresso_martini" + glass_name = "glass of espresso martini" + glass_desc = "a cocktail guaranteed to keep you awake." /////////////////////////////////////////// /datum/reagent/consumable/ethanol/beer/light name = "Light Beer" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e69adca5a11c9e91bd03316d764c50b75abb9504..dcd91f7bf92803fe3b5df6949ff32cbd4f1dffd7 100644 GIT binary patch delta 7595 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 Date: Tue, 7 Jun 2022 00:40:29 -0700 Subject: [PATCH 7/8] oops I messed something up --- .../food_and_drinks/recipes/drinks_recipes.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 3d273ae36163..441869858690 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -872,13 +872,13 @@ required_reagents = list(/datum/reagent/consumable/eggyolk = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/ethanol/irish_cream = 3 ) /datum/chemical_reaction/blackvelvet - name = "Black Velvet" - id = /datum/reagent/consumable/ethanol/beer/stout/blackvelvet - results = list(/datum/reagent/consumable/ethanol/beer/stout/blackvelvet = 2) - required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 1, /datum/reagent/consumable/ethanol/beer/stout = 1) - - /datum/chemical_reaction/espressomartini - name = "Espresso Martini" - id = /datum/reagent/consumable/ethanol/beer/stout/espressomartini - results = list(/datum/reagent/consumable/ethanol/beer/stout/espressomartini = 5) - required_reagents = list(/datum/reagent/consumable/ethanol/irishcoffee = 2, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/grenadine = 1) \ No newline at end of file + name = "Black Velvet" + id = /datum/reagent/consumable/ethanol/beer/stout/blackvelvet + results = list(/datum/reagent/consumable/ethanol/beer/stout/blackvelvet = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 1, /datum/reagent/consumable/ethanol/beer/stout = 1) + +/datum/chemical_reaction/espressomartini + name = "Espresso Martini" + id = /datum/reagent/consumable/ethanol/beer/stout/espressomartini + results = list(/datum/reagent/consumable/ethanol/beer/stout/espressomartini = 3) + required_reagents = list(/datum/reagent/consumable/ethanol/irishcoffee = 2, /datum/reagent/consumable/ethanol/beer/stout = 1) \ No newline at end of file From 0452a742e63073ca42ae26d7e58f56da25c2ca6b Mon Sep 17 00:00:00 2001 From: Mako Date: Tue, 7 Jun 2022 08:36:20 -0700 Subject: [PATCH 8/8] makes irish flip take an whole egg --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 441869858690..935afd04ec35 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -869,7 +869,7 @@ name = "Irish Flip" id = /datum/reagent/consumable/ethanol/beer/stout/irishflip results = list(/datum/reagent/consumable/ethanol/beer/stout/irishflip = 5) - required_reagents = list(/datum/reagent/consumable/eggyolk = 1, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/ethanol/irish_cream = 3 ) + required_reagents = list(/datum/reagent/consumable/eggyolk = 5, /datum/reagent/consumable/ethanol/beer/stout = 1,/datum/reagent/consumable/ethanol/irish_cream = 3 ) /datum/chemical_reaction/blackvelvet name = "Black Velvet"