shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-26129

Browse Source
This commit is contained in:
LetterJay
2017-04-29 11:45:37 -05:00
committed by GitHub
parent 991fb8335c fca3f200b3
commit 06bfa8770e
131 changed files with 1020 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+4 -4
View File
@@ -416,8 +416,8 @@
/datum/chemical_reaction/bananahonk
name = "Banana Honk"
id = "bananahonk"
results = list("bananahonk" = 3)
required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
results = list("bananahonk" = 2)
required_reagents = list("laughter" = 1, "cream" = 1)
/datum/chemical_reaction/silencer
name = "Silencer"
@@ -542,9 +542,9 @@
results = list("chocolate_milk" = 2)
required_reagents = list("milk" = 1, "cocoa" = 1)
mix_message = "The color changes as the mixture blends smoothly."
/datum/chemical_reaction/eggnog
name = "eggnog"
id = "eggnog"
results = list("eggnog" = 15)
required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5)
required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5)