Food expansion 5: The big one! (#71914)

add: Adds 32 new foods!

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

@@ -758,3 +758,40 @@
 	foodtypes = MEAT | VEGETABLES | GRAIN | BREAKFAST
 	w_class = WEIGHT_CLASS_SMALL
 	venue_value = FOOD_PRICE_EXOTIC
+
+/obj/item/food/raw_meatloaf
+	name = "raw meatloaf"
+	desc = "A heavy 'loaf' of minced meat, onions, and garlic. Bake it in an oven!"
+	icon = 'icons/obj/food/meat.dmi'
+	icon_state = "raw_meatloaf"
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 40, /datum/reagent/consumable/nutriment/vitamin = 32, /datum/reagent/consumable/nutriment = 32)
+	tastes = list("raw meat" = 3, "onions" = 1)
+	foodtypes = MEAT | RAW | VEGETABLES
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/food/raw_meatloaf/MakeBakeable()
+	AddComponent(/datum/component/bakeable, /obj/item/food/meatloaf, rand(30 SECONDS, 40 SECONDS), TRUE, TRUE)
+
+/obj/item/food/meatloaf
+	name = "meatloaf"
+	desc = "A mixture of meat, onions, and garlic formed into a loaf and baked in an oven. It's covered in a generous slathering of ketchup. Use a knife to cut it into slices!"
+	icon = 'icons/obj/food/meat.dmi'
+	icon_state = "meatloaf"
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 40, /datum/reagent/consumable/nutriment/vitamin = 32, /datum/reagent/consumable/nutriment = 32)
+	tastes = list("juicy meat" = 3, "onions" = 1, "garlic" = 1, "ketchup" = 1)
+	foodtypes = MEAT | VEGETABLES
+	w_class = WEIGHT_CLASS_NORMAL
+	burns_in_oven = TRUE
+
+/obj/item/food/meatloaf/MakeProcessable()
+	AddElement(/datum/element/processable, TOOL_KNIFE,  /obj/item/food/meatloaf_slice, 4, 3 SECONDS, table_required = TRUE,  screentip_verb = "Cut")
+
+/obj/item/food/meatloaf_slice
+	name = "meatloaf slice"
+	desc = "A slice of delicious, juicy meatloaf with a ketchup topping."
+	icon = 'icons/obj/food/meat.dmi'
+	icon_state = "meatloaf_slice"
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/nutriment = 8)
+	tastes = list("juicy meat" = 3, "onions" = 1, "garlic" = 1, "ketchup" = 1)
+	foodtypes = MEAT | VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL

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

@@ -8,6 +8,9 @@
 	foodtypes = GRAIN
 	w_class = WEIGHT_CLASS_TINY
 
+/obj/item/food/tortilla/MakeGrillable()
+	AddComponent(/datum/component/grillable, /obj/item/food/hard_taco_shell, rand(15 SECONDS, 30 SECONDS), TRUE, TRUE)
+
 /obj/item/food/burrito
 	name = "burrito"
 	desc = "Tortilla wrapped goodness."
@@ -124,3 +127,88 @@
 	tastes = list("peppers" = 1, "salsa" = 3, "tortilla chips" = 1, "onion" = 1)
 	foodtypes = VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/classic_chimichanga
