Newfood atomization: Dough & Mexican food

beestation.dme

@@ -1395,6 +1395,8 @@
 #include "code\game\objects\items\food\bread.dm"
 #include "code\game\objects\items\food\burgers.dm"
 #include "code\game\objects\items\food\cake.dm"
+#include "code\game\objects\items\food\dough.dm"
+#include "code\game\objects\items\food\mexican.dm"
 #include "code\game\objects\items\food\pizza.dm"
 #include "code\game\objects\items\food\spaghetti.dm"
 #include "code\game\objects\items\grenades\_grenade.dm"
@@ -2547,7 +2549,6 @@
 #include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm"
 #include "code\modules\food_and_drinks\food\snacks_soup.dm"
 #include "code\modules\food_and_drinks\food\snacks_vend.dm"
-#include "code\modules\food_and_drinks\food\snacks\dough.dm"
 #include "code\modules\food_and_drinks\food\snacks\meat.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
 #include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
@@ -2568,6 +2569,7 @@
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pie.dm"

code/__DEFINES/construction.dm

@@ -73,32 +73,33 @@
 #define MAXCOIL 30
 
 // tablecrafting defines
-#define CAT_NONE	""
-#define CAT_WEAPONRY	"Weaponry"
-#define CAT_WEAPON	"Weapons"
-#define CAT_AMMO	"Ammunition"
-#define CAT_ROBOT	"Robots"
-#define CAT_MISC	"Misc"
-#define CAT_PRIMAL  "Tribal"
-#define CAT_CLOTHING	"Clothing"
-#define CAT_EYEWEAR     "Eyewear"
-#define CAT_FOOD	"Foods"
-#define CAT_BREAD	"Breads"
-#define CAT_BURGER	"Burgers"
-#define CAT_CAKE	"Cakes"
-#define CAT_EGG	"Egg-Based Food"
-#define CAT_MEAT	"Meats"
-#define CAT_MISCFOOD	"Misc. Food"
-#define CAT_PASTRY	"Pastries"
-#define CAT_PIE	"Pies"
-#define CAT_PIZZA	"Pizzas"
-#define CAT_SALAD	"Salads"
-#define CAT_SANDWICH	"Sandwiches"
-#define CAT_SOUP	"Soups"
-#define CAT_SPAGHETTI	"Spaghettis"
-#define CAT_ICE	"Frozen"
-#define CAT_DRINK	"Drinks"
-#define CAT_STRUCTURE	"Structures"
+#define CAT_NONE ""
+#define CAT_WEAPONRY "Weaponry"
+#define CAT_WEAPON "Weapons"
+#define CAT_AMMO "Ammunition"
+#define CAT_ROBOT "Robots"
+#define CAT_MISC "Misc"
+#define CAT_PRIMAL "Tribal"
+#define CAT_CLOTHING "Clothing"
+#define CAT_EYEWEAR "Eyewear"
+#define CAT_FOOD "Foods"
+#define CAT_BREAD "Breads"
+#define CAT_BURGER "Burgers"
+#define CAT_CAKE "Cakes"
+#define CAT_EGG "Egg-Based Food"
+#define CAT_MEAT "Meats"
+#define CAT_MISCFOOD "Misc. Food"
+#define CAT_MEXICAN "Mexican Food"
+#define CAT_PASTRY "Pastries"
+#define CAT_PIE "Pies"
+#define CAT_PIZZA "Pizzas"
+#define CAT_SALAD "Salads"
+#define CAT_SANDWICH "Sandwiches"
+#define CAT_SOUP "Soups"
+#define CAT_SPAGHETTI "Spaghettis"
+#define CAT_ICE "Frozen"
+#define CAT_DRINK "Drinks"
+#define CAT_STRUCTURE "Structures"
 
 // rcd buildtype defines
 #define RCD_FLOORWALL 1

code/game/objects/effects/spawners/lootdrop.dm

@@ -116,7 +116,7 @@
 			/obj/item/reagent_containers/food/snacks/salad/aesirsalad)
 	var/mains = list(
 			/obj/item/reagent_containers/food/snacks/bearsteak,
-			/obj/item/reagent_containers/food/snacks/enchiladas,
+			/obj/item/food/enchiladas,
 			/obj/item/reagent_containers/food/snacks/stewedsoymeat,
 			/obj/item/food/burger/bigbite,
 			/obj/item/food/burger/superbite,

code/game/objects/items/food/dough.dm

@@ -0,0 +1,151 @@
+
+
+/////////////////// Dough Ingredients ////////////////////////
+
+/obj/item/food/dough
+	name = "dough"
+	desc = "A piece of dough."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "dough"
+	microwaved_type = /obj/item/food/bread/plain
+	food_reagents = list(/datum/reagent/consumable/nutriment = 6)
+	tastes = list("dough" = 1)
+	foodtypes = GRAIN
+
+/*
+/obj/item/food/dough/make_microwaveable()
+	AddElement(/datum/element/microwavable, /obj/item/food/bread/plain)
+*/
+
+// Dough + rolling pin = flat dough
+/obj/item/food/dough/make_processable()
+	AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatdough, 1, 3 SECONDS, table_required = TRUE, /*screentip_verb = "Flatten"*/)
+
+/obj/item/food/flatdough
+	name = "flat dough"
+	desc = "A flattened dough."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "flat dough"
+	microwaved_type = /obj/item/food/pizzabread
+	food_reagents = list(/datum/reagent/consumable/nutriment = 6)
+	tastes = list("dough" = 1)
+	foodtypes = GRAIN
+
+/*
+/obj/item/food/flatdough/make_microwaveable()
+	AddElement(/datum/element/microwavable, /obj/item/food/pizzabread)
+*/
+
+// sliceable into 3xdoughslices
+/obj/item/food/flatdough/make_processable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/doughslice, 3, 3 SECONDS, table_required = TRUE, /*screentip_verb = "Slice"*/)
+
+/obj/item/food/pizzabread
+	name = "pizza bread"
+	desc = "Add ingredients to make a pizza."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "pizzabread"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 7)
+	tastes = list("bread" = 1)
+	foodtypes = GRAIN
+
+/*
+/obj/item/food/pizzabread/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/pizza/margherita, CUSTOM_INGREDIENT_ICON_SCATTER, max_ingredients = 12)
+*/
+
+/obj/item/food/doughslice
+	name = "dough slice"
+	desc = "A slice of dough. Can be cooked into a bun."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "doughslice"
+	microwaved_type = /obj/item/food/bun
+	food_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	w_class = WEIGHT_CLASS_SMALL
+	tastes = list("dough" = 1)
+	foodtypes = GRAIN
+
+/*
+/obj/item/food/doughslice/make_microwaveable()
+	AddElement(/datum/element/microwavable, /obj/item/food/bun)
+*/
+
+/obj/item/food/bun
+	name = "bun"
+	desc = "A base for any self-respecting burger."
+	icon = 'icons/obj/food/burgerbread.dmi'
+	icon_state = "bun"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 3)
+	w_class = WEIGHT_CLASS_SMALL
+	tastes = list("bun" = 1) // the bun tastes of bun.
+	foodtypes = GRAIN
+
+/*
+/obj/item/food/bun/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/burger/empty, CUSTOM_INGREDIENT_ICON_STACKPLUSTOP)
+*/
+
+/obj/item/food/cakebatter
+	name = "cake batter"
+	desc = "Bake it to get a cake."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "cakebatter"
+	microwaved_type = /obj/item/food/cake/plain
+	food_reagents = list(/datum/reagent/consumable/nutriment = 9)
+	tastes = list("batter" = 1)
+	foodtypes = GRAIN | DAIRY
+
+/*
+/obj/item/food/cakebatter/make_microwaveable()
+	AddElement(/datum/element/microwavable, /obj/item/food/cake/plain)
+*/
+
+// Cake batter + rolling pin = pie dough
+/obj/item/food/cakebatter/make_processable()
+	AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/piedough, 1, 3 SECONDS, table_required = TRUE, /*screentip_verb = "Flatten"*/)
+
+/obj/item/food/piedough
+	name = "pie dough"
+	desc = "Cook it to get a pie."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "piedough"
+	microwaved_type = /obj/item/reagent_containers/food/snacks/pie/plain
+	food_reagents = list(/datum/reagent/consumable/nutriment = 9)
+	tastes = list("dough" = 1)
+	foodtypes = GRAIN | DAIRY
+
+/*
+/obj/item/food/piedough/make_microwaveable()
+	AddElement(/datum/element/microwavable, /obj/item/food/pie/plain)
+*/
+
+/obj/item/food/piedough/make_processable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rawpastrybase, 6, 3 SECONDS, table_required = TRUE, /*screentip_verb = "Slice"*/)
+
+/obj/item/food/rawpastrybase
+	name = "raw pastry base"
+	desc = "Must be cooked before use."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "rawpastrybase"
+	microwaved_type = /obj/item/food/pastrybase
+	food_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	w_class = WEIGHT_CLASS_SMALL
+	tastes = list("raw pastry" = 1)
+	foodtypes = GRAIN | DAIRY
+
+/*
+/obj/item/food/rawpastrybase/make_microwaveable()
+	AddElement(/datum/element/microwavable, /obj/item/food/pastrybase)
+*/
+
+/obj/item/food/pastrybase
+	name = "pastry base"
+	desc = "A base for any self-respecting pastry."
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "pastrybase"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 3)
+	w_class = WEIGHT_CLASS_SMALL
+	tastes = list("pastry" = 1)
+	foodtypes = GRAIN | DAIRY