diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index 52528235bb..babb71df8b 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -542,3 +542,7 @@ Drinks Data /datum/reagent/ethanol/ichor_mead glass_icon_state = "ichor_meadglass" glass_center_of_mass = list("x"=17, "y"=10) + +/datum/reagent/drink/eggnog + glass_icon_state = "eggnog" + glass_center_of_mass = list("x"=16, "y"=8) 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 4c58d5af8f..2b2a737164 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1478,7 +1478,7 @@ id = "lovepotion" description = "Creamy strawberries and sugar, simple and sweet." taste_description = "strawberries and cream" - color = "#fc8a8a" // rrgb(252, 138, 138) + color = "#fc8a8a" // rgb(252, 138, 138) glass_name = "Love Potion" glass_desc = "Love me tender, love me sweet." @@ -1495,6 +1495,16 @@ glass_desc = "A concoction that should probably be in an engine, rather than your stomach." glass_icon = DRINK_ICON_NOISY +/datum/reagent/drink/eggnog + name = "Eggnog" + id = "eggnog" + description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays." + taste_description = "thick cream and vanilla" + color = "#fff3c1" // rgb(255, 243, 193) + + glass_name = "Eggnog" + glass_desc = "You can't egg-nore the holiday cheer all around you" + /datum/reagent/drink/nuclearwaste name = "Nuclear Waste" id = "nuclearwaste" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 2117ca9ae3..a6205953a0 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2263,6 +2263,13 @@ required_reagents = list("cornoil" = 2, "honey" = 1) result_amount = 3 +/datum/chemical_reaction/drinks/eggnog + name = "Eggnog" + id = "eggnog" + result = "eggnog" + required_reagents = list("milk" = 5, "cream" = 5, "sugar" = 5, "egg" = 3) + result_amount = 15 + /datum/chemical_reaction/drinks/nuclearwaste_radium name = "Nuclear Waste" id = "nuclearwasterad" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 5adcea97c7..cdd4348a9f 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