diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index ae0b9320da..e7d32975e4 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -693,6 +693,9 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/sake = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 5, diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index aad0c94f70..d75f763cbe 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -545,7 +545,38 @@ name = "Gilthari Luxury Champagne" desc = "For those special occassions." icon_state = "champagne" + center_of_mass = list("x"=16, "y"=3) /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize() . = ..() - reagents.add_reagent("champagne", 100) \ No newline at end of file + reagents.add_reagent("champagne", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps + name = "Dr. Bone's Peppermint Schnapps" + desc = "A flavoured grain liqueur with a fresh, minty taste." + icon_state = "schnapps_pep" + center_of_mass = list("x"=16, "y"=3) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize() + . = ..() + reagents.add_reagent("schnapps_pep", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps + name = "Dr. Bone's Peach Schnapps" + desc = "A flavoured grain liqueur with a fruity peach taste." + icon_state = "schnapps_pea" + center_of_mass = list("x"=16, "y"=3) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/peachschnapps/Initialize() + . = ..() + reagents.add_reagent("schnapps_pea", 100) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps + name = "Dr. Bone's Lemonade Schnapps" + desc = "A flavoured grain liqueur with a sweetish, lemon taste." + icon_state = "schnapps_lem" + center_of_mass = list("x"=16, "y"=3) + +/obj/item/weapon/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize() + . = ..() + reagents.add_reagent("schnapps_lem", 100) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 2b2a737164..35179e16a3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3150,3 +3150,47 @@ glass_name = "Ichor Mead" glass_desc = "A trip to Valhalla." + +/datum/reagent/ethanol/schnapps_pep + name = "Peppermint Schnapps" + id = "schnapps_pep" + description = "Achtung, pfefferminze." + taste_description = "minty alcohol" + color = "#8FC468" + strength = 25 + + glass_name = "peppermint schnapps" + glass_desc = "A glass of peppermint schnapps. It seems like it'd be better, mixed." + +/datum/reagent/ethanol/schnapps_pea + name = "Peach Schnapps" + id = "schnapps_pea" + description = "Achtung, fruchtig." + taste_description = "peaches" + color = "#d67d4d" + strength = 25 + + glass_name = "peach schnapps" + glass_desc = "A glass of peach schnapps. It seems like it'd be better, mixed." + +/datum/reagent/ethanol/schnapps_lem + name = "Lemonade Schnapps" + id = "schnapps_lem" + description = "Childhood memories are not included." + taste_description = "sweet, lemon-y alcohol" + color = "#FFFF00" + strength = 25 + + glass_name = "lemonade schnapps" + glass_desc = "A glass of lemonade schnapps. It seems like it'd be better, mixed." + +/datum/reagent/ethanol/fusionnaire + name = "Fusionnaire" + id = "fusionnaire" + description = "A drink for the brave." + taste_description = "a painfully alcoholic lemon soda with an undertone of mint" + color = "#6BB486" + strength = 9 + + glass_name = "fusionnaire" + glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations." \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d2147706a2..960df2fa75 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1868,7 +1868,7 @@ name = "Roy Rogers" id = "roy_rogers" result = "roy_rogers" - required_reagents = list("gingerale" = 4, "lemon_lime" = 2, "grenadine" = 1) + required_reagents = list("shirley_temple" = 5, "lemon_lime" = 2) result_amount = 7 /datum/chemical_reaction/drinks/collinsmix @@ -2094,7 +2094,7 @@ name = "Screaming Viking" id = "screamingviking" result = "screamingviking" - required_reagents = list("vodka" = 1, "vermouth" = 1, "limejuice" = 1, "rum" = 1, "gin" = 1, "tonic" = 1) + required_reagents = list("martini" = 2, "vodkatonic" = 2, "limejuice" = 1, "rum" = 1) result_amount = 6 /datum/chemical_reaction/drinks/vilelemon @@ -2316,6 +2316,13 @@ required_reagents = list("cornoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1) result_amount = 6 +/datum/chemical_reaction/drinks/fusionnaire + name = "Fusionnaire" + id = "fusionnaire" + result = "fusionnaire" + required_reagents = list("lemonjuice" = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1) + result_amount = 9 + //R-UST Port /datum/chemical_reaction/hyrdophoron name = "Hydrophoron" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index cdd4348a9f..bc7558c9a8 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