+	name = "classic chimichanga"
+	desc = "A deep-fried burrito packed with a generous amount of meat and cheese."
+	icon_state = "classic_chimichanga"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nutriment/protein = 6,)
+	tastes = list("deep-fried tortilla" = 1, "meat" = 3, "cheese" = 1, "onions" = 1)
+	foodtypes = MEAT | GRAIN | VEGETABLES | DAIRY | FRIED
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/vegetarian_chimichanga
+	name = "vegetarian chimichanga"
+	desc = "A deep-fried burrito packed with a generous amount of baked vegetables, for the non-meat eaters."
+	icon_state = "vegetarian_chimichanga"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 10)
+	tastes = list("deep-fried tortilla" = 1, "cabbage" = 3, "onions" = 1, "peppers" = 1)
+	foodtypes = GRAIN | VEGETABLES | FRIED
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/vegetarian_chimichanga
+	name = "vegetarian chimichanga"
+	desc = "A deep-fried burrito packed with a generous amount of baked vegetables, for the non-meat eaters."
+	icon_state = "vegetarian_chimichanga"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 10)
+	tastes = list("deep-fried tortilla" = 1, "cabbage" = 3, "onions" = 1, "peppers" = 1)
+	foodtypes = GRAIN | VEGETABLES | FRIED
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/hard_taco_shell
+	name = "hard taco shell"
+	desc = "A hard taco shell, just waiting to be stuffed with ingredients. Use an ingredient on it to start making custom tacos!"
+	icon_state = "hard_taco_shell"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 2)
+	tastes = list("hard corn tortilla" = 1)
+	foodtypes = GRAIN | FRIED
+	w_class = WEIGHT_CLASS_SMALL
+	burns_on_grill = TRUE
+
+/obj/item/food/hard_taco_shell/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/hard_taco_shell/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6)
+
+// empty taco shell for custom tacos
+/obj/item/food/hard_taco_shell/empty
+	name = "hard-shell taco"
+	foodtypes = NONE
+	tastes = list()
+	icon_state = "hard_taco_shell"
+	desc = "A customized hard-shell taco."
+
+/obj/item/food/classic_hard_shell_taco
+	name = "classic hard-shell taco"
+	desc = "A classically-made hard-shell taco, the most satisfying crunch in the galaxy."
+	icon_state = "classic_hard_shell_taco"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 6,)
+	tastes = list("crunchy taco shell" = 1, "cabbage" = 3, "tomatoes" = 1, "ground meat" = 1, "cheese" = 1)
+	foodtypes = GRAIN | VEGETABLES | MEAT | DAIRY
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/plain_hard_shell_taco
+	name = "plain hard-shell taco"
+	desc = "A hard-shell taco with just meat, for the picky eaters and children in us all."
+	icon_state = "plain_hard_shell_taco"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/nutriment/protein = 6,)
+	tastes = list("crunchy taco shell" = 1, "ground meat" = 1)
+	foodtypes = GRAIN | MEAT
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/refried_beans
+	name = "refried beans"
+	desc = "A steaming bowl of delicious refried beans, a common staple in Mexican cuisine."
+	icon_state = "refried_beans"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 4,)
+	tastes = list("mashed beans" = 1, "onion" = 3,)
+	foodtypes = VEGETABLES | FRIED
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/spanish_rice
+	name = "spanish rice"
+	desc = "A bowl of delicious spanish rice, cooked in a tomato sauce which gives it the orange color."
+	icon_state = "spanish_rice"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
+	tastes = list("zesty rice" = 1, "tomato sauce" = 3,)
+	foodtypes = VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL

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

@@ -82,15 +82,6 @@
 	tastes = list("caramel" = 2, "popcorn" = 1)
 	foodtypes = JUNKFOOD | SUGAR
 
-/obj/item/food/loadedbakedpotato
-	name = "loaded baked potato"
-	desc = "Totally baked."
-	icon_state = "loadedbakedpotato"
-	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
-	tastes = list("potato" = 1)
-	foodtypes = VEGETABLES | DAIRY
-	w_class = WEIGHT_CLASS_SMALL
-
 /obj/item/food/fries
 	name = "space fries"
 	desc = "AKA: French Fries, Freedom Fries, etc."
@@ -948,5 +939,128 @@
 	foodtypes = GRAIN | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/food/baked_potato
+	name = "baked potato"
+	desc = "A piping hot potato baked in an oven. A bit bland by itself."
+	icon_state = "baked_potato"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	tastes = list("baked potato" = 1)
+	foodtypes = VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL
+	burns_in_oven = TRUE
 
