From 92f6fe129a99bbd72d28c8a45d215ebcc9e53f8b Mon Sep 17 00:00:00 2001
From: Hatterhat <Hatterhat@users.noreply.github.com>
Date: Sat, 4 Jan 2020 07:14:39 -0600
Subject: [PATCH] tgstation 40394 port

---
 .../items/stacks/sheets/sheet_types.dm        | 20 +++++++++++--------
 .../research/designs/biogenerator_designs.dm  | 16 +++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 34146d89b3..cf40e47db9 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -405,7 +405,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	new/datum/stack_recipe("mouse traps", /obj/item/storage/box/mousetraps), \
 	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
 	new/datum/stack_recipe("power cell", /obj/item/storage/box/cells), \
-	new/datum/stack_recipe("02", /obj/item/storage/box/otwo), \
+	new/datum/stack_recipe("box (o2 supplies)", /obj/item/storage/box/otwo), \
 	null, \
 	new/datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot), \
 	new/datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot), \
@@ -419,17 +419,21 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	null, \
 	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
 	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
+	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
+	new/datum/stack_recipe("donut box", /obj/item/storage/fancy/donut_box), \
+	new/datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box), \
+	new/datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box), \
 	new/datum/stack_recipe("folder", /obj/item/folder), \
 	new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4), \
 	new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \
 	null, \
-	new/datum/stack_recipe("colored brown", /obj/item/storage/box/brown), \
-	new/datum/stack_recipe("colored green", /obj/item/storage/box/green), \
-	new/datum/stack_recipe("colored red", /obj/item/storage/box/blue), \
-	new/datum/stack_recipe("colored blue", /obj/item/storage/box/red), \
-	new/datum/stack_recipe("colored yellow", /obj/item/storage/box/yellow), \
-	new/datum/stack_recipe("colored pink", /obj/item/storage/box/pink), \
-	new/datum/stack_recipe("colored purple", /obj/item/storage/box/purple), \
+	new/datum/stack_recipe("box (brown)", /obj/item/storage/box/brown), \
+	new/datum/stack_recipe("box (green)", /obj/item/storage/box/green), \
+	new/datum/stack_recipe("box (blue)", /obj/item/storage/box/blue), \
+	new/datum/stack_recipe("box (red)", /obj/item/storage/box/red), \
+	new/datum/stack_recipe("box (yellow)", /obj/item/storage/box/yellow), \
+	new/datum/stack_recipe("box (pink)", /obj/item/storage/box/pink), \
+	new/datum/stack_recipe("box (purple)", /obj/item/storage/box/purple), \
 	))
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap //it's cardboard you fuck
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 05e4c667f6..2be4d106b6 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -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"