diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 48db759b5a..5a2096d862 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -79,17 +79,19 @@ #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" +#define CAT_DONUT "Donuts" #define CAT_EGG "Egg-Based Food" #define CAT_MEAT "Meats" +#define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" #define CAT_PASTRY "Pastries" -#define CAT_PIE "Pies" +#define CAT_PIE "Pies & Sweets" #define CAT_PIZZA "Pizzas" #define CAT_SALAD "Salads" +#define CAT_SEAFOOD "Seafood" #define CAT_SANDWICH "Sandwiches" #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" -#define CAT_FISH "Fish" #define CAT_ICE "Frozen" #define RCD_FLOORWALL 1 diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index b5c7f34c27..cd3f05b326 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -27,14 +27,16 @@ CAT_BREAD, CAT_BURGER, CAT_CAKE, + CAT_DONUT, CAT_EGG, - CAT_FISH, CAT_ICE, CAT_MEAT, + CAT_MEXICAN, CAT_MISCFOOD, CAT_PASTRY, CAT_PIE, CAT_PIZZA, + CAT_SEAFOOD, CAT_SALAD, CAT_SANDWICH, CAT_SOUP, diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index eacf48d96d..643e426c9d 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -327,6 +327,8 @@ /obj/item/storage/bag/tray/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food, /obj/item/reagent_containers/glass, /datum/reagent/consumable, /obj/item/kitchen/knife, /obj/item/kitchen/rollingpin, /obj/item/kitchen/fork, /obj/item/storage/box)) //Should cover: Bottles, Beakers, Bowls, Booze, Glasses, Food, Kitchen Tools, and ingredient boxes. STR.insert_preposition = "on" /obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user) diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index bb37ec9b5d..89c4637ed9 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -85,6 +85,20 @@ tastes = list("cake" = 4, "cream cheese" = 3) foodtype = GRAIN | DAIRY +/obj/item/reagent_containers/food/snacks/store/cake/brioche + name = "brioche cake" + desc = "A ring of sweet, glazed buns." + icon_state = "briochecake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche + slices_num = 6 + bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) + +/obj/item/reagent_containers/food/snacks/cakeslice/brioche + name = "brioche cake slice" + desc = "Delicious sweet-bread. Who needs anything else?" + icon_state = "briochecake_slice" + filling_color = "#FFD700" + /obj/item/reagent_containers/food/snacks/cakeslice/cheese name = "cheese cake slice" desc = "Slice of pure cheestisfaction." diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index c65e42c0e4..0f2856c090 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -101,7 +101,7 @@ desc = "A fried egg with a side of bacon. Delicious!" icon_state = "baconegg" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - bitesize = 1 + bitesize = 2 filling_color = "#FFFFF0" tastes = list("egg" = 2, "bacon" = 2, "salt" = 1, "pepper" = 1) foodtype = MEAT | FRIED | BREAKFAST @@ -151,8 +151,17 @@ desc = "There is only one egg on this, how rude." icon_state = "benedict" bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4) - trash = /obj/item/trash/plate w_class = WEIGHT_CLASS_NORMAL + trash = /obj/item/trash/plate list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) foodtype = MEAT | BREAKFAST + +/obj/item/reagent_containers/food/snacks/scotchegg + name = "scotch egg" + desc = "A boiled egg wrapped in a delicious, seasoned meatball." + icon_state = "scotchegg" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + bitesize = 3 + filling_color = "#FFFFF0" + list_reagents = list(/datum/reagent/consumable/nutriment = 6) \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index a7090a5274..7dc2188100 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -674,3 +674,26 @@ if (7000 to INFINITY) burn() ..() + +//Easter Stuff + +/obj/item/reagent_containers/food/snacks/chocolatebunny + name = "chocolate bunny" + desc = "Contains less than 10% real rabbit!" + icon_state = "chocolatebunny" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) + filling_color = "#A0522D" + +/obj/item/reagent_containers/food/snacks/soup/mammi + name = "Mammi" + desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." + icon_state = "mammi" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) + +/obj/item/reagent_containers/food/snacks/hotcrossbun + bitesize = 2 + name = "hot-cross bun" + desc = "The Cross represents the Assistants that died for your sins." + icon_state = "hotcrossbun" \ No newline at end of file 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 e572cc76ff..c3890b28eb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -3,36 +3,6 @@ ////////////////////////////////////////////////BREAD//////////////////////////////////////////////// -/datum/crafting_recipe/food/meatbread - name = "Meat bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/meat - subcategory = CAT_BREAD - -/datum/crafting_recipe/food/xenomeatbread - name = "Xenomeat bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat - subcategory = CAT_BREAD - -/datum/crafting_recipe/food/spidermeatbread - name = "Spidermeat bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat - subcategory = CAT_BREAD - /datum/crafting_recipe/food/banananutbread name = "Banana nut bread" reqs = list( @@ -44,16 +14,6 @@ result = /obj/item/reagent_containers/food/snacks/store/bread/banana subcategory = CAT_BREAD -/datum/crafting_recipe/food/tofubread - name = "Tofu bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/tofu = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/tofu - subcategory = CAT_BREAD - /datum/crafting_recipe/food/creamcheesebread name = "Cream cheese bread" reqs = list( @@ -64,6 +24,16 @@ result = /obj/item/reagent_containers/food/snacks/store/bread/creamcheese subcategory = CAT_BREAD +/datum/crafting_recipe/food/meatbread + name = "Meat bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/meat + subcategory = CAT_BREAD + /datum/crafting_recipe/food/mimanabread name = "Mimana bread" reqs = list( @@ -75,6 +45,38 @@ result = /obj/item/reagent_containers/food/snacks/store/bread/mimana subcategory = CAT_BREAD +/datum/crafting_recipe/food/spidermeatbread + name = "Spidermeat bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/tofubread + name = "Tofu bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/tofu = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/tofu + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/xenomeatbread + name = "Xenomeat bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat + subcategory = CAT_BREAD + +////////////////////////////////////////////////TOAST//////////////////////////////////////////////// + /datum/crafting_recipe/food/butteredtoast name = "Buttered Toast" reqs = list( @@ -84,6 +86,45 @@ result = /obj/item/reagent_containers/food/snacks/butteredtoast subcategory = CAT_BREAD +/datum/crafting_recipe/food/slimetoast + name = "Slime toast" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/jelliedtoast + name = "Jellied toast" + reqs = list( + /datum/reagent/consumable/cherryjelly = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/peanutbuttertoast + name = "Peanut butter toast" + reqs = list( + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast + subcategory = CAT_BREAD + +////////////////////////////////////////////////MISC//////////////////////////////////////////////// + +/datum/crafting_recipe/food/baguette + name = "Baguette" + time = 40 + reqs = list(/datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 2 + ) + result = /obj/item/reagent_containers/food/snacks/baguette + subcategory = CAT_BREAD + /datum/crafting_recipe/food/butterbiscuit name = "Butter Biscuit" reqs = list( @@ -100,4 +141,13 @@ /obj/item/reagent_containers/food/snacks/butter = 3, ) result = /obj/item/reagent_containers/food/snacks/butterdog + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/twobread + name = "Two bread" + reqs = list( + /datum/reagent/consumable/ethanol/wine = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 2 + ) + result = /obj/item/reagent_containers/food/snacks/twobread subcategory = CAT_BREAD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index ffa8709245..cf96c01e7b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -1,8 +1,74 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////BURGERS//////////////////////////////////////////////// +////////////////////////////////////////////////STANDARD BURGS//////////////////////////////////////////////// +/datum/crafting_recipe/food/burger + name = "Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/burger/plain + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/baconburger + name = "Bacon Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/bacon = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/burger/baconburger + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/bigbiteburger + name = "Big bite burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/bigbite + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/superbiteburger + name = "Super bite burger" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 5, + /datum/reagent/consumable/blackpepper = 5, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5, + /obj/item/reagent_containers/food/snacks/grown/tomato = 4, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3, + /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/reagent_containers/food/snacks/meat/bacon = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + + ) + result = /obj/item/reagent_containers/food/snacks/burger/superbite + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/cheeseburger + name = "Cheese Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/cheese + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/corgiburger + name = "Corgi burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/burger/corgi + subcategory = CAT_BURGER /datum/crafting_recipe/food/humanburger name = "Human burger" @@ -16,26 +82,37 @@ result = /obj/item/reagent_containers/food/snacks/burger/human subcategory = CAT_BURGER -/datum/crafting_recipe/food/burger - name = "Burger" +/datum/crafting_recipe/food/ribburger + name = "McRib" reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs + /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. /obj/item/reagent_containers/food/snacks/bun = 1 ) - - result = /obj/item/reagent_containers/food/snacks/burger/plain + result = /obj/item/reagent_containers/food/snacks/burger/rib subcategory = CAT_BURGER -/datum/crafting_recipe/food/corgiburger - name = "Corgi burger" +/datum/crafting_recipe/food/mcguffin + name = "McGuffin" reqs = list( - /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1, + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/meat/bacon = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - - result = /obj/item/reagent_containers/food/snacks/burger/corgi + result = /obj/item/reagent_containers/food/snacks/burger/mcguffin subcategory = CAT_BURGER +/datum/crafting_recipe/food/tofuburger + name = "Tofu burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/tofu = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/tofu + subcategory = CAT_BURGER + +///////////////EXOTIC////////////////// + /datum/crafting_recipe/food/appendixburger name = "Appendix burger" reqs = list( @@ -54,15 +131,6 @@ result = /obj/item/reagent_containers/food/snacks/burger/brain subcategory = CAT_BURGER -/datum/crafting_recipe/food/xenoburger - name = "Xeno burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/xeno - subcategory = CAT_BURGER - /datum/crafting_recipe/food/bearger name = "Bearger" reqs = list( @@ -72,6 +140,16 @@ result = /obj/item/reagent_containers/food/snacks/burger/bearger subcategory = CAT_BURGER +/datum/crafting_recipe/food/chickenburger + name = "Chicken Sandwich" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1, + /datum/reagent/consumable/mayonnaise = 5, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/chicken + subcategory = CAT_BURGER + /datum/crafting_recipe/food/fishburger name = "Fish burger" reqs = list( @@ -82,25 +160,73 @@ result = /obj/item/reagent_containers/food/snacks/burger/fish subcategory = CAT_BURGER -/datum/crafting_recipe/food/tofuburger - name = "Tofu burger" +/datum/crafting_recipe/food/fivealarmburger + name = "Five alarm burger" reqs = list( - /obj/item/reagent_containers/food/snacks/tofu = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 + /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/tofu + result = /obj/item/reagent_containers/food/snacks/burger/fivealarm subcategory = CAT_BURGER -/datum/crafting_recipe/food/ghostburger - name = "Ghost burger" +/datum/crafting_recipe/food/slimeburger + name = "Jelly burger" reqs = list( - /obj/item/ectoplasm = 1, - /datum/reagent/consumable/sodiumchloride = 2, + /datum/reagent/toxin/slimejelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/ghost + result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime subcategory = CAT_BURGER +/datum/crafting_recipe/food/jellyburger + name = "Jelly burger" + reqs = list( + /datum/reagent/consumable/cherryjelly = 5, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/baseballburger + name = "Home run baseball burger" + reqs = list( + /obj/item/melee/baseball_bat = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/baseball + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/ratburger + name = "Rat burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/deadmouse = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/rat + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/soylentburger + name = "Soylent Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth. + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/soylent + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/xenoburger + name = "Xeno burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/xeno + subcategory = CAT_BURGER + +////////////MYSTICAL//////////////// + /datum/crafting_recipe/food/clownburger name = "Clown burger" reqs = list( @@ -119,6 +245,35 @@ result = /obj/item/reagent_containers/food/snacks/burger/mime subcategory = CAT_BURGER +/datum/crafting_recipe/food/ghostburger + name = "Ghost burger" + reqs = list( + /obj/item/ectoplasm = 1, + /datum/reagent/consumable/sodiumchloride = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/ghost + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/spellburger + name = "Spell burger" + reqs = list( + /obj/item/clothing/head/wizard/fake = 1, + ) + result = /obj/item/reagent_containers/food/snacks/burger/spell + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/spellburger2 + name = "Spell burger" + reqs = list( + /obj/item/clothing/head/wizard = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/spell + subcategory = CAT_BURGER + +////////////COLORED BURGERS////////////// + /datum/crafting_recipe/food/redburger name = "Red burger" reqs = list( @@ -197,154 +352,4 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/reagent_containers/food/snacks/burger/white - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/spellburger - name = "Spell burger" - reqs = list( - /obj/item/clothing/head/wizard/fake = 1, - ) - result = /obj/item/reagent_containers/food/snacks/burger/spell - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/spellburger2 - name = "Spell burger" - reqs = list( - /obj/item/clothing/head/wizard = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/spell - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/bigbiteburger - name = "Big bite burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/bigbite - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/superbiteburger - name = "Super bite burger" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 5, - /datum/reagent/consumable/blackpepper = 5, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5, - /obj/item/reagent_containers/food/snacks/grown/tomato = 4, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3, - /obj/item/reagent_containers/food/snacks/boiledegg = 1, - /obj/item/reagent_containers/food/snacks/meat/bacon = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - - ) - result = /obj/item/reagent_containers/food/snacks/burger/superbite - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/slimeburger - name = "Jelly burger" - reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/jellyburger - name = "Jelly burger" - reqs = list( - /datum/reagent/consumable/cherryjelly = 5, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/fivealarmburger - name = "Five alarm burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/fivealarm - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/ratburger - name = "Rat burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/deadmouse = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/rat - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/baseballburger - name = "Home run baseball burger" - reqs = list( - /obj/item/melee/baseball_bat = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/baseball - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/baconburger - name = "Bacon Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/bacon = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/burger/baconburger - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/cheeseburger - name = "Cheese Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/cheese - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/soylentburger - name = "Soylent Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth. - /obj/item/reagent_containers/food/snacks/cheesewedge = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/soylent - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/ribburger - name = "McRib" - reqs = list( - /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs - /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/rib - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/mcguffin - name = "McGuffin" - reqs = list( - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/meat/bacon = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/mcguffin - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/chickenburger - name = "Chicken Sandwich" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1, - /datum/reagent/consumable/mayonnaise = 5, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/chicken subcategory = CAT_BURGER \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index f168896164..f6441210f6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -1,7 +1,93 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////CAKE//////////////////////////////////////////////// +////////////////////////////////////////////////FRUIT CAKE//////////////////////////////////////////////// + +/datum/crafting_recipe/food/applecake + name = "Apple cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/apple = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/apple + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/bscccake + name = "Blackberry and strawberry chocolate cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 2, + /obj/item/reagent_containers/food/snacks/grown/berries = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/bscc + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/bscvcake + name = "Blackberry and strawberry vanilla cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/lemoncake + name = "Lemon cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/lemon + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/limecake + name = "Lime cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/lime + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/orangecake + name = "Orange cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/orange + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/peachcake + name = "Peach cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/peach = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake + subcategory = CAT_CAKE + +///////////////////////////////////FANCY//////////////////////////////////////////// + +/datum/crafting_recipe/food/birthdaycake + name = "Birthday cake" + reqs = list( + /datum/reagent/consumable/sugar = 5, + /datum/reagent/consumable/caramel =2, + /obj/item/candle = 1, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/birthday + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/briochecake + name = "Brioche cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /datum/reagent/consumable/sugar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/brioche + subcategory = CAT_CAKE /datum/crafting_recipe/food/carrotcake name = "Carrot cake" @@ -21,42 +107,6 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/cheese subcategory = CAT_CAKE -/datum/crafting_recipe/food/applecake - name = "Apple cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/apple = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/apple - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/orangecake - name = "Orange cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/orange - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/limecake - name = "Lime cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/lime - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/lemoncake - name = "Lemon cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/lemon - subcategory = CAT_CAKE - /datum/crafting_recipe/food/chocolatecake name = "Chocolate cake" reqs = list( @@ -66,35 +116,6 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/chocolate subcategory = CAT_CAKE -/datum/crafting_recipe/food/birthdaycake - name = "Birthday cake" - reqs = list( - /datum/reagent/consumable/sugar = 5, - /datum/reagent/consumable/caramel =2, - /obj/item/candle = 1, - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/birthday - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/braincake - name = "Brain cake" - reqs = list( - /obj/item/organ/brain = 1, - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/brain - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/slimecake - name = "Slime cake" - reqs = list( - /obj/item/slime_extract = 1, - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake - subcategory = CAT_CAKE - /datum/crafting_recipe/food/pumpkinspicecake name = "Pumpkin spice cake" reqs = list( @@ -104,6 +125,26 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice subcategory = CAT_CAKE +/datum/crafting_recipe/food/poundcake + name = "Pound cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 4 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/vanillacake + name = "Vanilla cake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake + subcategory = CAT_CAKE + +/////////////SPECIAL//////////// + /datum/crafting_recipe/food/holycake name = "Angel food cake" reqs = list( @@ -113,12 +154,24 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake subcategory = CAT_CAKE -/datum/crafting_recipe/food/poundcake - name = "Pound cake" +/datum/crafting_recipe/food/braincake + name = "Brain cake" reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 4 + /obj/item/organ/brain = 1, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake + result = /obj/item/reagent_containers/food/snacks/store/cake/brain + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/clowncake + name = "Clown cake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/sundae = 2, + /obj/item/reagent_containers/food/snacks/grown/banana = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake subcategory = CAT_CAKE /datum/crafting_recipe/food/hardwarecake @@ -131,53 +184,13 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake subcategory = CAT_CAKE -/datum/crafting_recipe/food/bscccake - name = "blackberry and strawberry chocolate cake" +/datum/crafting_recipe/food/slimecake + name = "Slime cake" reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 2, - /obj/item/reagent_containers/food/snacks/grown/berries = 5 + /obj/item/slime_extract = 1, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/store/cake/bscc - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/bscvcake - name = "blackberry and strawberry vanilla cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 5 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/clowncake - name = "clown cake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/sundae = 2, - /obj/item/reagent_containers/food/snacks/grown/banana = 5 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/vanillacake - name = "vanilla cake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/peachcake - name = "Peach cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/peach = 5 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake + result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake subcategory = CAT_CAKE /datum/crafting_recipe/food/trumpetcake diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm new file mode 100644 index 0000000000..ac5576ac25 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm @@ -0,0 +1,255 @@ +// see code/module/crafting/table.dm + +////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// + +/datum/crafting_recipe/food/donut + time = 15 + name = "Donut" + reqs = list( + /datum/reagent/consumable/sugar = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/plain + subcategory = CAT_DONUT + +/datum/crafting_recipe/food/donut/chaos + name = "Chaos donut" + reqs = list( + /datum/reagent/consumable/frostoil = 5, + /datum/reagent/consumable/capsaicin = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/chaos + +datum/crafting_recipe/food/donut/meat + time = 15 + name = "Meat donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/slab = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/meat + +/datum/crafting_recipe/food/donut/jelly + name = "Jelly donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/plain + +/datum/crafting_recipe/food/donut/slimejelly + name = "Slime jelly donut" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain + +/datum/crafting_recipe/food/donut/glaze + time = 15 + name = "glaze donut" + reqs = list( + /datum/reagent/consumable/sugar = 10, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/glaze + subcategory = CAT_DONUT + +/datum/crafting_recipe/food/donut/berry + name = "Berry Donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/berry + +/datum/crafting_recipe/food/donut/trumpet + name = "Spaceman's Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/donut/trumpet + +/datum/crafting_recipe/food/donut/apple + name = "Apple Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/apple + +/datum/crafting_recipe/food/donut/caramel + name = "Caramel Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/caramel + +/datum/crafting_recipe/food/donut/choco + name = "Chocolate Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/choco + +/datum/crafting_recipe/food/donut/blumpkin + name = "Blumpkin Donut" + reqs = list( + /datum/reagent/consumable/blumpkinjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/blumpkin + +/datum/crafting_recipe/food/donut/bungo + name = "Bungo Donut" + reqs = list( + /datum/reagent/consumable/bungojuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/bungo + +/datum/crafting_recipe/food/donut/matcha + name = "Matcha Donut" + reqs = list( + /datum/reagent/toxin/teapowder = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/matcha + +////////////////////////////////////////////////////JELLY DONUTS/////////////////////////////////////////////////////// + +/datum/crafting_recipe/food/donut/jelly/apple + name = "Apple Jelly Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple + +/datum/crafting_recipe/food/donut/jelly/berry + name = "Berry Jelly Donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry + +/datum/crafting_recipe/food/donut/jelly/blumpkin + name = "Blumpkin Jelly Donut" + reqs = list( + /datum/reagent/consumable/blumpkinjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin + +/datum/crafting_recipe/food/donut/jelly/bungo + name = "Bungo Jelly Donut" + reqs = list( + /datum/reagent/consumable/bungojuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo + +/datum/crafting_recipe/food/donut/jelly/caramel + name = "Caramel Jelly Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel + +/datum/crafting_recipe/food/donut/jelly/choco + name = "Chocolate Jelly Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco + +/datum/crafting_recipe/food/donut/jelly/matcha + name = "Matcha Jelly Donut" + reqs = list( + /datum/reagent/toxin/teapowder = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha + +/datum/crafting_recipe/food/donut/jelly/trumpet + name = "Spaceman's Jelly Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet + +////////////////////////////////////////////////////SLIME DONUTS/////////////////////////////////////////////////////// + +/datum/crafting_recipe/food/donut/slimejelly/apple + name = "Apple Slime Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple + +/datum/crafting_recipe/food/donut/slimejelly/berry + name = "Berry Slime Donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry + +/datum/crafting_recipe/food/donut/slimejelly/blumpkin + name = "Blumpkin Slime Donut" + reqs = list( + /datum/reagent/consumable/blumpkinjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin + +/datum/crafting_recipe/food/donut/slimejelly/bungo + name = "Bungo Slime Donut" + reqs = list( + /datum/reagent/consumable/bungojuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo + +/datum/crafting_recipe/food/donut/slimejelly/caramel + name = "Caramel Slime Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel + +/datum/crafting_recipe/food/donut/slimejelly/choco + name = "Chocolate Slime Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco + +/datum/crafting_recipe/food/donut/slimejelly/trumpet + name = "Spaceman's Slime Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet + +/datum/crafting_recipe/food/donut/slimejelly/matcha + name = "Matcha Slime Donut" + reqs = list( + /datum/reagent/toxin/teapowder = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index c049cd7563..108307119d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -59,4 +59,15 @@ /obj/item/reagent_containers/food/snacks/grown/corn = 1 ) result = /obj/item/reagent_containers/food/snacks/salad/eggbowl + subcategory = CAT_EGG + +/datum/crafting_recipe/food/scotchegg + name = "Scotch egg" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 + ) + result = /obj/item/reagent_containers/food/snacks/scotchegg subcategory = CAT_EGG \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index e204b0c72c..6d443c99f0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -3,6 +3,64 @@ //Misc. Frozen.// ///////////////// +/datum/crafting_recipe/food/banana_split + name = "Banana Split" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 3, + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/banana_split + subcategory = CAT_ICE + + /datum/crafting_recipe/food/bluecharrie_float + name = "Blue Cherry Shake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 1, + /obj/item/reagent_containers/food/snacks/grown/bluecherries = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass = 1 + ) + result = /obj/item/reagent_containers/food/snacks/bluecharrie_float + subcategory = CAT_ICE + +/datum/crafting_recipe/food/charrie_float + name = "Cherry Shake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass = 1 + ) + result = /obj/item/reagent_containers/food/snacks/charrie_float + subcategory = CAT_ICE + +/datum/crafting_recipe/food/root_float + name = "Cola Float" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /datum/reagent/consumable/space_cola = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cola_float + subcategory = CAT_ICE + +/datum/crafting_recipe/food/honkdae + name ="Honkdae" + reqs = list( + /datum/reagent/consumable/cream = 5, + /obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 2, + /obj/item/reagent_containers/food/snacks/icecream = 1 + ) + result = /obj/item/reagent_containers/food/snacks/honkdae + subcategory = CAT_ICE + /datum/crafting_recipe/food/icecreamsandwich name = "Icecream sandwich" reqs = list( @@ -14,7 +72,7 @@ subcategory = CAT_ICE /datum/crafting_recipe/food/spacefreezy - name ="Space freezy" + name ="Space Freezy" reqs = list( /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/spacemountainwind = 15, @@ -34,105 +92,8 @@ result = /obj/item/reagent_containers/food/snacks/sundae subcategory = CAT_ICE -/datum/crafting_recipe/food/honkdae - name ="Honkdae" - reqs = list( - /datum/reagent/consumable/cream = 5, - /obj/item/clothing/mask/gas/clown_hat = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 2, - /obj/item/reagent_containers/food/snacks/icecream = 1 - ) - result = /obj/item/reagent_containers/food/snacks/honkdae - subcategory = CAT_ICE - -/datum/crafting_recipe/food/banana_split - name = "Banana Split" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 3, - /obj/item/reagent_containers/food/snacks/grown/banana = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/banana_split - subcategory = CAT_ICE - -/datum/crafting_recipe/food/root_float - name = "Cola Float" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /datum/reagent/consumable/space_cola = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cola_float - subcategory = CAT_ICE - -/datum/crafting_recipe/food/charrie_float - name = "Cherry Shake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1 - ) - result = /obj/item/reagent_containers/food/snacks/charrie_float - subcategory = CAT_ICE - -/datum/crafting_recipe/food/bluecharrie_float - name = "Blue Cherry Shake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 1, - /obj/item/reagent_containers/food/snacks/grown/bluecherries = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1 - ) - result = /obj/item/reagent_containers/food/snacks/bluecharrie_float - subcategory = CAT_ICE - //////////////////////////SNOW CONES/////////////////////// -/datum/crafting_recipe/food/flavorless_sc - name = "Flavorless snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones - subcategory = CAT_ICE - -/datum/crafting_recipe/food/pineapple_sc - name = "Pineapple snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /obj/item/reagent_containers/food/snacks/pineappleslice = 2 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple - subcategory = CAT_ICE - -/datum/crafting_recipe/food/lime_sc - name = "Lime snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/limejuice = 5 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/lime - subcategory = CAT_ICE - -/datum/crafting_recipe/food/lemon_sc - name = "Lemon snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/lemonjuice = 5 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/lemon - subcategory = CAT_ICE - /datum/crafting_recipe/food/apple_sc name = "Apple snowcone" reqs = list( @@ -143,24 +104,14 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/apple subcategory = CAT_ICE -/datum/crafting_recipe/food/grape_sc - name = "Grape snowcone" +/datum/crafting_recipe/food/berry_sc + name = "Berry snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/grapejuice = 5 + /datum/reagent/consumable/berryjuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/grape - subcategory = CAT_ICE - -/datum/crafting_recipe/food/orange_sc - name = "Orange snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/orangejuice = 5 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/orange + result = /obj/item/reagent_containers/food/snacks/snowcones/berry subcategory = CAT_ICE /datum/crafting_recipe/food/blue_sc @@ -183,14 +134,13 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/red subcategory = CAT_ICE -/datum/crafting_recipe/food/berry_sc - name = "Berry snowcone" +/datum/crafting_recipe/food/flavorless_sc + name = "Flavorless snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/berryjuice = 5 + /datum/reagent/consumable/ice = 15 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/berry + result = /obj/item/reagent_containers/food/snacks/snowcones subcategory = CAT_ICE /datum/crafting_recipe/food/fruitsalad_sc @@ -206,24 +156,84 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad subcategory = CAT_ICE -/datum/crafting_recipe/food/mime_sc - name = "Mime snowcone" +/datum/crafting_recipe/food/grape_sc + name = "Grape snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/nothing = 5 + /datum/reagent/consumable/grapejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/mime + result = /obj/item/reagent_containers/food/snacks/snowcones/grape subcategory = CAT_ICE -/datum/crafting_recipe/food/clown_sc - name = "Clown snowcone" +/datum/crafting_recipe/food/honey_sc + name = "Honey snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/laughter = 5 + /datum/reagent/consumable/honey = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/clown + result = /obj/item/reagent_containers/food/snacks/snowcones/honey + subcategory = CAT_ICE + +/datum/crafting_recipe/food/lemon_sc + name = "Lemon snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/lemonjuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/lemon + subcategory = CAT_ICE + +/datum/crafting_recipe/food/lime_sc + name = "Lime snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/limejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/lime + subcategory = CAT_ICE + +/datum/crafting_recipe/food/orange_sc + name = "Orange snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/orangejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/orange + subcategory = CAT_ICE + +/datum/crafting_recipe/food/pineapple_sc + name = "Pineapple snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /obj/item/reagent_containers/food/snacks/pineappleslice = 2 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple + subcategory = CAT_ICE + +/datum/crafting_recipe/food/pwrgame_sc + name = "Pwrgame snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/pwr_game = 15 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame + subcategory = CAT_ICE + +/datum/crafting_recipe/food/rainbow_sc + name = "Rainbow snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/colorful_reagent = 1 //Harder to make + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow subcategory = CAT_ICE /datum/crafting_recipe/food/soda_sc @@ -246,32 +256,24 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind subcategory = CAT_ICE -/datum/crafting_recipe/food/pwrgame_sc - name = "Pwrgame snowcone" +/////I don't like seperating the clown and mime./// + +/datum/crafting_recipe/food/mime_sc + name = "Mime snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/pwr_game = 15 + /datum/reagent/consumable/nothing = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame + result = /obj/item/reagent_containers/food/snacks/snowcones/mime subcategory = CAT_ICE -/datum/crafting_recipe/food/honey_sc - name = "Honey snowcone" +/datum/crafting_recipe/food/clown_sc + name = "Clown snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/honey = 5 + /datum/reagent/consumable/laughter = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/honey - subcategory = CAT_ICE - -/datum/crafting_recipe/food/rainbow_sc - name = "Rainbow snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/colorful_reagent = 1 //Harder to make - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow - subcategory = CAT_ICE + result = /obj/item/reagent_containers/food/snacks/snowcones/clown + subcategory = CAT_ICE \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d8145410cd..efb773159d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,3 +1,5 @@ +// see code/module/crafting/table.dm + ////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// /datum/crafting_recipe/food/humankebab @@ -36,6 +38,18 @@ result = /obj/item/reagent_containers/food/snacks/kebab/tail subcategory = CAT_MEAT +/datum/crafting_recipe/food/fiestaskewer + name = "Fiesta Skewer" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/grown/corn = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/fiesta + subcategory = CAT_MEAT + // see code/module/crafting/table.dm ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// @@ -52,6 +66,36 @@ ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// +/datum/crafting_recipe/food/ribs + name = "BBQ Ribs" + reqs = list( + /datum/reagent/consumable/bbqsauce = 5, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2, + /obj/item/stack/rods = 2 + ) + result = /obj/item/reagent_containers/food/snacks/bbqribs + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/nugget + name = "Chicken nugget" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 + ) + result = /obj/item/reagent_containers/food/snacks/nugget + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/corndog + name = "Corndog meal" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/bun = 1, + /datum/reagent/consumable/mustard = 5, + /datum/reagent/consumable/ketchup = 5 + ) + result = /obj/item/reagent_containers/food/snacks/corndog + subcategory = CAT_MEAT + /datum/crafting_recipe/food/cornedbeef name = "Corned beef" reqs = list( @@ -72,16 +116,6 @@ result = /obj/item/reagent_containers/food/snacks/bearsteak subcategory = CAT_MEAT -/datum/crafting_recipe/food/enchiladas - name = "Enchiladas" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/chili = 2, - /obj/item/reagent_containers/food/snacks/tortilla = 2 - ) - result = /obj/item/reagent_containers/food/snacks/enchiladas - subcategory = CAT_MEAT - /datum/crafting_recipe/food/stewedsoymeat name = "Stewed soymeat" reqs = list( @@ -101,23 +135,6 @@ result = /obj/item/reagent_containers/food/snacks/sausage subcategory = CAT_MEAT -/datum/crafting_recipe/food/nugget - name = "Chicken nugget" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/nugget - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/rawkhinkali - name = "Raw Khinkali" - reqs = list( - /obj/item/reagent_containers/food/snacks/doughslice = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/rawkhinkali - subcategory = CAT_MEAT - /datum/crafting_recipe/food/pigblanket name = "Pig in a Blanket" reqs = list( @@ -128,18 +145,6 @@ result = /obj/item/reagent_containers/food/snacks/pigblanket subcategory = CAT_MEAT -/datum/crafting_recipe/food/corndog - name = "Corndog meal" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/bun = 1, - /datum/reagent/consumable/mustard = 5, - /datum/reagent/consumable/ketchup = 5 - ) - result = /obj/item/reagent_containers/food/snacks/corndog - subcategory = CAT_MEAT - /datum/crafting_recipe/food/ratkebab name = "Rat Kebab" reqs = list( @@ -166,25 +171,3 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/ricepork subcategory = CAT_MEAT - -/datum/crafting_recipe/food/fiestaskewer - name = "Fiesta Skewer" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/grown/corn = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/fiesta - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/ribs - name = "BBQ Ribs" - reqs = list( - /datum/reagent/consumable/bbqsauce = 5, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2, - /obj/item/stack/rods = 2 - ) - result = /obj/item/reagent_containers/food/snacks/bbqribs - subcategory = CAT_MEAT \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm new file mode 100644 index 0000000000..e155a1bd23 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -0,0 +1,111 @@ +// see code/module/crafting/table.dm + +////////////////////////////////////////////////"MEXICAN"//////////////////////////////////////////////// + +/datum/crafting_recipe/food/burrito + name ="Burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 + ) + result = /obj/item/reagent_containers/food/snacks/burrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/cheesyburrito + name ="Cheesy burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cheesyburrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/enchiladas + name = "Enchiladas" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /obj/item/reagent_containers/food/snacks/tortilla = 2 + ) + result = /obj/item/reagent_containers/food/snacks/enchiladas + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/carneburrito + name ="Carne de asada burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 + ) + result = /obj/item/reagent_containers/food/snacks/carneburrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/fuegoburrito + name ="Fuego plasma burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fuegoburrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/taco + name ="Classic Taco" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + ) + result = /obj/item/reagent_containers/food/snacks/taco + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/tacoplain + name ="Plain Taco" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + ) + result = /obj/item/reagent_containers/food/snacks/taco/plain + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/nachos + name ="Nachos" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/tortilla = 1 + ) + result = /obj/item/reagent_containers/food/snacks/nachos + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/cheesynachos + name ="Cheesy nachos" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/tortilla = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cheesynachos + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/cubannachos + name ="Cuban nachos" + reqs = list( + /datum/reagent/consumable/ketchup = 5, + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /obj/item/reagent_containers/food/snacks/tortilla = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cubannachos + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/wrap + name = "Wrap" + reqs = list(/datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + ) + result = /obj/item/reagent_containers/food/snacks/eggwrap + subcategory = CAT_MEXICAN \ No newline at end of file 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 9cf5ea31a0..6a622d6719 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -1,62 +1,77 @@ // see code/module/crafting/table.dm -// MISC +//////////////////Eastern Foods////////////////////// -/datum/crafting_recipe/food/candiedapple - name = "Candied apple" - reqs = list(/datum/reagent/water = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/candiedapple - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/spiderlollipop - name = "Spider Lollipop" - reqs = list(/obj/item/stack/rods = 1, - /datum/reagent/consumable/sugar = 5, +/datum/crafting_recipe/food/chawanmushi + name = "Chawanmushi" + reqs = list( /datum/reagent/water = 5, - /obj/item/reagent_containers/food/snacks/spiderling = 1 + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/boiledegg = 2, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) - result = /obj/item/reagent_containers/food/snacks/spiderlollipop + result = /obj/item/reagent_containers/food/snacks/chawanmushi subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/chococoin - name = "Choco coin" +/datum/crafting_recipe/food/khachapuri + name = "Khachapuri" reqs = list( - /obj/item/coin = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /datum/reagent/consumable/eggyolk = 5, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/chococoin + result = /obj/item/reagent_containers/food/snacks/khachapuri subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/fudgedice - name = "Fudge dice" +/datum/crafting_recipe/food/rawkhinkali + name = "Raw Khinkali" reqs = list( - /obj/item/dice = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/doughslice = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 ) - result = /obj/item/reagent_containers/food/snacks/fudgedice + result = /obj/item/reagent_containers/food/snacks/rawkhinkali subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/chocoorange - name = "Choco orange" +/datum/crafting_recipe/food/meatbun + name = "Meat bun" reqs = list( - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 ) - result = /obj/item/reagent_containers/food/snacks/chocoorange + result = /obj/item/reagent_containers/food/snacks/meatbun subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/loadedbakedpotato - name = "Loaded baked potato" +/////////////////////////////////MISC///////////////////////////////////// + +/datum/crafting_recipe/food/beans + name = "Beans" time = 40 - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1 + reqs = list(/datum/reagent/consumable/ketchup = 5, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 ) - result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato + result = /obj/item/reagent_containers/food/snacks/beans + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/branrequests + name = "Bran Requests Cereal" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/wheat = 1, + /obj/item/reagent_containers/food/snacks/no_raisin = 1, + ) + result = /obj/item/reagent_containers/food/snacks/branrequests + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/oatmeal + name = "Oatmeal" + reqs = list( + /datum/reagent/consumable/milk = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/salad/oatmeal subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/cheesyfries @@ -68,24 +83,6 @@ result = /obj/item/reagent_containers/food/snacks/cheesyfries subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/wrap - name = "Wrap" - reqs = list(/datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, - ) - result = /obj/item/reagent_containers/food/snacks/eggwrap - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/beans - name = "Beans" - time = 40 - reqs = list(/datum/reagent/consumable/ketchup = 5, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 - ) - result = /obj/item/reagent_containers/food/snacks/beans - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/eggplantparm name ="Eggplant parmigiana" reqs = list( @@ -95,91 +92,14 @@ result = /obj/item/reagent_containers/food/snacks/eggplantparm subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/baguette - name = "Baguette" +/datum/crafting_recipe/food/loadedbakedpotato + name = "Loaded baked potato" time = 40 - reqs = list(/datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 2 - ) - result = /obj/item/reagent_containers/food/snacks/baguette - subcategory = CAT_MISCFOOD - -////////////////////////////////////////////////TOAST//////////////////////////////////////////////// - -/datum/crafting_recipe/food/slimetoast - name = "Slime toast" reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1 ) - result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/jelliedtoast - name = "Jellied toast" - reqs = list( - /datum/reagent/consumable/cherryjelly = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/peanutbuttertoast - name = "Peanut butter toast" - reqs = list( - /datum/reagent/consumable/peanut_butter = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/twobread - name = "Two bread" - reqs = list( - /datum/reagent/consumable/ethanol/wine = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 2 - ) - result = /obj/item/reagent_containers/food/snacks/twobread - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/burrito - name ="Burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 - ) - result = /obj/item/reagent_containers/food/snacks/burrito - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/cheesyburrito - name ="Cheesy burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 2, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cheesyburrito - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/carneburrito - name ="Carne de asada burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 - ) - result = /obj/item/reagent_containers/food/snacks/carneburrito - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/fuegoburrito - name ="Fuego plasma burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fuegoburrito + result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/melonfruitbowl @@ -195,35 +115,6 @@ result = /obj/item/reagent_containers/food/snacks/melonfruitbowl subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/nachos - name ="Nachos" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/tortilla = 1 - ) - result = /obj/item/reagent_containers/food/snacks/nachos - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/cheesynachos - name ="Cheesy nachos" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/tortilla = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cheesynachos - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/cubannachos - name ="Cuban nachos" - reqs = list( - /datum/reagent/consumable/ketchup = 5, - /obj/item/reagent_containers/food/snacks/grown/chili = 2, - /obj/item/reagent_containers/food/snacks/tortilla = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cubannachos - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/melonkeg name ="Melon keg" reqs = list( @@ -235,16 +126,6 @@ result = /obj/item/reagent_containers/food/snacks/melonkeg subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/honeybar - name = "Honey nut bar" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/oat = 1, - /datum/reagent/consumable/honey = 5 - ) - result = /obj/item/reagent_containers/food/snacks/honeybar - subcategory = CAT_MISCFOOD - - /datum/crafting_recipe/food/stuffedlegion name = "Stuffed legion" time = 40 @@ -257,7 +138,6 @@ result = /obj/item/reagent_containers/food/snacks/stuffedlegion subcategory = CAT_MISCFOOD - /datum/crafting_recipe/lizardwine //not a subtype of /datum/crafting_recipe/food due to a bug where the resulting bottle would contain 100u of lizardwine and 100u of ethanol. name = "Lizard wine" time = 40 @@ -269,7 +149,6 @@ category = CAT_FOOD subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/powercrepe name = "Powercrepe" time = 40 @@ -283,36 +162,6 @@ result = /obj/item/reagent_containers/food/snacks/powercrepe subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/taco - name ="Classic Taco" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, - ) - result = /obj/item/reagent_containers/food/snacks/taco - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/tacoplain - name ="Plain Taco" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - ) - result = /obj/item/reagent_containers/food/snacks/taco/plain - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/branrequests - name = "Bran Requests Cereal" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/wheat = 1, - /obj/item/reagent_containers/food/snacks/no_raisin = 1, - ) - result = /obj/item/reagent_containers/food/snacks/branrequests - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/ricepudding name = "Rice pudding" reqs = list( @@ -322,22 +171,3 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/ricepudding subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/riceball - name = "Onigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 1, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 - ) - result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/chocolatestrawberry - name = "Chocolate Strawberry" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry - subcategory = CAT_MISCFOOD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 62b8509eb1..8a393476a2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -1,259 +1,108 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// +////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// -/datum/crafting_recipe/food/donut +/datum/crafting_recipe/food/muffin time = 15 - name = "Donut" + name = "Muffin" reqs = list( - /datum/reagent/consumable/sugar = 1, + /datum/reagent/consumable/milk = 5, /obj/item/reagent_containers/food/snacks/pastrybase = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/plain + result = /obj/item/reagent_containers/food/snacks/muffin subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/chaos - name = "Chaos donut" +/datum/crafting_recipe/food/berrymuffin + name = "Berry muffin" reqs = list( - /datum/reagent/consumable/frostoil = 5, - /datum/reagent/consumable/capsaicin = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/chaos - -datum/crafting_recipe/food/donut/meat - time = 15 - name = "Meat donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/slab = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/meat - -/datum/crafting_recipe/food/donut/jelly - name = "Jelly donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/plain - -/datum/crafting_recipe/food/donut/slimejelly - name = "Slime jelly donut" - reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain - -/datum/crafting_recipe/food/donut/glaze - time = 15 - name = "glaze donut" - reqs = list( - /datum/reagent/consumable/sugar = 10, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/glaze + result = /obj/item/reagent_containers/food/snacks/muffin/berry subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/berry - name = "Berry Donut" +/datum/crafting_recipe/food/booberrymuffin + name = "Booberry muffin" reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 1, + /obj/item/ectoplasm = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/berry + result = /obj/item/reagent_containers/food/snacks/muffin/booberry + subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/trumpet - name = "Spaceman's Donut" +/datum/crafting_recipe/food/poppymuffin + name = "Poppy muffin" reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, + /obj/item/seeds/poppy = 1 ) + result = /obj/item/reagent_containers/food/snacks/muffin/poppy + subcategory = CAT_PASTRY - result = /obj/item/reagent_containers/food/snacks/donut/trumpet +////////////////////////////////////////////CUPCAKES//////////////////////////////////////////// -/datum/crafting_recipe/food/donut/apple - name = "Apple Donut" +/datum/crafting_recipe/food/cherrycupcake + name = "Cherry cupcake" reqs = list( - /datum/reagent/consumable/applejuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/apple + result = /obj/item/reagent_containers/food/snacks/cherrycupcake + subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/caramel - name = "Caramel Donut" +/datum/crafting_recipe/food/bluecherrycupcake + name = "Blue cherry cupcake" reqs = list( - /datum/reagent/consumable/caramel = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/caramel + result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake + subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/choco - name = "Chocolate Donut" +/datum/crafting_recipe/food/strawberrycupcake + name = "Strawberry cherry cupcake" reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/choco + result = /obj/item/reagent_containers/food/snacks/strawberrycupcake + subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/blumpkin - name = "Blumpkin Donut" +////////////////////////////////////////////COOKIES//////////////////////////////////////////// + +/datum/crafting_recipe/food/raisincookie + name = "Raisin cookie" reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /obj/item/reagent_containers/food/snacks/no_raisin = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/blumpkin + result = /obj/item/reagent_containers/food/snacks/raisincookie + subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/bungo - name = "Bungo Donut" +/datum/crafting_recipe/food/oatmealcookie + name = "Oatmeal cookie" reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/bungo + result = /obj/item/reagent_containers/food/snacks/oatmealcookie + subcategory = CAT_PASTRY -/datum/crafting_recipe/food/donut/matcha - name = "Matcha Donut" +/datum/crafting_recipe/food/sugarcookie + time = 15 + name = "Sugar cookie" reqs = list( - /datum/reagent/toxin/teapowder = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/matcha - -////////////////////////////////////////////////////JELLY DONUTS/////////////////////////////////////////////////////// - -/datum/crafting_recipe/food/donut/jelly/berry - name = "Berry Jelly Donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry - -/datum/crafting_recipe/food/donut/jelly/trumpet - name = "Spaceman's Jelly Donut" - reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet - -/datum/crafting_recipe/food/donut/jelly/apple - name = "Apple Jelly Donut" - reqs = list( - /datum/reagent/consumable/applejuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple - -/datum/crafting_recipe/food/donut/jelly/caramel - name = "Caramel Jelly Donut" - reqs = list( - /datum/reagent/consumable/caramel = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel - -/datum/crafting_recipe/food/donut/jelly/choco - name = "Chocolate Jelly Donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco - -/datum/crafting_recipe/food/donut/jelly/blumpkin - name = "Blumpkin Jelly Donut" - reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin - -/datum/crafting_recipe/food/donut/jelly/bungo - name = "Bungo Jelly Donut" - reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo - -/datum/crafting_recipe/food/donut/jelly/matcha - name = "Matcha Jelly Donut" - reqs = list( - /datum/reagent/toxin/teapowder = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha - -////////////////////////////////////////////////////SLIME DONUTS/////////////////////////////////////////////////////// - -/datum/crafting_recipe/food/donut/slimejelly/berry - name = "Berry Slime Donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry - -/datum/crafting_recipe/food/donut/slimejelly/trumpet - name = "Spaceman's Slime Donut" - reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet - -/datum/crafting_recipe/food/donut/slimejelly/apple - name = "Apple Slime Donut" - reqs = list( - /datum/reagent/consumable/applejuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple - -/datum/crafting_recipe/food/donut/slimejelly/caramel - name = "Caramel Slime Donut" - reqs = list( - /datum/reagent/consumable/caramel = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel - -/datum/crafting_recipe/food/donut/slimejelly/choco - name = "Chocolate Slime Donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco - -/datum/crafting_recipe/food/donut/slimejelly/blumpkin - name = "Blumpkin Slime Donut" - reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin - -/datum/crafting_recipe/food/donut/slimejelly/bungo - name = "Bungo Slime Donut" - reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo - -/datum/crafting_recipe/food/donut/slimejelly/matcha - name = "Matcha Slime Donut" - reqs = list( - /datum/reagent/toxin/teapowder = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha + result = /obj/item/reagent_containers/food/snacks/sugarcookie + subcategory = CAT_PASTRY ////////////////////////////////////////////////WAFFLES AND PANCAKES//////////////////////////////////////////////// @@ -321,7 +170,6 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/pancakes/chocolatechip subcategory = CAT_PASTRY - ////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// /datum/crafting_recipe/food/donkpocket @@ -344,92 +192,26 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/dankpocket subcategory = CAT_PASTRY -////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// - -/datum/crafting_recipe/food/muffin - time = 15 - name = "Muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/berrymuffin - name = "Berry muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin/berry - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/booberrymuffin - name = "Booberry muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 1, - /obj/item/ectoplasm = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin/booberry - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/poppymuffin - name = "Poppy muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, - /obj/item/seeds/poppy = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin/poppy - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chawanmushi - name = "Chawanmushi" - reqs = list( - /datum/reagent/water = 5, - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/boiledegg = 2, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chawanmushi - subcategory = CAT_PASTRY - ////////////////////////////////////////////OTHER//////////////////////////////////////////// -/datum/crafting_recipe/food/meatbun - name = "Meat bun" +/datum/crafting_recipe/food/chococornet + name = "Choco cornet" reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 ) - result = /obj/item/reagent_containers/food/snacks/meatbun + result = /obj/item/reagent_containers/food/snacks/chococornet subcategory = CAT_PASTRY -/datum/crafting_recipe/food/khachapuri - name = "Khachapuri" - reqs = list( - /datum/reagent/consumable/eggyolk = 5, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/khachapuri - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/sugarcookie +/datum/crafting_recipe/food/cracker time = 15 - name = "Sugar cookie" + name = "Cracker" reqs = list( - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, ) - result = /obj/item/reagent_containers/food/snacks/sugarcookie + result = /obj/item/reagent_containers/food/snacks/cracker subcategory = CAT_PASTRY /datum/crafting_recipe/food/fortunecookie @@ -445,6 +227,34 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/fortunecookie subcategory = CAT_PASTRY +/datum/crafting_recipe/food/honeybun + name = "Honey bun" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/honeybun + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/hotcrossbun + name = "Hot-Cross Bun" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /datum/reagent/consumable/sugar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/hotcrossbun + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/mammi + name = "Mammi" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /datum/reagent/consumable/milk = 5 + ) + result = /obj/item/reagent_containers/food/snacks/soup/mammi + subcategory = CAT_PASTRY + /datum/crafting_recipe/food/poppypretzel time = 15 name = "Poppy pretzel" @@ -465,78 +275,3 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit subcategory = CAT_PASTRY -/datum/crafting_recipe/food/cracker - time = 15 - name = "Cracker" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - ) - result = /obj/item/reagent_containers/food/snacks/cracker - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chococornet - name = "Choco cornet" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chococornet - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/oatmealcookie - name = "Oatmeal cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/oatmealcookie - subcategory = CAT_PASTRY - - -/datum/crafting_recipe/food/raisincookie - name = "Raisin cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/no_raisin = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/raisincookie - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/cherrycupcake - name = "Cherry cupcake" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cherrycupcake - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/bluecherrycupcake - name = "Blue cherry cupcake" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 - ) - result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/strawberrycupcake - name = "Strawberry cherry cupcake" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 - ) - result = /obj/item/reagent_containers/food/snacks/strawberrycupcake - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/honeybun - name = "Honey bun" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /datum/reagent/consumable/honey = 5 - ) - result = /obj/item/reagent_containers/food/snacks/honeybun - subcategory = CAT_PASTRY \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pies_sweets.dm similarity index 74% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_pies_sweets.dm index b5bed4d5fc..52becf81df 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pies_sweets.dm @@ -1,7 +1,16 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////PIES//////////////////////////////////////////////// +//////////////////////////////////FRUITS///////////////////////////////////////// + +/datum/crafting_recipe/food/applepie + name = "Apple pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/applepie + subcategory = CAT_PIE /datum/crafting_recipe/food/bananacreampie name = "Banana cream pie" @@ -13,33 +22,13 @@ result = /obj/item/reagent_containers/food/snacks/pie/cream subcategory = CAT_PIE -/datum/crafting_recipe/food/meatpie - name = "Meat pie" - reqs = list( - /datum/reagent/consumable/blackpepper = 1, - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/meatpie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/tofupie - name = "Tofu pie" +/datum/crafting_recipe/food/berryclafoutis + name = "Berry clafoutis" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/tofu = 1 + /obj/item/reagent_containers/food/snacks/grown/berries = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/tofupie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/xenopie - name = "Xeno pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie + result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis subcategory = CAT_PIE /datum/crafting_recipe/food/cherrypie @@ -51,13 +40,53 @@ result = /obj/item/reagent_containers/food/snacks/pie/cherrypie subcategory = CAT_PIE -/datum/crafting_recipe/food/berryclafoutis - name = "Berry clafoutis" +/datum/crafting_recipe/food/frostypie + name = "Frosty pie" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 1 + /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis + result = /obj/item/reagent_containers/food/snacks/pie/frostypie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/grapetart + name = "Grape tart" + reqs = list( + /datum/reagent/consumable/milk = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/grapes = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pie/grapetart + subcategory = CAT_PIE + +/datum/crafting_recipe/food/peachpie + name = "Peach Pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/peach = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pie/peachpie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/strawberrypie + name = "Strawberry pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie + subcategory = CAT_PIE + +//////////OTHER PIES///////// + +/datum/crafting_recipe/food/amanitapie + name = "Amanita pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie subcategory = CAT_PIE /datum/crafting_recipe/food/bearypie @@ -70,64 +99,14 @@ result = /obj/item/reagent_containers/food/snacks/pie/bearypie subcategory = CAT_PIE -/datum/crafting_recipe/food/amanitapie - name = "Amanita pie" +/datum/crafting_recipe/food/baklava + name = "Baklava pie" reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1 + /obj/item/reagent_containers/food/snacks/butter = 1, + /obj/item/reagent_containers/food/snacks/tortilla = 4, //Layers + /obj/item/seeds/wheat/oat = 3 ) - result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/plumppie - name = "Plump pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/plump_pie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/applepie - name = "Apple pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/applepie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/pumpkinpie - name = "Pumpkin pie" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/goldenappletart - name = "Golden apple tart" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/appletart - subcategory = CAT_PIE - -/datum/crafting_recipe/food/grapetart - name = "Grape tart" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/grapes = 3 - ) - result = /obj/item/reagent_containers/food/snacks/pie/grapetart + result = /obj/item/reagent_containers/food/snacks/pie/baklava subcategory = CAT_PIE /datum/crafting_recipe/food/blumpkinpie @@ -151,32 +130,66 @@ result = /obj/item/reagent_containers/food/snacks/pie/dulcedebatata subcategory = CAT_PIE -/datum/crafting_recipe/food/frostypie - name = "Frosty pie" +/datum/crafting_recipe/food/meatpie + name = "Meat pie" reqs = list( + /datum/reagent/consumable/blackpepper = 1, + /datum/reagent/consumable/sodiumchloride = 1, /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/frostypie + result = /obj/item/reagent_containers/food/snacks/pie/meatpie subcategory = CAT_PIE -/datum/crafting_recipe/food/strawberrypie - name = "Strawberry pie" +/datum/crafting_recipe/food/plumppie + name = "Plump pie" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie + result = /obj/item/reagent_containers/food/snacks/pie/plump_pie subcategory = CAT_PIE -/datum/crafting_recipe/food/baklava - name = "Baklava pie" +/datum/crafting_recipe/food/pumpkinpie + name = "Pumpkin pie" reqs = list( - /obj/item/reagent_containers/food/snacks/butter = 1, - /obj/item/reagent_containers/food/snacks/tortilla = 4, //Layers - /obj/item/seeds/wheat/oat = 3 + /datum/reagent/consumable/milk = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/baklava + result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/tofupie + name = "Tofu pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/tofu = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/tofupie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/xenopie + name = "Xeno pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie + subcategory = CAT_PIE + +//////////////TARTS////////////// + +/datum/crafting_recipe/food/goldenappletart + name = "Golden apple tart" + reqs = list( + /datum/reagent/consumable/milk = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/appletart subcategory = CAT_PIE /datum/crafting_recipe/food/mimetart @@ -216,11 +229,77 @@ result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart subcategory = CAT_PIE -/datum/crafting_recipe/food/peachpie - name = "Peach Pie" +////////////////////////////////////////////SWEETS//////////////////////////////////////////// + +/datum/crafting_recipe/food/candiedapple + name = "Candied apple" + reqs = list(/datum/reagent/water = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/candiedapple + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chococoin + name = "Choco coin" reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/peach = 3 - ) - result = /obj/item/reagent_containers/food/snacks/pie/peachpie + /obj/item/coin = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chococoin + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chocoorange + name = "Choco orange" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chocoorange + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chocolatebunny + name = "Chocolate bunny" + reqs = list( + /datum/reagent/consumable/sugar = 2, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatebunny + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chocolatestrawberry + name = "Chocolate Strawberry" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry + subcategory = CAT_PIE + +/datum/crafting_recipe/food/fudgedice + name = "Fudge dice" + reqs = list( + /obj/item/dice = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/fudgedice + subcategory = CAT_PIE + +/datum/crafting_recipe/food/honeybar + name = "Honey nut bar" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/oat = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/honeybar + subcategory = CAT_PIE + +/datum/crafting_recipe/food/spiderlollipop + name = "Spider Lollipop" + reqs = list(/obj/item/stack/rods = 1, + /datum/reagent/consumable/sugar = 5, + /datum/reagent/water = 5, + /obj/item/reagent_containers/food/snacks/spiderling = 1 + ) + result = /obj/item/reagent_containers/food/snacks/spiderlollipop subcategory = CAT_PIE \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 64447dd180..21112a4a4f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -3,6 +3,40 @@ ////////////////////////////////////////////////PIZZA!!!//////////////////////////////////////////////// +/datum/crafting_recipe/food/dankpizza + name = "Dank pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/dank + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/donkpocketpizza + name = "Donkpocket pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/donkpocket/warm = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/pineapplepizza + name = "Hawaiian pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/pineappleslice = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/pineapple + subcategory = CAT_PIZZA + /datum/crafting_recipe/food/margheritapizza name = "Margherita pizza" reqs = list( @@ -24,18 +58,6 @@ result = /obj/item/reagent_containers/food/snacks/pizza/meat subcategory = CAT_PIZZA -/datum/crafting_recipe/food/arnold - name = "Arnold pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 3, - /obj/item/ammo_casing/c9mm = 8, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/arnold - subcategory = CAT_PIZZA - /datum/crafting_recipe/food/mushroompizza name = "Mushroom pizza" reqs = list( @@ -45,6 +67,17 @@ result = /obj/item/reagent_containers/food/snacks/pizza/mushroom subcategory = CAT_PIZZA +/datum/crafting_recipe/food/sassysagepizza + name = "Sassysage pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/faggot = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/sassysage + subcategory = CAT_PIZZA + /datum/crafting_recipe/food/vegetablepizza name = "Vegetable pizza" reqs = list( @@ -57,50 +90,7 @@ result = /obj/item/reagent_containers/food/snacks/pizza/vegetable subcategory = CAT_PIZZA -/datum/crafting_recipe/food/donkpocketpizza - name = "Donkpocket pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/donkpocket/warm = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket - subcategory = CAT_PIZZA - -/datum/crafting_recipe/food/dankpizza - name = "Dank pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/dank - subcategory = CAT_PIZZA - -/datum/crafting_recipe/food/sassysagepizza - name = "Sassysage pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/faggot = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/sassysage - subcategory = CAT_PIZZA - -/datum/crafting_recipe/food/pineapplepizza - name = "Hawaiian pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/pineappleslice = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/pineapple - subcategory = CAT_PIZZA +//////Special Pizzas///// /datum/crafting_recipe/food/pineapplepizza/anomaly name = "Anomaly Hawaiian pizza" @@ -120,3 +110,15 @@ tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER) result = /obj/item/pizzabox/infinite subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/arnold + name = "Arnold pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 3, + /obj/item/ammo_casing/c9mm = 8, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/arnold + subcategory = CAT_PIZZA diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 39eeb7d936..0a44c4590e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -3,16 +3,6 @@ ////////////////////////////////////////////////SALADS//////////////////////////////////////////////// -/datum/crafting_recipe/food/herbsalad - name = "Herb salad" - reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/salad/herbsalad - subcategory = CAT_SALAD - /datum/crafting_recipe/food/aesirsalad name = "Aesir salad" reqs = list( @@ -23,38 +13,16 @@ result = /obj/item/reagent_containers/food/snacks/salad/aesirsalad subcategory = CAT_SALAD -/datum/crafting_recipe/food/validsalad - name = "Valid salad" +/datum/crafting_recipe/food/citrusdelight + name = "Citrus delight" reqs = list( /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, - /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/salad/validsalad - subcategory = CAT_SALAD + /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1 -/datum/crafting_recipe/food/monkeysdelight - name = "Monkeys delight" - reqs = list( - /datum/reagent/consumable/flour = 5, - /datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/monkeycube = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight - subcategory = CAT_SALAD - -/datum/crafting_recipe/food/oatmeal - name = "Oatmeal" - reqs = list( - /datum/reagent/consumable/milk = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/salad/oatmeal + result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight subcategory = CAT_SALAD /datum/crafting_recipe/food/fruitsalad @@ -70,6 +38,16 @@ result = /obj/item/reagent_containers/food/snacks/salad/fruit subcategory = CAT_SALAD +/datum/crafting_recipe/food/herbsalad + name = "Herb salad" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/salad/herbsalad + subcategory = CAT_SALAD + /datum/crafting_recipe/food/junglesalad name = "Jungle salad" reqs = list( @@ -83,14 +61,26 @@ result = /obj/item/reagent_containers/food/snacks/salad/jungle subcategory = CAT_SALAD -/datum/crafting_recipe/food/citrusdelight - name = "Citrus delight" +/datum/crafting_recipe/food/monkeysdelight + name = "Monkeys delight" + reqs = list( + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/monkeycube = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight + subcategory = CAT_SALAD + +/datum/crafting_recipe/food/validsalad + name = "Valid salad" reqs = list( /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1 - + /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight + result = /obj/item/reagent_containers/food/snacks/salad/validsalad subcategory = CAT_SALAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 127b2cc238..d2ea1da50a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -84,7 +84,6 @@ result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich subcategory = CAT_SANDWICH - /datum/crafting_recipe/food/notasandwich name = "Not a sandwich" reqs = list( @@ -113,4 +112,4 @@ /obj/item/reagent_containers/food/snacks/sausage = 1 ) result = /obj/item/reagent_containers/food/snacks/hotdog - subcategory = CAT_SANDWICH + subcategory = CAT_SANDWICH //I don't agree with this. diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm similarity index 87% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm index 9dbf1d684b..4fc12f0777 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -1,4 +1,6 @@ -//////////////////////////Sushi Components/////////////////////// +// see code/module/crafting/table.dm + +///////////////////////Sushi Components/////////////////////////// /datum/crafting_recipe/food/sushi_rice name = "Sushi Rice" @@ -7,7 +9,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -17,17 +19,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_FISH - -/datum/crafting_recipe/food/tuna_can - name = "Can of Tuna" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 15, - /datum/reagent/consumable/cooking_oil = 5, - /obj/item/reagent_containers/food/snacks/carpmeat = 1, - ) - result = /obj/item/reagent_containers/food/snacks/tuna - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD //////////////////////////Sushi///////////////////////////////// @@ -39,7 +31,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -49,7 +41,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -59,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -70,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -80,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -91,19 +83,19 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD -///////////////Gaijin junk///////////////////////////////////// +//////////////////////////////////////////////FISH/////////////////////////////////////////// -/datum/crafting_recipe/food/fishfingers - name = "Fish fingers" +/datum/crafting_recipe/food/tuna_can + name = "Can of Tuna" reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 + /datum/reagent/consumable/sodiumchloride = 15, + /datum/reagent/consumable/cooking_oil = 5, + /obj/item/reagent_containers/food/snacks/carpmeat = 1, ) - result = /obj/item/reagent_containers/food/snacks/fishfingers - subcategory = CAT_FISH + result = /obj/item/reagent_containers/food/snacks/tuna + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/cubancarp name = "Cuban carp" @@ -113,7 +105,17 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD + +/datum/crafting_recipe/food/fishfingers + name = "Fish fingers" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishfingers + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/fishandchips name = "Fish and chips" @@ -122,4 +124,4 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_FISH \ No newline at end of file + subcategory = CAT_SEAFOOD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 76a5a64096..0c966faf33 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -3,71 +3,46 @@ ////////////////////////////////////////////////SOUP//////////////////////////////////////////////// -/datum/crafting_recipe/food/meatballsoup - name = "Meatball soup" +/datum/crafting_recipe/food/amanitajelly + name = "Amanita jelly" + reqs = list( + /datum/reagent/consumable/ethanol/vodka = 5, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3 + ) + result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/beetsoup + name = "Beet soup" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/grown/carrot = 1, - /obj/item/reagent_containers/food/snacks/grown/potato = 1 + /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, ) - result = /obj/item/reagent_containers/food/snacks/soup/meatball + result = /obj/item/reagent_containers/food/snacks/soup/beet subcategory = CAT_SOUP -/datum/crafting_recipe/food/vegetablesoup - name = "Vegetable soup" +/datum/crafting_recipe/food/bloodsoup + name = "Blood soup" + reqs = list( + /datum/reagent/blood = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/blood + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/clownstears + name = "Clowns tears" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/carrot = 1, - /obj/item/reagent_containers/food/snacks/grown/corn = 1, - /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, - /obj/item/reagent_containers/food/snacks/grown/potato = 1 + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /obj/item/stack/ore/bananium = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/vegetable - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/nettlesoup - name = "Nettle soup" - reqs = list( - /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/nettle = 1, - /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/nettle - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/wingfangchu - name = "Wingfangchu" - reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2 - ) - result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/wishsoup - name = "Wish soup" - reqs = list( - /datum/reagent/water = 20, - /obj/item/reagent_containers/glass/bowl = 1 - ) - result= /obj/item/reagent_containers/food/snacks/soup/wish - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/hotchili - name = "Hot chili" - reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/hotchili + result = /obj/item/reagent_containers/food/snacks/soup/clownstears subcategory = CAT_SOUP /datum/crafting_recipe/food/coldchili @@ -81,16 +56,6 @@ result = /obj/item/reagent_containers/food/snacks/soup/coldchili subcategory = CAT_SOUP -/datum/crafting_recipe/food/tomatosoup - name = "Tomato soup" - reqs = list( - /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 2 - ) - result = /obj/item/reagent_containers/food/snacks/soup/tomato - subcategory = CAT_SOUP - /datum/crafting_recipe/food/eyeballsoup name = "Eyeball soup" reqs = list( @@ -102,6 +67,28 @@ result = /obj/item/reagent_containers/food/snacks/soup/tomato/eyeball subcategory = CAT_SOUP +/datum/crafting_recipe/food/hotchili + name = "Hot chili" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/hotchili + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/meatballsoup + name = "Meatball soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/meatball + subcategory = CAT_SOUP /datum/crafting_recipe/food/milosoup name = "Milo soup" @@ -114,35 +101,15 @@ result = /obj/item/reagent_containers/food/snacks/soup/milo subcategory = CAT_SOUP -/datum/crafting_recipe/food/bloodsoup - name = "Blood soup" +/datum/crafting_recipe/food/mushroomsoup + name = "Mushroom soup" reqs = list( - /datum/reagent/blood = 10, + /datum/reagent/consumable/milk = 5, + /datum/reagent/water = 5, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2 + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/blood - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/slimesoup - name = "Slime soup" - reqs = list( - /datum/reagent/water = 10, - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/glass/bowl = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/slime - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/clownstears - name = "Clowns tears" - reqs = list( - /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 1, - /obj/item/stack/ore/bananium = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/clownstears + result = /obj/item/reagent_containers/food/snacks/soup/mushroom subcategory = CAT_SOUP /datum/crafting_recipe/food/mysterysoup @@ -158,26 +125,37 @@ result = /obj/item/reagent_containers/food/snacks/soup/mystery subcategory = CAT_SOUP -/datum/crafting_recipe/food/mushroomsoup - name = "Mushroom soup" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/water = 5, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/mushroom - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/beetsoup - name = "Beet soup" +/datum/crafting_recipe/food/nettlesoup + name = "Nettle soup" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/grown/nettle = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/boiledegg = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/beet + result = /obj/item/reagent_containers/food/snacks/soup/nettle + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/redbeetsoup + name = "Red beet soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/beet/red + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/slimesoup + name = "Slime soup" + reqs = list( + /datum/reagent/water = 10, + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/slime subcategory = CAT_SOUP /datum/crafting_recipe/food/stew @@ -205,16 +183,6 @@ result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff subcategory = CAT_SOUP -/datum/crafting_recipe/food/amanitajelly - name = "Amanita jelly" - reqs = list( - /datum/reagent/consumable/ethanol/vodka = 5, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3 - ) - result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly - subcategory = CAT_SOUP - /datum/crafting_recipe/food/sweetpotatosoup name = "Sweet potato soup" reqs = list( @@ -226,13 +194,44 @@ result = /obj/item/reagent_containers/food/snacks/soup/sweetpotato subcategory = CAT_SOUP -/datum/crafting_recipe/food/redbeetsoup - name = "Red beet soup" +/datum/crafting_recipe/food/tomatosoup + name = "Tomato soup" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + /obj/item/reagent_containers/food/snacks/grown/tomato = 2 ) - result = /obj/item/reagent_containers/food/snacks/soup/beet/red + result = /obj/item/reagent_containers/food/snacks/soup/tomato subcategory = CAT_SOUP + +/datum/crafting_recipe/food/vegetablesoup + name = "Vegetable soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/corn = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/vegetable + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/wingfangchu + name = "Wingfangchu" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/wishsoup + name = "Wish soup" + reqs = list( + /datum/reagent/water = 20, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result= /obj/item/reagent_containers/food/snacks/soup/wish + subcategory = CAT_SOUP \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm index 355402111c..12020a6241 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -3,15 +3,6 @@ ////////////////////////////////////////////////SPAGHETTI//////////////////////////////////////////////// -/datum/crafting_recipe/food/tomatopasta - name = "Tomato pasta" - reqs = list( - /obj/item/reagent_containers/food/snacks/boiledspaghetti = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 2 - ) - result = /obj/item/reagent_containers/food/snacks/pastatomato - subcategory = CAT_SPAGHETTI - /datum/crafting_recipe/food/copypasta name = "Copypasta" reqs = list( @@ -38,6 +29,17 @@ result = /obj/item/reagent_containers/food/snacks/spesslaw subcategory = CAT_SPAGHETTI +/datum/crafting_recipe/food/tomatopasta + name = "Tomato pasta" + reqs = list( + /obj/item/reagent_containers/food/snacks/boiledspaghetti = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 2 + ) + result = /obj/item/reagent_containers/food/snacks/pastatomato + subcategory = CAT_SPAGHETTI + +////////////NOODLES/////////// + /datum/crafting_recipe/food/beefnoodle name = "Beef noodle" reqs = list( diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 1898fe4b01..5f2d92fc93 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -140,96 +140,8 @@ containsPrize = FALSE qdel(src) -//Easter Recipes + food -/obj/item/reagent_containers/food/snacks/hotcrossbun - bitesize = 2 - name = "hot-cross bun" - desc = "The Cross represents the Assistants that died for your sins." - icon_state = "hotcrossbun" - -/datum/crafting_recipe/food/hotcrossbun - name = "Hot-Cross Bun" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /datum/reagent/consumable/sugar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/hotcrossbun - category = CAT_MISCFOOD - - -/obj/item/reagent_containers/food/snacks/store/cake/brioche - name = "brioche cake" - desc = "A ring of sweet, glazed buns." - icon_state = "briochecake" - slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche - slices_num = 6 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) - -/obj/item/reagent_containers/food/snacks/cakeslice/brioche - name = "brioche cake slice" - desc = "Delicious sweet-bread. Who needs anything else?" - icon_state = "briochecake_slice" - filling_color = "#FFD700" - -/datum/crafting_recipe/food/briochecake - name = "Brioche cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /datum/reagent/consumable/sugar = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/brioche - category = CAT_MISCFOOD - -/obj/item/reagent_containers/food/snacks/scotchegg - name = "scotch egg" - desc = "A boiled egg wrapped in a delicious, seasoned meatball." - icon_state = "scotchegg" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - bitesize = 3 - filling_color = "#FFFFF0" - list_reagents = list(/datum/reagent/consumable/nutriment = 6) - -/datum/crafting_recipe/food/scotchegg - name = "Scotch egg" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/scotchegg - category = CAT_MISCFOOD - -/obj/item/reagent_containers/food/snacks/soup/mammi - name = "Mammi" - desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." - icon_state = "mammi" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) - -/datum/crafting_recipe/food/mammi - name = "Mammi" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /datum/reagent/consumable/milk = 5 - ) - result = /obj/item/reagent_containers/food/snacks/soup/mammi - category = CAT_MISCFOOD - -/obj/item/reagent_containers/food/snacks/chocolatebunny - name = "chocolate bunny" - desc = "Contains less than 10% real rabbit!" - icon_state = "chocolatebunny" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) - filling_color = "#A0522D" - -/datum/crafting_recipe/food/chocolatebunny - name = "Chocolate bunny" - reqs = list( - /datum/reagent/consumable/sugar = 2, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatebunny - category = CAT_MISCFOOD +/* +Easter Recipes + Food moved to appropriate files. +\code\modules\food_and_drinks\ +\code\modules\food_and_drinks\recipes\ +*/ \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 3072ce93aa..ee098a0ec7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1847,18 +1847,20 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_bread.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" #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" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pies_sweets.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm" #include "code\modules\games\cas.dm" #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm"