Merge branch 'master' into RCD-Updates

2020-01-07 00:04:43 -05:00
parent d7718c8dd1 c39862711a
commit c3f47e713a
171 changed files with 18268 additions and 12784 deletions
@@ -51,6 +51,22 @@
 	make_reagents = list()
 	category = list("initial","Food")

+/datum/design/enzyme
+	name = "10u Universal Enzyme"
+	id = "enzyme"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 30)
+	make_reagents = list("enzyme" = 10)
+	category = list("initial","Food")
+
+/datum/design/flour_sack
+	name = "Flour Sack"
+	id = "flour_sack"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 150)
+	build_path = /obj/item/reagent_containers/food/condiment/flour
+	category = list("initial","Food")
+
 /datum/design/monkey_cube
 	name = "Monkey Cube"
 	id = "mcube"