diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 25c16e1a8d64..c5939aa507ab 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/beer/stout + name = "Genius Dry Stout" + desc = "A fresh bottle of stout, popularized by inhabitants of Space Ireland." + 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..935afd04ec35 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -864,3 +864,21 @@ 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 = 5, /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 = 3) + required_reagents = list(/datum/reagent/consumable/ethanol/irishcoffee = 2, /datum/reagent/consumable/ethanol/beer/stout = 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 0fd1dbdc2ded..96b4c8bdf225 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -87,6 +87,42 @@ 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." + 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/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/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 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" description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content." @@ -2358,4 +2394,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" - 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, diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a5fe8b9786c4..dcd91f7bf928 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