Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
PsiOmega
2015-08-18 18:29:01 +02:00
9 changed files with 4883 additions and 4878 deletions
@@ -1369,6 +1369,13 @@
required_reagents = list("soymilk" = 4, "sacid" = 1)
result_amount = 5
/datum/chemical_reaction/ketchup
name = "Ketchup"
id = "ketchup"
result = "ketchup"
required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
result_amount = 4
/datum/chemical_reaction/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"