+/obj/item/food/buttered_baked_potato
+	name = "buttered baked potato"
+	desc = "A piping hot baked potato, now with a slice of butter mixed in. Perfection."
+	icon_state = "buttered_baked_potato"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 4)
+	tastes = list("baked potato" = 1)
+	foodtypes = VEGETABLES | DAIRY
+	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/food/loaded_baked_potato
+	name = "loaded baked potato"
+	desc = "A piping hot baked potato, with the insides scooped out and mixed with bacon bits, cheese, and cabbage."
+	icon_state = "loaded_baked_potato"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 4)
+	tastes = list("baked potato" = 1, "bacon" = 1, "cheese" = 1, "cabbage" = 1)
+	foodtypes = VEGETABLES | DAIRY | MEAT
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/cheese_pierogi
+	name = "cheese pierogi"
+	desc = "A dumpling made by wrapping unleavened dough around a savoury or sweet filling and cooking in boiling water. This one is filled with a potato and cheese mixture."
+	icon_state = "cheese_pierogi"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	tastes = list("potato" = 1, "cheese" = 1)
+	foodtypes = GRAIN | VEGETABLES | DAIRY
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/meat_pierogi
+	name = "meat pierogi"
+	desc = "A dumpling made by wrapping unleavened dough around a savoury or sweet filling and cooking in boiling water. This one is filled with a potato and meat mixture."
+	icon_state = "meat_pierogi"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment/protein = 2)
+	tastes = list("potato" = 1, "cheese" = 1)
+	foodtypes = GRAIN | VEGETABLES | DAIRY
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/raw_meat_calzone
+	name = "raw meat calzone"
+	desc = "A raw calzone, ready to be put in the oven."
+	icon_state = "raw_calzone"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment/protein = 2)
+	tastes = list("raw dough" = 1, "raw meat" = 1, "cheese" = 1, "tomato sauce" = 1)
+	foodtypes = GRAIN | RAW | DAIRY | MEAT
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/raw_meat_calzone/MakeBakeable()
+	AddComponent(/datum/component/bakeable, /obj/item/food/meat_calzone, rand(20 SECONDS, 40 SECONDS), TRUE, TRUE)
+
+/obj/item/food/meat_calzone
+	name = "meat calzone"
+	desc = "A calzone filled with cheese, meat, and a tomato sauce. Don't burn your tongue!."
+	icon_state = "meat_calzone"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 6)
+	tastes = list("baked dough" = 1, "juicy meat" = 1, "melted cheese" = 1, "tomato sauce" = 1)
+	foodtypes = GRAIN | DAIRY | MEAT
+	w_class = WEIGHT_CLASS_SMALL
+	burns_in_oven = TRUE
+
+/obj/item/food/raw_vegetarian_calzone
+	name = "raw vegetarian calzone"
+	desc = "A raw calzone, ready to be put in the oven."
+	icon_state = "raw_calzone"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
+	tastes = list("raw dough" = 1, "vegetables" = 1, "tomato sauce" = 1)
+	foodtypes = GRAIN | VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/raw_vegetarian_calzone/MakeBakeable()
+	AddComponent(/datum/component/bakeable, /obj/item/food/vegetarian_calzone, rand(20 SECONDS, 40 SECONDS), TRUE, TRUE)
+
+/obj/item/food/vegetarian_calzone
+	name = "vegetarian calzone"
+	desc = "A calzone filled with mixed vegetables and a tomato sauce. A healthier, yet less satisfying alternative."
+	icon_state = "vegetarian_calzone"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 8)
+	tastes = list("baked dough" = 1, "baked vegetables" = 1, "tomato sauce" = 1)
+	foodtypes = GRAIN | VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL
+	burns_in_oven = TRUE
+
+/obj/item/food/caramel_truffle
+	name = "caramel truffle"
+	desc = "A bite-sized chocolate truffle with a chewy caramel filling."
+	icon_state = "caramel_truffle"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
+	tastes = list("chocolate" = 1, "chewy caramel" = 1)
+	foodtypes = DAIRY | SUGAR | JUNKFOOD
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/chocolate_truffle
+	name = "chocolate truffle"
+	desc = "A bite-sized chocolate truffle with a rich chocolate mousse filling."
+	icon_state = "chocolate_truffle"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
+	tastes = list("chocolate" = 1)
+	foodtypes = DAIRY | SUGAR | JUNKFOOD
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/peanut_truffle
+	name = "peanut truffle"
+	desc = "A bite-sized chocolate truffle with crunchy peanuts mixed in."
+	icon_state = "peanut_truffle"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
+	tastes = list("chocolate" = 1, "peanuts" = 1)
+	foodtypes = DAIRY | SUGAR | JUNKFOOD | NUTS
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/peanut_butter_cup
+	name = "peanut butter cup"
+	desc = "An ultra-sweet chocolate treat with a savory peanut butter filling."
+	icon_state = "peanut_butter_cup"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
+	tastes = list("chocolate" = 1, "peanut butter" = 1)
+	foodtypes = DAIRY | SUGAR | JUNKFOOD | NUTS
+	w_class = WEIGHT_CLASS_SMALL

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

@@ -351,3 +351,49 @@
 	tastes = list("brownie" = 1, "chocolatey goodness" = 1)
 	foodtypes = GRAIN | JUNKFOOD | SUGAR
 	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/peanut_butter_brownie_batter
+	name = "raw peanut butter brownie batter"
+	desc = "A sticky mixture of raw peanut butter brownie batter, cook it in the oven!"
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "peanut_butter_brownie_batter"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/peanut_butter = 4)
+	tastes = list("raw brownie batter" = 1)
+	foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS
+
+/obj/item/food/peanut_butter_brownie_batter/MakeBakeable()
+	AddComponent(/datum/component/bakeable, /obj/item/food/peanut_butter_brownie_sheet, rand(20 SECONDS, 30 SECONDS), TRUE, TRUE)
+
+/obj/item/food/peanut_butter_brownie_sheet
+	name = "peanut butter brownie sheet"
+	desc = "An uncut sheet of cooked peanut butter brownie, use a knife to cut it!."
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "peanut_butter_brownie_sheet"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 24, /datum/reagent/consumable/sugar = 16, /datum/reagent/consumable/peanut_butter = 20)
+	tastes = list("brownie" = 1, "chocolatey goodness" = 1, "peanut butter" = 1)
+	foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS
+	w_class = WEIGHT_CLASS_SMALL
+	burns_in_oven = TRUE
+
+/obj/item/food/peanut_butter_brownie_sheet/MakeProcessable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/peanut_butter_brownie, 4, 3 SECONDS, table_required = TRUE,  screentip_verb = "Slice")
+
+/obj/item/food/peanut_butter_brownie
+	name = "peanut butter brownie"
+	desc = "A square slice of delicious, chewy peanut butter brownie. Often the target of potheads."
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "peanut_butter_brownie"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/sugar = 4, /datum/reagent/consumable/peanut_butter = 5)
+	tastes = list("brownie" = 1, "chocolatey goodness" = 1)
+	foodtypes = GRAIN | JUNKFOOD | SUGAR
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/crunchy_peanut_butter_tart
+	name = "crunchy peanut butter tart"
+	desc = "A miniature pie with a peanut butter filling, creamy icing, and topping of chopped nuts."
+	icon = 'icons/obj/food/food.dmi'
+	icon_state = "crunchy_peanut_butter_tart"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/sugar = 6, /datum/reagent/consumable/peanut_butter = 5)
+	tastes = list("peanut butter" = 1, "peanuts" = 1, "cream" = 1)
+	foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS
+	w_class = WEIGHT_CLASS_SMALL

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

@@ -59,21 +59,21 @@
 	tastes = list("sourness" = 1, "leaves" = 1)
 	foodtypes = FRUIT | ORANGES
 
-/obj/item/food/salad/ricebowl
-	name = "ricebowl"
-	desc = "A bowl of raw rice."
-	icon_state = "ricebowl"
+/obj/item/food/uncooked_rice
+	name = "uncooked rice"
+	desc = "A clump of raw rice."
+	icon_state = "uncooked_rice"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	tastes = list("rice" = 1)
 	foodtypes = GRAIN | RAW
 
-/obj/item/food/salad/ricebowl/make_microwavable()
-	AddElement(/datum/element/microwavable, /obj/item/food/salad/boiledrice)
+/obj/item/food/uncooked_rice/make_microwavable()
+	AddElement(/datum/element/microwavable, /obj/item/food/boiledrice)
 
-/obj/item/food/salad/boiledrice
+/obj/item/food/boiledrice
 	name = "boiled rice"
-	desc = "A warm bowl of rice."
-	icon_state = "boiledrice"
+	desc = "A steaming cup of boiled rice. A bit bland by itself, but the basis for something delicious..."
+	icon_state = "cooked_rice"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("rice" = 1)
 	foodtypes = GRAIN | BREAKFAST

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

@@ -144,7 +144,7 @@
 	bite_consumption = 4
 	food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 7)
 	tastes = list("bun" = 3, "meat" = 2, "fried onion" = 1, "pickles" = 1)
-	foodtypes = GRAIN | MEAT | VEGETABLES 
+	foodtypes = GRAIN | MEAT | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
 	venue_value = FOOD_PRICE_NORMAL
 
@@ -181,3 +181,14 @@
 	foodtypes = GRAIN | FRUIT | NUTS
 	food_flags = FOOD_FINGER_FOOD
 	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/philly_cheesesteak
+	name = "Philly cheesesteak"
+	desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it."
+	icon = 'icons/obj/food/burgerbread.dmi'
+	icon_state = "philly_cheesesteak"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 8)
+	tastes = list("bread" = 1, "juicy meat" = 1, "melted cheese" = 1, "onions" = 1)
+	foodtypes = GRAIN | MEAT | DAIRY | VEGETABLES
+	food_flags = FOOD_FINGER_FOOD
+	w_class = WEIGHT_CLASS_SMALL

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

@@ -314,3 +314,19 @@
 	food_reagents = list (/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nutriment/protein = 6)
 	tastes = list("creamy broth"= 1, "fish" = 1, "vegetables" = 1)
 	foodtypes = VEGETABLES | SEAFOOD | DAIRY
+
+/obj/item/food/soup/chicken_noodle_soup
+	name = "chicken noodle soup"
+	desc = "A hearty bowl of chicken noodle soup, perfect for when you're stuck at home and sick."
+	icon_state = "chicken_noodle_soup"
+	food_reagents = list (/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/nutriment/protein = 6)
+	tastes = list("broth"= 1, "chicken" = 1, "noodles" = 1, "carrots" = 1)
+	foodtypes = VEGETABLES | MEAT | GRAIN
+
+/obj/item/food/soup/corn_chowder
+	name = "corn chowder"
+	desc = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough."
+	icon_state = "corn_chowder"
+	food_reagents = list (/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/nutriment/protein = 6)
+	tastes = list("creamy broth"= 1, "bacon" = 1, "mixed vegetables" = 1)
+	foodtypes = VEGETABLES | MEAT

code/modules/food_and_drinks/recipes/food_mixtures.dm

@@ -173,17 +173,15 @@
 	results = list(/datum/reagent/consumable/pancakebatter = 15)
 	required_reagents = list(/datum/reagent/consumable/eggyolk = 6, /datum/reagent/consumable/eggwhite = 12, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/flour = 5)
 
-/datum/chemical_reaction/food/ricebowl
+/datum/chemical_reaction/food/uncooked_rice
 	required_reagents = list(/datum/reagent/consumable/rice = 10, /datum/reagent/water = 10)
-	required_container = /obj/item/reagent_containers/cup/bowl
 	mix_message = "The rice absorbs the water."
 	reaction_flags = REACTION_INSTANT
 
-/datum/chemical_reaction/food/ricebowl/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
+/datum/chemical_reaction/food/uncooked_rice/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
 	var/location = get_turf(holder.my_atom)
-	new /obj/item/food/salad/ricebowl(location)
-	if(holder?.my_atom)
-		qdel(holder.my_atom)
+	for(var/i in 1 to created_volume)
+		new /obj/item/food/uncooked_rice(location)
 
 /datum/chemical_reaction/food/nutriconversion
 	results = list(/datum/reagent/consumable/nutriment/peptides = 0.5)
@@ -279,3 +277,9 @@
 /datum/chemical_reaction/food/quality_oil
 	results = list(/datum/reagent/consumable/quality_oil = 2)
 	required_reagents = list(/datum/reagent/consumable/olivepaste = 4, /datum/reagent/water = 1)
+	reaction_flags = REACTION_INSTANT
+
+/datum/chemical_reaction/food/vinegar
+	results = list(/datum/reagent/consumable/vinegar = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/wine = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
+	reaction_flags = REACTION_INSTANT

code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm

@@ -43,7 +43,8 @@
 /datum/crafting_recipe/food/eggbowl
 	name = "Egg bowl"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/boiledegg = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/grown/corn = 1

code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm

@@ -172,7 +172,8 @@
 /datum/crafting_recipe/food/ricepork
 	name = "Rice and Pork"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/meat/cutlet = 2
 	)
 	result = /obj/item/food/salad/ricepork
@@ -211,7 +212,8 @@
 /datum/crafting_recipe/food/gumbo
 	name = "Black eyed gumbo"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/grown/peas = 1,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/meat/cutlet = 1
@@ -282,3 +284,14 @@
 	)
 	result = /obj/item/food/canned/envirochow
 	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/meatloaf
+	name = "Meatloaf"
+	reqs = list(
+		/obj/item/food/meat/slab = 3,
+		/obj/item/food/grown/onion = 1,
+		/obj/item/food/grown/garlic = 1,
+		/datum/reagent/consumable/ketchup = 10,
+	)
+	result = /obj/item/food/raw_meatloaf
+	subcategory = CAT_MEAT

code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm

@@ -124,3 +124,69 @@
 	)
 	result = /obj/item/food/chipsandsalsa
 	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/classic_chimichanga
