Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

2020-07-09 22:14:20 +03:00
parent e12d690d3f 0c7b06baf4
commit 9de8483bcf
31 changed files with 1145 additions and 846 deletions
@@ -61,6 +61,7 @@
 	filling_color = "#ee7bee"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
+	juice_results = list (/datum/reagent/consumable/laughsyrup = 0)
 	tastes = list ("a prancing rabbit" = 1) //Vib Ribbon sends her regards.. wherever she is.
 	wine_power = 90
 	wine_flavor = "a vector-graphic rabbit dancing on your tongue"