From ab3ed53734f3d4f546b8a544a85215f5fd09b57d Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 9 Nov 2015 01:09:59 -0500 Subject: [PATCH] Kitchen Updates --- _maps/map_files/cyberiad/cyberiad.dmm | 2 +- code/datums/supplypacks.dm | 8 +-- code/game/machinery/kitchen/processor.dm | 6 +- code/game/machinery/vending.dm | 4 +- .../crates_lockers/closets/job_closets.dm | 12 ++-- .../crates_lockers/closets/secure/freezer.dm | 11 ++-- code/modules/food/recipes_candy.dm | 3 +- code/modules/food/recipes_grill.dm | 3 +- code/modules/food/recipes_microwave.dm | 46 ++------------- code/modules/food/recipes_oven.dm | 12 ++-- code/modules/reagents/Chemistry-Machinery.dm | 2 +- .../chemical_reaction_food.dm | 15 ++++- .../reagent_containers/food/condiment.dm | 57 ++++++++++++++++--- .../reagent_containers/food/snacks.dm | 24 -------- 14 files changed, 95 insertions(+), 110 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 6c2177b408a..239655f31a8 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2438,7 +2438,7 @@ "aUT" = (/turf/simulated/wall,/area/crew_quarters/kitchen) "aUU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{level = 1},/obj/structure/sink/kitchen{pixel_y = 28},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aUV" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) -"aUW" = (/obj/machinery/light/small{dir = 1},/obj/structure/closet/crate{desc = "It's a storage unit for kitchen clothes and equipment."; name = "Kitchen Crate"},/obj/item/clothing/head/chefhat,/obj/item/clothing/under/rank/chef,/obj/item/weapon/storage/box/mousetraps{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/box/mousetraps,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/under/sundress,/obj/item/device/radio/intercom{broadcasting = 0; name = "station intercom (General)"; pixel_y = 25},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) +"aUW" = (/obj/machinery/light/small{dir = 1},/obj/item/device/radio/intercom{broadcasting = 0; name = "station intercom (General)"; pixel_y = 25},/obj/structure/closet/chefcloset,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aUX" = (/obj/machinery/camera{c_tag = "Kitchen Freezer"; network = list("SS13")},/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"; pixel_x = -5},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aUY" = (/obj/machinery/door/window/southleft{base_state = "left"; dir = 2; icon_state = "left"; name = "Kitchen Delivery"; req_access_txt = "28"},/obj/effect/decal/warning_stripes/yellow,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aUZ" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=2"; freq = 1400; location = "Hydroponics"},/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/maintenance/fsmaint2) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d29e6769dd2..9a6ce82c274 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -773,12 +773,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/organic/food name = "Food Crate" - contains = list(/obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + contains = list(/obj/item/weapon/reagent_containers/food/condiment/flour, + /obj/item/weapon/reagent_containers/food/condiment/rice, /obj/item/weapon/reagent_containers/food/drinks/milk, /obj/item/weapon/reagent_containers/food/drinks/soymilk, + /obj/item/weapon/reagent_containers/food/condiment/saltshaker, + /obj/item/weapon/reagent_containers/food/condiment/peppermill, /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/reagent_containers/food/condiment/enzyme, /obj/item/weapon/reagent_containers/food/condiment/sugar, diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index b90affbcd6c..87426a7daaa 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -61,12 +61,8 @@ input = "soybeans" output = /obj/item/weapon/reagent_containers/food/snacks/soydope -/datum/food_processor_process/wheat - input = "wheat" - output = /obj/item/weapon/reagent_containers/food/snacks/flour - /datum/food_processor_process/spaghetti - input = /obj/item/weapon/reagent_containers/food/snacks/flour + input = /obj/item/weapon/reagent_containers/food/snacks/doughslice output = /obj/item/weapon/reagent_containers/food/snacks/spagetti ///////////////////////// ///END OBJECT RECIPIES/// diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9956c38cc54..516ed3f09b8 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1061,8 +1061,8 @@ product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." icon_state = "dinnerware" products = list(/obj/item/weapon/storage/bag/tray = 8,/obj/item/weapon/kitchen/utensil/fork = 6, - /obj/item/weapon/kitchenknife = 3,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8, - /obj/item/clothing/suit/chef/classic = 2, + /obj/item/weapon/kitchenknife = 3,/obj/item/weapon/kitchen/rollingpin = 2, + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/chef/classic = 2, /obj/item/weapon/reagent_containers/food/condiment/pack/ketchup = 5, /obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/weapon/kitchen/mould/bear = 1, /obj/item/weapon/kitchen/mould/worm = 1, diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index f824fa3a5fa..05f0b653e13 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -50,14 +50,18 @@ new /obj/item/clothing/under/waiter(src) new /obj/item/device/radio/headset/headset_service(src) new /obj/item/device/radio/headset/headset_service(src) - new /obj/item/clothing/suit/wcoat(src) - new /obj/item/clothing/suit/wcoat(src) - new /obj/item/clothing/head/soft/black(src) - new /obj/item/clothing/head/soft/black(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/suit/chef/classic(src) + new /obj/item/clothing/suit/chef/classic(src) + new /obj/item/clothing/suit/chef/classic(src) + new /obj/item/clothing/head/soft/mime(src) + new /obj/item/clothing/head/soft/mime(src) new /obj/item/weapon/storage/box/mousetraps(src) new /obj/item/weapon/storage/box/mousetraps(src) new /obj/item/clothing/under/rank/chef(src) new /obj/item/clothing/head/chefhat(src) + new /obj/item/weapon/reagent_containers/glass/rag(src) /* * Janitor diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index c05b60bea2a..ef44ad76adc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -30,12 +30,11 @@ New() ..() sleep(2) - for(var/i = 0, i < 6, i++) - new /obj/item/weapon/reagent_containers/food/snacks/flour(src) - new /obj/item/weapon/reagent_containers/food/condiment/sugar(src) for(var/i = 0, i < 3, i++) - new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src) - return + new /obj/item/weapon/reagent_containers/food/condiment/flour(src) + new /obj/item/weapon/reagent_containers/food/condiment/rice(src) + new /obj/item/weapon/reagent_containers/food/condiment/sugar(src) + /obj/structure/closet/secure_closet/freezer/kitchen/mining @@ -77,7 +76,7 @@ sleep(2) for(var/i = 0, i < 5, i++) new /obj/item/weapon/reagent_containers/food/drinks/milk(src) - for(var/i = 0, i < 3, i++) + for(var/i = 0, i < 5, i++) new /obj/item/weapon/reagent_containers/food/drinks/soymilk(src) for(var/i = 0, i < 2, i++) new /obj/item/weapon/storage/fancy/egg_box(src) diff --git a/code/modules/food/recipes_candy.dm b/code/modules/food/recipes_candy.dm index c7400ee0c62..881ee57a1a1 100644 --- a/code/modules/food/recipes_candy.dm +++ b/code/modules/food/recipes_candy.dm @@ -36,8 +36,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/candy/caramel /datum/recipe/candy/toffee - reagents = list("sugar" = 5) - items = list(/obj/item/weapon/reagent_containers/food/snacks/flour) + reagents = list("sugar" = 5, "flour" = 10) result = /obj/item/weapon/reagent_containers/food/snacks/candy/toffee /datum/recipe/candy/taffy diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index aaf1bbf3da6..029d7231051 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -76,9 +76,8 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sausage /datum/recipe/grill/fishfingers + reagents = list("flour" = 10) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, ) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 0aabf6fb3ef..4e921a49861 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -45,27 +45,6 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal -/* what is this -/datum/recipe/microwave/human - //invalid recipe - make_food(var/obj/container as obj) - var/human_name - var/human_job - for (var/obj/item/weapon/reagent_containers/food/snacks/meat/human/HM in container) - if (!HM.subjectname) - continue - human_name = HM.subjectname - human_job = HM.subjectjob - break - var/lastname_index = findtext(human_name, " ") - if (lastname_index) - human_name = copytext(human_name,lastname_index+1) - - var/obj/item/weapon/reagent_containers/food/snacks/human/HB = ..(container) - HB.name = human_name+HB.name - HB.job = human_job - return HB -*/ /datum/recipe/microwave/human/burger items = list( @@ -74,15 +53,6 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/human/burger -/* Duplicated by plainburger -/datum/recipe/microwave/monkeyburger - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bun, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey - ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger -*/ - /datum/recipe/microwave/plainburger items = list( /obj/item/weapon/reagent_containers/food/snacks/bun, @@ -143,7 +113,6 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/clothing/mask/gas/clown_hat, - /* /obj/item/weapon/reagent_containers/food/snacks/grown/banana, */ ) result = /obj/item/weapon/reagent_containers/food/snacks/clownburger @@ -184,18 +153,12 @@ /datum/recipe/microwave/soylenviridians fruit = list("soybeans" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - ) + reagents = list("flour" = 10) result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians /datum/recipe/microwave/soylentgreen + reagents = list("flour" = 10) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/snacks/meat/human, /obj/item/weapon/reagent_containers/food/snacks/meat/human, ) @@ -312,11 +275,10 @@ result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas /datum/recipe/microwave/monkeysdelight - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) fruit = list("banana" = 1) + reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/monkeycube, + /obj/item/weapon/reagent_containers/food/snacks/monkeycube ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index c9b1703dc54..2efdf4242cd 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -256,9 +256,8 @@ /datum/recipe/oven/creamcheesebread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /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, ) @@ -366,13 +365,10 @@ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie /datum/recipe/oven/appletart - reagents = list("sugar" = 5, "milk" = 5) fruit = list("goldapple" = 1) + reagents = list("sugar" = 5, "milk" = 5, "flour" = 10) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg ) result = /obj/item/weapon/reagent_containers/food/snacks/appletart diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 7707a257634..55ba20e3880 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -779,7 +779,7 @@ "deathnettle" = list("facid" = 0), "soybeans" = list("soymilk" = 0), "tomato" = list("ketchup" = 0), - ///obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5), + "wheat" = list("flour" = -5), "rice" = list("rice" = -5), "cherries" = list("cherryjelly" = 0), ) diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm index 146dc1da95c..ac37f82fe31 100644 --- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm +++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm @@ -105,4 +105,17 @@ result_amount = 1 max_temp = 273 mix_message = "Ice forms as the water freezes." - mix_sound = null \ No newline at end of file + mix_sound = null + + dough + name = "Dough" + id = "dough" + result = null + required_reagents = list("water" = 10, "flour" = 15) + result_amount = 1 + mix_message = "The ingredients form a dough." + + on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/weapon/reagent_containers/food/snacks/dough(location) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index e3d9d5d4081..910860e1b2d 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -6,7 +6,7 @@ //Food items that aren't eaten normally and leave an empty container behind. /obj/item/weapon/reagent_containers/food/condiment - name = "Condiment Container" + name = "condiment container" desc = "Just your average condiment container." icon = 'icons/obj/food/food.dmi' icon_state = "emptycondiment" @@ -14,7 +14,18 @@ possible_transfer_amounts = list(1,5,10) volume = 50 //Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites. - var/list/possible_states = list("ketchup" = list("ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "enzyme" = list("enzyme", "Universal Enzyme", "Used in cooking various dishes"), "soysauce" = list("soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("coldsauce", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("saltshaker", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("pepermillsmall", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("oliveoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("emptycondiment", "Sugar", "Tasty spacey sugar!")) + var/list/possible_states = list( + "ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."), + "capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"), + "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"), + "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"), + "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"), + "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"), + "blackpepper" = list("pepermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"), + "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"), + "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"), + "flour" =list("flour", "flour sack", "A big bag of flour. Good for baking!"), + "rice" =list("rice", "rice sack", "A big bag of rice. Good for cooking!")) /obj/item/weapon/reagent_containers/food/condiment/attackby(obj/item/weapon/W as obj, mob/user as mob, params) @@ -96,7 +107,7 @@ user << "\blue You transfer [trans] units of the condiment to [target]." /obj/item/weapon/reagent_containers/food/condiment/on_reagent_change() - if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall") + if(!possible_states.len) return if(reagents.reagent_list.len > 0) var/main_reagent = reagents.get_master_reagent_id() @@ -107,21 +118,22 @@ desc = temp_list[3] else - name = "Misc Condiment Bottle" + name = "condiment bottle" + main_reagent = reagents.get_master_reagent_name() if (reagents.reagent_list.len==1) - desc = "Looks like it is [main_reagent], but you are not sure." + desc = "Looks like it is [lowertext(main_reagent)], but you are not sure." else - desc = "A mixture of various condiments. [main_reagent] is one of them." + desc = "A mixture of various condiments. [lowertext(main_reagent)] is one of them." icon_state = "mixedcondiments" else icon_state = "emptycondiment" - name = "Condiment Bottle" + name = "condiment bottle" desc = "An empty condiment bottle." return /obj/item/weapon/reagent_containers/food/condiment/enzyme - name = "Universal Enzyme" + name = "universal enzyme" desc = "Used in cooking various dishes." icon_state = "enzyme" New() @@ -129,10 +141,35 @@ reagents.add_reagent("enzyme", 50) /obj/item/weapon/reagent_containers/food/condiment/sugar + name = "sugar bottle" + desc = "Tasty spacey sugar!" + New() ..() reagents.add_reagent("sugar", 50) +/obj/item/weapon/reagent_containers/food/condiment/flour + name = "flour sack" + desc = "A big bag of flour. Good for baking!" + icon_state = "flour" + item_state = "flour" + possible_states = list() + + New() + ..() + reagents.add_reagent("flour", 30) + +/obj/item/weapon/reagent_containers/food/condiment/rice + name = "rice sack" + desc = "A big bag of rice. Good for cooking!" + icon_state = "rice" + item_state = "flour" + possible_states = list() + + New() + ..() + reagents.add_reagent("rice", 30) + /obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then name = "Salt Shaker" // a large one. desc = "Salt. From space oceans, presumably." @@ -140,6 +177,8 @@ possible_transfer_amounts = list(1,20) //for clown turning the lid off amount_per_transfer_from_this = 1 volume = 20 + possible_states = list() + New() ..() reagents.add_reagent("sodiumchloride", 20) @@ -151,6 +190,8 @@ possible_transfer_amounts = list(1,20) //for clown turning the lid off amount_per_transfer_from_this = 1 volume = 20 + possible_states = list() + New() ..() reagents.add_reagent("blackpepper", 20) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 75f7a16eef0..097dc03e6e1 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -629,14 +629,6 @@ reagents.add_reagent("nutriment", 2) reagents.add_reagent("egg", 5) -/obj/item/weapon/reagent_containers/food/snacks/flour - name = "flour" - desc = "A small bag filled with some flour." - icon_state = "flour" - New() - ..() - reagents.add_reagent("flour", 5) - /obj/item/weapon/reagent_containers/food/snacks/organ name = "organ" @@ -3176,22 +3168,6 @@ ..() reagents.add_reagent("nutriment", 3) -// Flour + egg = dough -/obj/item/weapon/reagent_containers/food/snacks/flour/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg)) - new /obj/item/weapon/reagent_containers/food/snacks/dough(src) - user << "You make some dough." - qdel(W) - qdel(src) - -// Egg + flour = dough -/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/flour)) - new /obj/item/weapon/reagent_containers/food/snacks/dough(src) - user << "You make some dough." - qdel(W) - qdel(src) - /obj/item/weapon/reagent_containers/food/snacks/dough name = "dough" desc = "A piece of dough."