+	name = "Classic Chimichanga"
+	reqs = list(
+		/obj/item/food/tortilla = 1,
+		/obj/item/food/meat/cutlet = 2,
+		/obj/item/food/cheese/wedge = 1,
+		/obj/item/food/grown/onion = 1,
+	)
+	result = /obj/item/food/classic_chimichanga
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/vegetarian_chimichanga
+	name = "Vegetarian Chimichanga"
+	reqs = list(
+		/obj/item/food/tortilla = 1,
+		/obj/item/food/grown/cabbage = 1,
+		/obj/item/food/grown/onion = 1,
+		/obj/item/food/grown/chili = 1,
+	)
+	result = /obj/item/food/vegetarian_chimichanga
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/classic_hard_shell_taco
+	name = "Classic Hard-Shell Taco"
+	reqs = list(
+		/obj/item/food/hard_taco_shell = 1,
+		/obj/item/food/meat/cutlet = 1,
+		/obj/item/food/cheese/wedge = 1,
+		/obj/item/food/grown/tomato = 1,
+		/obj/item/food/grown/cabbage = 1,
+	)
+	result = /obj/item/food/classic_hard_shell_taco
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/plain_hard_shell_taco
+	name = "Plain Hard-Shell Taco"
+	reqs = list(
+		/obj/item/food/hard_taco_shell = 1,
+		/obj/item/food/meat/cutlet = 1,
+	)
+	result = /obj/item/food/plain_hard_shell_taco
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/refried_beans
+	name = "Refried Beans"
+	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
+		/obj/item/food/grown/soybeans = 2,
+		/datum/reagent/water = 5,
+		/obj/item/food/grown/onion = 1,
+	)
+	result = /obj/item/food/refried_beans
+	subcategory = CAT_MEXICAN
+
+/datum/crafting_recipe/food/spanish_rice
+	name = "Spanish Rice"
+	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
+		/obj/item/food/boiledrice = 1,
+		/obj/item/food/grown/tomato = 1,
+		/datum/reagent/consumable/salt = 1,
+		/datum/reagent/consumable/blackpepper = 1,
+	)
+	result = /obj/item/food/spanish_rice
+	subcategory = CAT_MEXICAN

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -49,16 +49,6 @@
 	result = /obj/item/food/chocoorange
 	subcategory = CAT_MISCFOOD
 
-/datum/crafting_recipe/food/loadedbakedpotato
-	name = "Loaded baked potato"
-	time = 40
-	reqs = list(
-		/obj/item/food/grown/potato = 1,
-		/obj/item/food/cheese/wedge = 1
-	)
-	result = /obj/item/food/loadedbakedpotato
-	subcategory = CAT_MISCFOOD
-
 /datum/crafting_recipe/food/cheesyfries
 	name = "Cheesy fries"
 	reqs = list(
@@ -141,9 +131,10 @@
 /datum/crafting_recipe/food/ricepudding
 	name = "Rice pudding"
 	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/datum/reagent/consumable/milk = 5,
 		/datum/reagent/consumable/sugar = 5,
-		/obj/item/food/salad/boiledrice = 1
+		/obj/item/food/boiledrice = 1
 	)
 	result = /obj/item/food/salad/ricepudding
 	subcategory = CAT_MISCFOOD
@@ -151,9 +142,10 @@
 /datum/crafting_recipe/food/risotto
 	name = "Risotto"
 	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/cheese/wedge = 1,
 		/datum/reagent/consumable/ethanol/wine = 5,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/grown/mushroom/chanterelle = 1
 	)
 	result = /obj/item/food/salad/risotto
@@ -252,7 +244,7 @@
 	name = "Stuffed cabbage"
 	reqs = list(
 		/obj/item/food/meat/cutlet = 2,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/grown/cabbage = 1,
 		/obj/item/food/grown/tomato = 1,
 	)
@@ -274,7 +266,7 @@
 /datum/crafting_recipe/food/onigiri
 	name = "Onigiri"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/seaweedsheet = 1,
 	)
 	result = /obj/item/food/onigiri
@@ -286,7 +278,6 @@
 		/obj/item/food/grown/potato = 2,
 		/obj/item/food/grown/garlic = 1,
 		/obj/item/food/butter = 1,
-		/datum/reagent/consumable/milk = 1,
 	)
 	result = /obj/item/food/mashed_potatoes
 	subcategory = CAT_MISCFOOD
@@ -342,3 +333,101 @@
 	)
 	result = /obj/item/food/popcorn/salty
 	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/buttered_baked_potato
+	name = "Buttered baked potato"
+	reqs = list(
+		/obj/item/food/baked_potato = 1,
+		/obj/item/food/butter = 1,
+	)
+	result = /obj/item/food/buttered_baked_potato
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/loaded_baked_potato
+	name = "Loaded baked potato"
+	reqs = list(
+		/obj/item/food/baked_potato = 1,
+		/obj/item/food/cheese/wedge = 1,
+		/obj/item/food/meat/bacon = 1,
+		/obj/item/food/grown/cabbage = 1,
+	)
+	result = /obj/item/food/loaded_baked_potato
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/cheese_pierogi
+	name = "Cheese pierogi"
+	reqs = list(
+		/obj/item/food/doughslice = 1,
+		/obj/item/food/grown/potato = 1,
+		/obj/item/food/cheese/wedge = 1,
+	)
+	result = /obj/item/food/cheese_pierogi
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/meat_pierogi
+	name = "Meat pierogi"
+	reqs = list(
+		/obj/item/food/doughslice = 1,
+		/obj/item/food/grown/potato = 1,
+		/obj/item/food/meat/cutlet = 1,
+	)
+	result = /obj/item/food/meat_pierogi
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/raw_meat_calzone
+	name = "Meat calzone"
+	reqs = list(
+		/obj/item/food/flatdough = 1,
+		/obj/item/food/cheese/wedge = 2,
+		/obj/item/food/meat/rawcutlet = 3,
+		/obj/item/food/grown/tomato = 1,
+	)
+	result = /obj/item/food/raw_meat_calzone
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/raw_vegetarian_calzone
+	name = "Vegetarian calzone"
+	reqs = list(
+		/obj/item/food/flatdough = 1,
+		/obj/item/food/grown/tomato = 1,
+		/obj/item/food/grown/cabbage = 1,
+		/obj/item/food/grown/onion = 1,
+	)
+	result = /obj/item/food/raw_vegetarian_calzone
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/caramel_truffle
+	name = "Caramel truffle"
+	reqs = list(
+		/obj/item/food/chocolatebar = 1,
+		/datum/reagent/consumable/caramel = 5,
+	)
+	result = /obj/item/food/caramel_truffle
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/chocolate_truffle
+	name = "Chocolate truffle"
+	reqs = list(
+		/obj/item/food/chocolatebar = 1,
+		/datum/reagent/consumable/sugar = 5,
+	)
+	result = /obj/item/food/chocolate_truffle
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/peanut_truffle
+	name = "Peanut truffle"
+	reqs = list(
+		/obj/item/food/chocolatebar = 1,
+		/obj/item/food/grown/peanut = 1,
+	)
+	result = /obj/item/food/peanut_truffle
+	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/peanut_butter_cup
+	name = "Peanut butter cup"
+	reqs = list(
+		/obj/item/food/chocolatebar = 1,
+		/datum/reagent/consumable/peanut_butter = 5,
+	)
+	result = /obj/item/food/peanut_butter_cup
+	subcategory = CAT_MISCFOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm

@@ -43,10 +43,11 @@
 /datum/crafting_recipe/food/squeaking_stir_fry
 	name = "Skeklitmischtpoppl (Squeaking stir fry)"
 	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/cheese/cheese_curds = 1,
 		/obj/item/food/tofu = 1,
 		/obj/item/food/grown/chili = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/onion_slice = 1
 	)
@@ -100,7 +101,7 @@
 /datum/crafting_recipe/food/raw_baked_rice
 	name = "Big baked rice"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 2,
+		/obj/item/food/boiledrice = 2,
 		/obj/item/food/soup/vegetable = 1,
 		/obj/item/food/grown/potato = 2,
 		/obj/item/food/grown/chili = 1,
@@ -267,7 +268,8 @@
 /datum/crafting_recipe/food/rice_porridge
 	name = "Rice porridge"
 	reqs = list(
-		/obj/item/food/salad/ricebowl = 1,
+		/obj/item/reagent_containers/cup/bowl = 1,
+		/obj/item/food/boiledrice = 1,
 		/datum/reagent/water = 10,
 		/datum/reagent/consumable/salt = 2
 	)

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -607,3 +607,27 @@
 	)
 	result = /obj/item/food/raw_brownie_batter
 	subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/peanut_butter_brownie_batter
+	name = "Raw peanut butter brownie batter"
+	reqs = list(
+		/datum/reagent/consumable/flour = 5,
+		/datum/reagent/consumable/sugar = 5,
+		/obj/item/food/egg = 2,
+		/datum/reagent/consumable/coco = 5,
+		/datum/reagent/consumable/peanut_butter = 5,
+		/obj/item/food/butter = 1
+	)
+	result = /obj/item/food/peanut_butter_brownie_batter
+	subcategory = CAT_PASTRY
+
+/datum/crafting_recipe/food/crunchy_peanut_butter_tart
+	name = "Crunchy peanut butter tart"
+	reqs = list(
+		/obj/item/food/pastrybase = 1,
+		/datum/reagent/consumable/peanut_butter = 5,
+		/obj/item/food/grown/peanut = 1,
+		/datum/reagent/consumable/cream = 5,
+	)
+	result = /obj/item/food/crunchy_peanut_butter_tart
+	subcategory = CAT_PASTRY

