diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 5dc010bfae9..f690e5f4231 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -1041,6 +1041,21 @@ filling_color = "#EDDD00" list_reagents = list("nutriment" = 1, "vitamin" = 1) +/obj/item/reagent_containers/food/snacks/macaroni + name = "Macaroni twists" + desc = "These are little twists of raw macaroni." + icon_state = "macaroni" + filling_color = "#EDDD00" + list_reagents = list("nutriment" = 1, "vitamin" = 1) + +/obj/item/reagent_containers/food/snacks/macncheese + name = "Macaroni cheese" + desc = "One of the most comforting foods in the world. Apparently." + trash = /obj/item/trash/snack_bowl + icon_state = "macncheese" + filling_color = "#ffe45d" + list_reagents = list("nutriment" = 5, "vitamin" = 2, "cheese" = 4) + /obj/item/reagent_containers/food/snacks/cheesyfries name = "Cheesy Fries" desc = "Fries. Covered in cheese. Duh." @@ -2073,6 +2088,20 @@ icon_state = "hawaiianpizzaslice" filling_color = "#e5b437" +/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza + name = "Macaroni cheese pizza" + desc = "Gastronomists have yet to classify this dish as 'pizza'." + icon_state = "macpizza" + slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice + list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious + filling_color = "#ffe45d" + +/obj/item/reagent_containers/food/snacks/macpizzaslice + name = "Macaroni cheese pizza slice" + desc = "A delicious slice of pizza topped with macaroni cheese... wait, what the hell? Who would do this?!" + icon_state = "macpizzaslice" + filling_color = "#ffe45d" + /obj/item/pizzabox name = "pizza box" desc = "A box suited for pizzas." diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index dfbea528d53..ad4dcb5e4d8 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -87,6 +87,10 @@ input = /obj/item/reagent_containers/food/snacks/doughslice output = /obj/item/reagent_containers/food/snacks/spaghetti +/datum/food_processor_process/macaroni + input = /obj/item/reagent_containers/food/snacks/spaghetti + output = /obj/item/reagent_containers/food/snacks/macaroni + /datum/food_processor_process/parsnip input = /obj/item/reagent_containers/food/snacks/grown/parsnip output = /obj/item/reagent_containers/food/snacks/roastparsnip diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index effbcef37ba..70169476c9d 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -396,6 +396,14 @@ ) result = /obj/item/reagent_containers/food/snacks/spesslaw +/datum/recipe/microwave/macncheese + reagents = list("water" = 5, "milk" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/macaroni, + ) + result = /obj/item/reagent_containers/food/snacks/macncheese + /datum/recipe/microwave/superbiteburger reagents = list("sodiumchloride" = 5, "blackpepper" = 5) items = list( diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index b4b636a6ee7..025670aa817 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -264,6 +264,15 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza +/datum/recipe/oven/macncheesepizza + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/macncheese, + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza + /datum/recipe/oven/amanita_pie items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 3395b112947..3a0ec216714 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