Merge pull request #4668 from VOREStation/upstream-merge-5815

[MIRROR] Adds eggnog drink to the game.
This commit is contained in:
Novacat
2019-03-27 15:17:14 -04:00
committed by GitHub
4 changed files with 22 additions and 1 deletions
@@ -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)
@@ -1485,7 +1485,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."
@@ -1502,6 +1502,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"
@@ -2268,6 +2268,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"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 82 KiB