code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm

@@ -105,3 +105,13 @@
 	result = /obj/item/food/peanut_butter_banana_sandwich
 	subcategory = CAT_SANDWICH
 
+/datum/crafting_recipe/food/philly_cheesesteak
+	name = "Philly Cheesesteak"
+	reqs = list(
+		/obj/item/food/breadslice/plain = 2,
+		/obj/item/food/meat/cutlet = 2,
+		/obj/item/food/cheese/wedge = 1,
+		/obj/item/food/grown/onion = 1,
+	)
+	result = /obj/item/food/philly_cheesesteak
+	subcategory = CAT_SANDWICH

code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm

@@ -62,7 +62,7 @@
 	name ="Vegetarian sushi roll"
 	reqs = list(
 		/obj/item/food/seaweedsheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/grown/potato = 1
 	)
@@ -73,7 +73,7 @@
 	name ="Spicy filet sushi roll"
 	reqs = list(
 		/obj/item/food/seaweedsheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/fishmeat = 1,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/onion = 1
@@ -85,7 +85,7 @@
 	name ="Nigiri sushi"
 	reqs = list(
 		/obj/item/food/seaweedsheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/fishmeat = 1,
 		/datum/reagent/consumable/soysauce = 2
 	)
@@ -95,8 +95,9 @@
 /datum/crafting_recipe/food/meat_poke
 	name ="Meat poke"
 	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/seaweedsheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/meat/cutlet = 3,
 		/obj/item/food/grown/cabbage = 1,
 		/obj/item/food/tofu = 1,
@@ -109,8 +110,9 @@
 /datum/crafting_recipe/food/fish_poke
 	name ="Fish poke"
 	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/seaweedsheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/fishmeat = 1,
 		/obj/item/food/grown/cabbage = 1,
 		/obj/item/food/tofu = 1,

code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm

@@ -266,7 +266,7 @@
 		/datum/reagent/water = 10,
 		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/meat/crab = 1,
-		/obj/item/food/salad/boiledrice = 1
+		/obj/item/food/boiledrice = 1
 	)
 	result = /obj/item/food/soup/bisque
 	subcategory = CAT_SOUP
@@ -309,12 +309,13 @@
 /datum/crafting_recipe/food/indian_curry
 	name = "Indian Chicken Curry"
 	reqs = list(
+		/obj/item/reagent_containers/cup/bowl = 1,
 		/obj/item/food/meat/slab/chicken = 1,
 		/obj/item/food/grown/onion = 2,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/garlic = 1,
 		/obj/item/food/butter = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/datum/reagent/consumable/cream = 5
 	)
 	result = /obj/item/food/soup/indian_curry
@@ -356,3 +357,28 @@
 	)
 	result = /obj/item/food/soup/cullen_skink
 	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/chicken_noodle_soup
+	name = "Chicken Noodle Soup"
+	reqs = list(
+		/obj/item/food/meat/slab/chicken = 1,
+		/obj/item/food/spaghetti/boiledspaghetti = 1,
+		/obj/item/food/grown/carrot = 1,
+		/datum/reagent/water = 10,
+		/obj/item/reagent_containers/cup/bowl = 1,
+	)
+	result = /obj/item/food/soup/chicken_noodle_soup
+	subcategory = CAT_SOUP
+
+/datum/crafting_recipe/food/corn_chowder
+	name = "Corn Chowder"
+	reqs = list(
+		/obj/item/food/grown/corn = 1,
+		/obj/item/food/grown/potato = 1,
+		/obj/item/food/grown/carrot = 1,
+		/obj/item/food/meat/bacon = 1,
+		/datum/reagent/consumable/cream = 5,
+		/obj/item/reagent_containers/cup/bowl = 1,
+	)
+	result = /obj/item/food/soup/corn_chowder
+	subcategory = CAT_SOUP

code/modules/hydroponics/grown/potato.dm

@@ -28,6 +28,9 @@
 	juice_results = list(/datum/reagent/consumable/potato_juice = 0)
 	distill_reagent = /datum/reagent/consumable/ethanol/vodka
 
+/obj/item/food/grown/potato/MakeBakeable()
+	AddComponent(/datum/component/bakeable, /obj/item/food/baked_potato, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
+
 /obj/item/food/grown/potato/wedges
 	name = "potato wedges"
 	desc = "Slices of neatly cut potato."