From 1b3e1dc7efa7385d2a64368c3481a239feb4400a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 4 Mar 2021 22:37:28 +0100 Subject: [PATCH] [MIRROR] Breads put back into bread instead of misc (#3871) * Breads put back into bread instead of misc (#57379) Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * Breads put back into bread instead of misc Co-authored-by: carshalash Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> --- .../recipes/tablecraft/recipes_bread.dm | 49 +++++++++++++++++++ .../recipes/tablecraft/recipes_misc.dm | 48 ------------------ 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index 37d58749e1f..52fda5abae1 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -103,6 +103,55 @@ result = /obj/item/food/butterdog subcategory = CAT_BREAD +/datum/crafting_recipe/food/baguette + name = "Baguette" + time = 40 + reqs = list(/datum/reagent/consumable/salt = 1, + reqs = list(/datum/reagent/consumable/salt = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/food/pastrybase = 2 + ) + result = /obj/item/food/baguette + subcategory = CAT_BREAD + +////////////////////////////////////////////////TOAST//////////////////////////////////////////////// + +/datum/crafting_recipe/food/slimetoast + name = "Slime toast" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /obj/item/food/breadslice/plain = 1 + ) + result = /obj/item/food/jelliedtoast/slime + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/jelliedyoast + name = "Jellied toast" + reqs = list( + /datum/reagent/consumable/cherryjelly = 5, + /obj/item/food/breadslice/plain = 1 + ) + result = /obj/item/food/jelliedtoast/cherry + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/butteredtoast + name = "Buttered Toast" + reqs = list( + /obj/item/food/breadslice/plain = 1, + /obj/item/food/butter = 1 + ) + result = /obj/item/food/butteredtoast + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/twobread + name = "Two bread" + reqs = list( + /datum/reagent/consumable/ethanol/wine = 5, + /obj/item/food/breadslice/plain = 2 + ) + result = /obj/item/food/twobread + subcategory = CAT_BREAD + /datum/crafting_recipe/food/moldybread // why would you make this? name = "Moldy Bread" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 4d16537346c..682c04e2349 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -95,54 +95,6 @@ result = /obj/item/food/eggplantparm subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/baguette - name = "Baguette" - time = 40 - reqs = list(/datum/reagent/consumable/salt = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/food/pastrybase = 2 - ) - result = /obj/item/food/baguette - subcategory = CAT_MISCFOOD - -////////////////////////////////////////////////TOAST//////////////////////////////////////////////// - -/datum/crafting_recipe/food/slimetoast - name = "Slime toast" - reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/food/breadslice/plain = 1 - ) - result = /obj/item/food/jelliedtoast/slime - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/jelliedyoast - name = "Jellied toast" - reqs = list( - /datum/reagent/consumable/cherryjelly = 5, - /obj/item/food/breadslice/plain = 1 - ) - result = /obj/item/food/jelliedtoast/cherry - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/butteredtoast - name = "Buttered Toast" - reqs = list( - /obj/item/food/breadslice/plain = 1, - /obj/item/food/butter = 1 - ) - result = /obj/item/food/butteredtoast - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/twobread - name = "Two bread" - reqs = list( - /datum/reagent/consumable/ethanol/wine = 5, - /obj/item/food/breadslice/plain = 2 - ) - result = /obj/item/food/twobread - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/burrito name ="Burrito" reqs = list(