From 495c81c2b0221d4e416d391c0cc3f9e33c91edc6 Mon Sep 17 00:00:00 2001 From: Rykka Date: Fri, 24 Jul 2020 10:11:15 -0400 Subject: [PATCH] Null R.Type fix and Fortune Cookie Fix, more recipes_microwave pruning --- code/modules/food/food/snacks.dm | 2 +- code/modules/food/recipe.dm | 10 +- code/modules/food/recipes_fryer.dm | 6 + code/modules/food/recipes_grill.dm | 2 +- code/modules/food/recipes_microwave.dm | 366 +--------------------- code/modules/food/recipes_microwave_vr.dm | 65 ---- code/modules/food/recipes_oven.dm | 49 +-- 7 files changed, 21 insertions(+), 479 deletions(-) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index abebd0b232..9557434372 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -5344,7 +5344,7 @@ /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan name = "vegan burrito" - desc = "Tofu wrapped in a flour tortilla. Those seen with this food object are Valid." + desc = "Tofu wrapped in a flour tortilla." icon = 'icons/obj/food_syn.dmi' icon_state = "burrito_vegan" bitesize = 4 diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index e27b102387..b3b2e0b008 100644 --- a/code/modules/food/recipe.dm +++ b/code/modules/food/recipe.dm @@ -273,24 +273,24 @@ //We want the highest of each. //Iterate through everything in buffer. If the target has less than the buffer, then top it up for (var/datum/reagent/R in buffer.reagent_list) - var/rvol = holder.get_reagent_amount(R.type) + var/rvol = holder.get_reagent_amount(R.id) if (rvol < R.volume) //Transfer the difference - buffer.trans_type_to(holder, R.type, R.volume-rvol) + buffer.trans_type_to(holder, R.id, R.volume-rvol) if (RECIPE_REAGENT_MIN) //Min is slightly more complex. We want the result to have the lowest from each side //But zero will not count. Where a side has zero its ignored and the side with a nonzero value is used for (var/datum/reagent/R in buffer.reagent_list) - var/rvol = holder.get_reagent_amount(R.type) + var/rvol = holder.get_reagent_amount(R.id) if (rvol == 0) //If the target has zero of this reagent - buffer.trans_type_to(holder, R.type, R.volume) + buffer.trans_type_to(holder, R.id, R.volume) //Then transfer all of ours else if (rvol > R.volume) //if the target has more than ours //Remove the difference - holder.remove_reagent(R.type, rvol-R.volume) + holder.remove_reagent(R.id, rvol-R.volume) if (results.len > 1) diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index 3328663be6..b0347d154d 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -5,6 +5,12 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/fries +/datum/recipe/cheesyfries + items = list( + /obj/item/weapon/reagent_containers/food/snacks/fries, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries /datum/recipe/jpoppers appliance = FRYER diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index 6f84348655..86c7998e90 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -155,7 +155,7 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob -/datum/recipe/spellburger +/datum/recipe/fakespellburger appliance = GRILL items = list( /obj/item/weapon/reagent_containers/food/snacks/monkeyburger, diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 974a661192..c9190ca259 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -43,106 +43,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/devilledegg -/* // Test remove these in favor of grillin' on the grill, bby. -/datum/recipe/humanburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - /obj/item/weapon/reagent_containers/food/snacks/bun - ) - result = /obj/item/weapon/reagent_containers/food/snacks/human/burger - -/datum/recipe/plainburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/humanburger - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger - -/datum/recipe/syntiburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger - -/datum/recipe/brainburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/organ/internal/brain - ) - result = /obj/item/weapon/reagent_containers/food/snacks/brainburger - -/datum/recipe/roburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/robot_parts/head - ) - result = /obj/item/weapon/reagent_containers/food/snacks/roburger - -/datum/recipe/xenoburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/xenomeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/xenoburger - -/datum/recipe/fishburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fishburger - -/datum/recipe/tofuburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/tofu - ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofuburger - -/datum/recipe/ghostburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/ectoplasm //where do you even find this stuff - ) - result = /obj/item/weapon/reagent_containers/food/snacks/ghostburger - -/datum/recipe/clownburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/clothing/mask/gas/clown_hat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/clownburger - -/datum/recipe/mimeburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/clothing/head/beret - ) - result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger - -/datum/recipe/mouseburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/holder/mouse - ) - result = /obj/item/weapon/reagent_containers/food/snacks/mouseburger -*/ - -/datum/recipe/bunbun - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/bun - ) - result = /obj/item/weapon/reagent_containers/food/snacks/bunbun - -/datum/recipe/hotdog - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/sausage - ) - result = /obj/item/weapon/reagent_containers/food/snacks/hotdog - /datum/recipe/waffles reagents = list("sugar" = 10) items = list( @@ -233,62 +133,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu -/* // Test remove these in favor of grillin' on the grill, bby. -/datum/recipe/humankabob - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - /obj/item/weapon/reagent_containers/food/snacks/meat/human, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/human/kabob - -/datum/recipe/kabob //Do not put before humankabob - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob - -/datum/recipe/monkeykabob - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob - -/datum/recipe/syntikabob - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh, - /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob - -/datum/recipe/tofukabob - items = list( - /obj/item/stack/rods, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob -*/ - -/datum/recipe/tofubread - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread - /datum/recipe/loadedbakedpotato fruit = list("potato" = 1) items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge) @@ -326,33 +170,10 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/blackpudding -/datum/recipe/cheesyfries - items = list( - /obj/item/weapon/reagent_containers/food/snacks/fries, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries - -/datum/recipe/cubancarp - fruit = list("chili" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp - /datum/recipe/popcorn fruit = list("corn" = 1) result = /obj/item/weapon/reagent_containers/food/snacks/popcorn -/datum/recipe/cookie - reagents = list("milk" = 5, "sugar" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cookie - /datum/recipe/fortunecookie reagents = list("sugar" = 5) items = list( @@ -360,22 +181,6 @@ I said no! /obj/item/weapon/paper, ) result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie - make_food(var/obj/container as obj) - var/obj/item/weapon/paper/paper = locate() in container - paper.loc = null //prevent deletion - var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container) - paper.loc = being_cooked - being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn - return being_cooked - check_items(var/obj/container as obj) - . = ..() - if (.) - var/obj/item/weapon/paper/paper = locate() in container - if (!paper) - return 0 - if (!paper.info) - return 0 - return . /datum/recipe/meatsteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) @@ -387,17 +192,6 @@ I said no! items = list(/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh) result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak -/datum/recipe/pizzamargherita - fruit = list("tomato" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita - /datum/recipe/pizzahawaiian fruit = list("tomato" = 1, "pineapple" = 1) items = list( @@ -407,33 +201,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple -/datum/recipe/meatpizza - fruit = list("tomato" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza - -/datum/recipe/mushroompizza - fruit = list("mushroom" = 5, "tomato" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza - -/datum/recipe/vegetablepizza - fruit = list("eggplant" = 1, "carrot" = 1, "corn" = 1, "tomato" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza - /datum/recipe/spacylibertyduff reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff @@ -476,67 +243,6 @@ I said no! items = list(/obj/item/weapon/reagent_containers/food/snacks/meat) result = /obj/item/weapon/reagent_containers/food/snacks/coldchili -/* // Testremove to swap to grill -/datum/recipe/spellburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/monkeyburger, - /obj/item/clothing/head/wizard/fake, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/spellburger - -/datum/recipe/spellburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/monkeyburger, - /obj/item/clothing/head/wizard, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/spellburger - -/datum/recipe/bigbiteburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/monkeyburger, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - ) - reagents = list("egg" = 3) - reagent_mix = RECIPE_REAGENT_REPLACE - result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger -*/ -/datum/recipe/enchiladas - fruit = list("chili" = 2, "corn" = 1) - items = list(/obj/item/weapon/reagent_containers/food/snacks/cutlet) - result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas - -/datum/recipe/creamcheesebread - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread - -/datum/recipe/monkeysdelight - fruit = list("banana" = 1) - reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/monkeycube - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight - -/datum/recipe/baguette - reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/dough, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/baguette - -/datum/recipe/croissant - reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5) - items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) - result = /obj/item/weapon/reagent_containers/food/snacks/croissant - /datum/recipe/fishandchips items = list( /obj/item/weapon/reagent_containers/food/snacks/fries, @@ -544,11 +250,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips -/datum/recipe/bread - reagents = list("yeast" = 5) - items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread - /datum/recipe/sandwich items = list( /obj/item/weapon/reagent_containers/food/snacks/meatsteak, @@ -631,12 +332,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat -/*/datum/recipe/spagetti We have the processor now - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice - ) - result= /obj/item/weapon/reagent_containers/food/snacks/spagetti*/ - /datum/recipe/boiledspagetti reagents = list("water" = 5) items = list( @@ -658,11 +353,6 @@ I said no! items = list(/obj/item/weapon/reagent_containers/food/snacks/spagetti) result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato -/datum/recipe/poppypretzel - fruit = list("poppy" = 1) - items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) - result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel - /datum/recipe/meatballspagetti reagents = list("water" = 5) items = list( @@ -682,19 +372,7 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/meatball, ) result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw -/* -/datum/recipe/superbiteburger - fruit = list("tomato" = 1) - reagents = list("sodiumchloride" = 5, "blackpepper" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger, - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/boiledegg, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger -*/ + /datum/recipe/candiedapple fruit = list("apple" = 1) reagents = list("water" = 5, "sugar" = 5) @@ -705,20 +383,6 @@ I said no! items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/weapon/reagent_containers/food/snacks/applepie -/datum/recipe/slimeburger - reagents = list("slimejelly" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun - ) - result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/slime - -/datum/recipe/jellyburger - reagents = list("cherryjelly" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun - ) - result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry - /datum/recipe/twobread reagents = list("wine" = 5) items = list( @@ -931,13 +595,13 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/taco -/datum/recipe/bun +/datum/recipe/microwavebun items = list( /obj/item/weapon/reagent_containers/food/snacks/dough ) result = /obj/item/weapon/reagent_containers/food/snacks/bun -/datum/recipe/flatbread +/datum/recipe/microwaveflatbread items = list( /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough ) @@ -955,12 +619,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/cutlet -/datum/recipe/fries - items = list( - /obj/item/weapon/reagent_containers/food/snacks/rawsticks - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fries - /datum/recipe/roastedsunflowerseeds reagents = list("sodiumchloride" = 1, "cornoil" = 1) items = list( @@ -1235,14 +893,6 @@ I said no! fruit = list("peanut" = 2, "potato" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/weapon/reagent_containers/food/snacks/yellowcurry -/* -/datum/recipe/bearburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/bearmeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/bearburger -*/ /datum/recipe/bearchili fruit = list("chili" = 1, "tomato" = 1) @@ -1605,16 +1255,6 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/friedegg ) result = /obj/item/weapon/reagent_containers/food/snacks/bacon_and_eggs -/* -/datum/recipe/baconburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/bacon, - /obj/item/weapon/reagent_containers/food/snacks/bacon - ) - result = /obj/item/weapon/reagent_containers/food/snacks/burger/bacon -*/ /datum/recipe/ntmuffin items = list( diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index 65310fb48c..aba09d186c 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -20,34 +20,6 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi -/datum/recipe/lasagna - fruit = list("tomato" = 2, "eggplant" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/cutlet, - /obj/item/weapon/reagent_containers/food/snacks/cutlet, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough - ) - result = /obj/item/weapon/reagent_containers/food/snacks/lasagna - -/datum/recipe/chickenwings - reagents = list("capsaicin" = 5, "flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat - ) - result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box. - -/datum/recipe/generalschicken - reagents = list("capsaicin" = 2, "sugar" = 2, "flour" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat, - /obj/item/weapon/reagent_containers/food/snacks/meat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/generalschicken - /datum/recipe/chocroizegg items = list( /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, @@ -112,46 +84,9 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes -/* -/datum/recipe/margheritapizzacargo - reagents = list() - items = list( - /obj/item/weapon/reagent_containers/food/snacks/pizza/margfrozen - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margcargo - -/datum/recipe/mushroompizzacargo - reagents = list() - items = list( - /obj/item/weapon/reagent_containers/food/snacks/pizza/mushfrozen - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushcargo - -/datum/recipe/meatpizzacargo - reagents = list() - items = list( - /obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatcargo - -/datum/recipe/vegtablepizzacargo - reagents = list() - items = list( - /obj/item/weapon/reagent_containers/food/snacks/pizza/vegfrozen - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegcargo -*/ - //// food cubes /datum/recipe/foodcubes reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive items = list() result = /obj/item/weapon/storage/box/wings/tray - -/datum/recipe/honeybun - reagents = list("milk" = 5, "egg" = 3,"honey" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough - ) - result = /obj/item/weapon/reagent_containers/food/snacks/honeybun \ No newline at end of file diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index 989c118d50..f34a668122 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -36,12 +36,12 @@ /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough ) - reagents = list("sodiumchloride" = 1) + reagents = list("sodiumchloride" = 1, "yeast" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread /datum/recipe/baguette appliance = OVEN - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough @@ -245,7 +245,7 @@ result_quantity = 4 reagent_mix = RECIPE_REAGENT_REPLACE -/datum/recipe/fortunecookie +/datum/recipe/ovenfortunecookie appliance = OVEN reagents = list("sugar" = 5) items = list( @@ -253,45 +253,6 @@ /obj/item/weapon/paper ) result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie - make_food(var/obj/container as obj) - - var/obj/item/weapon/paper/paper - - //Fuck fortune cookies. This is a quick hack - //Duplicate the item searching code with a special case for paper - for (var/i in items) - var/obj/item/I = locate(i) in container - if (!paper && istype(I, /obj/item/weapon/paper)) - paper = I - continue - - if (I) - qdel(I) - - //Then store and null out the items list so it wont delete any paper - var/list/L = items.Copy() - items = null - . = ..(container) - - //Restore items list, so that making fortune cookies once doesnt break the oven - items = L - - - for (var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked in .) - paper.forceMove(being_cooked) - being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn - return - - - check_items(var/obj/container as obj) - . = ..() - if (.) - var/obj/item/weapon/paper/paper = locate() in container - if (!paper || !istype(paper)) - return 0 - if (!paper.info) - return 0 - return . /datum/recipe/poppypretzel appliance = OVEN @@ -513,7 +474,7 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/dough ) - reagents = list("honey" = 5) + reagents = list("milk" = 5, "egg" = 3,"honey" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/honeybun /datum/recipe/enchiladas_new @@ -575,7 +536,7 @@ /datum/recipe/croissant appliance = OVEN - reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5) + reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list(/obj/item/weapon/reagent_containers/food/snacks/dough) result = /obj/item/weapon/reagent_containers/food/snacks/croissant