diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 00537f66e4e..98c0e796156 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -412,14 +412,14 @@ /obj/item/reagent_containers/food/snacks/soup/nettlesoup, /obj/item/reagent_containers/food/snacks/soup/meatballsoup) var/salads = list( - /obj/item/reagent_containers/food/snacks/herbsalad, - /obj/item/reagent_containers/food/snacks/validsalad, - /obj/item/reagent_containers/food/snacks/aesirsalad) + /obj/item/reagent_containers/food/snacks/salad/herb, + /obj/item/reagent_containers/food/snacks/salad/valid, + /obj/item/reagent_containers/food/snacks/salad/aesir) var/mains = list( /obj/item/reagent_containers/food/snacks/enchiladas, /obj/item/reagent_containers/food/snacks/stewedsoymeat, - /obj/item/reagent_containers/food/snacks/bigbiteburger, - /obj/item/reagent_containers/food/snacks/superbiteburger) + /obj/item/reagent_containers/food/snacks/burger/bigbite, + /obj/item/reagent_containers/food/snacks/burger/superbite) /obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload) loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 02009c5160b..f3c9a997ea0 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -30,7 +30,7 @@ "Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles, "Donut" = /obj/item/reagent_containers/food/snacks/donut, "Chicken Soup" = /obj/item/reagent_containers/food/drinks/chicken_soup, - "Tofu Burger" = /obj/item/reagent_containers/food/snacks/tofuburger) + "Tofu Burger" = /obj/item/reagent_containers/food/snacks/burger/tofu) var/static/list/rsf_icons = list("Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"), "Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"), "Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"), diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ecd56f92661..a96eda7b808 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -781,6 +781,7 @@ /obj/item/reagent_containers/food/snacks/plum_pie name = "perfect plum pie" desc = "The Jack Horner brand of pie. 2 big thumbs up." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plump_pie" filling_color = "#B8279B" bitesize = 10 diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 137c33a52e1..ba3cd54fede 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -8,6 +8,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/carrotcake name = "carrot cake" desc = "A favorite desert of a certain wascally wabbit. Not a lie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "carrotcake" slice_path = /obj/item/reagent_containers/food/snacks/carrotcakeslice slices_num = 5 @@ -19,6 +20,7 @@ /obj/item/reagent_containers/food/snacks/carrotcakeslice name = "carrot cake slice" desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "carrotcake_slice" trash = /obj/item/trash/plate filling_color = "#FFD675" @@ -28,6 +30,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/braincake name = "brain cake" desc = "A squishy cake-thing." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "braincake" slice_path = /obj/item/reagent_containers/food/snacks/braincakeslice slices_num = 5 @@ -39,6 +42,7 @@ /obj/item/reagent_containers/food/snacks/braincakeslice name = "brain cake slice" desc = "Lemme tell you something about brains. THEY'RE DELICIOUS." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "braincakeslice" trash = /obj/item/trash/plate filling_color = "#E6AEDB" @@ -47,6 +51,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/cheesecake name = "cheese cake" desc = "DANGEROUSLY cheesy." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cheesecake" slice_path = /obj/item/reagent_containers/food/snacks/cheesecakeslice slices_num = 5 @@ -58,6 +63,7 @@ /obj/item/reagent_containers/food/snacks/cheesecakeslice name = "cheese cake slice" desc = "Slice of pure cheestisfaction." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cheesecake_slice" trash = /obj/item/trash/plate filling_color = "#FAF7AF" @@ -66,6 +72,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/plaincake name = "vanilla cake" desc = "A plain cake, not a lie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plaincake" slice_path = /obj/item/reagent_containers/food/snacks/plaincakeslice slices_num = 5 @@ -77,6 +84,7 @@ /obj/item/reagent_containers/food/snacks/plaincakeslice name = "vanilla cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plaincake_slice" trash = /obj/item/trash/plate filling_color = "#F7EDD5" @@ -85,6 +93,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/orangecake name = "orange cake" desc = "A cake with added orange." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "orangecake" slice_path = /obj/item/reagent_containers/food/snacks/orangecakeslice slices_num = 5 @@ -96,6 +105,7 @@ /obj/item/reagent_containers/food/snacks/orangecakeslice name = "orange cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "orangecake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" @@ -104,6 +114,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/bananacake name = "banana cake" desc = "A cake with added bananas." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "bananacake" slice_path = /obj/item/reagent_containers/food/snacks/bananacakeslice slices_num = 5 @@ -115,6 +126,7 @@ /obj/item/reagent_containers/food/snacks/bananacakeslice name = "banana cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "bananacake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" @@ -123,6 +135,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/limecake name = "lime cake" desc = "A cake with added lime." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "limecake" bitesize = 3 slice_path = /obj/item/reagent_containers/food/snacks/limecakeslice @@ -134,6 +147,7 @@ /obj/item/reagent_containers/food/snacks/limecakeslice name = "lime cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "limecake_slice" trash = /obj/item/trash/plate filling_color = "#CBFA8E" @@ -142,6 +156,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/lemoncake name = "lemon cake" desc = "A cake with added lemon." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "lemoncake" slice_path = /obj/item/reagent_containers/food/snacks/lemoncakeslice slices_num = 5 @@ -153,6 +168,7 @@ /obj/item/reagent_containers/food/snacks/lemoncakeslice name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "lemoncake_slice" trash = /obj/item/trash/plate filling_color = "#FAFA8E" @@ -161,6 +177,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake name = "chocolate cake" desc = "A cake with added chocolate." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "chocolatecake" slice_path = /obj/item/reagent_containers/food/snacks/chocolatecakeslice slices_num = 5 @@ -172,6 +189,7 @@ /obj/item/reagent_containers/food/snacks/chocolatecakeslice name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate filling_color = "#805930" @@ -180,6 +198,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake name = "birthday cake" desc = "Happy Birthday..." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "birthdaycake" slice_path = /obj/item/reagent_containers/food/snacks/birthdaycakeslice slices_num = 5 @@ -191,6 +210,7 @@ /obj/item/reagent_containers/food/snacks/birthdaycakeslice name = "birthday cake slice" desc = "A slice of your birthday" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate filling_color = "#FFD6D6" @@ -199,6 +219,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/applecake name = "apple cake" desc = "A cake centered with Apple." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applecake" slice_path = /obj/item/reagent_containers/food/snacks/applecakeslice slices_num = 5 @@ -210,6 +231,7 @@ /obj/item/reagent_containers/food/snacks/applecakeslice name = "apple cake slice" desc = "A slice of heavenly cake." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applecakeslice" trash = /obj/item/trash/plate filling_color = "#EBF5B8" @@ -223,6 +245,7 @@ /obj/item/reagent_containers/food/snacks/cookie name = "cookie" desc = "COOKIE!!!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "COOKIE!!!" bitesize = 1 filling_color = "#DBC94F" @@ -232,6 +255,7 @@ /obj/item/reagent_containers/food/snacks/fortunecookie name = "fortune cookie" desc = "A true prophecy in each cookie!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "fortune_cookie" filling_color = "#E8E79E" list_reagents = list("nutriment" = 3) @@ -241,6 +265,7 @@ /obj/item/reagent_containers/food/snacks/sugarcookie name = "sugar cookie" desc = "Just like your little sister used to make." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "sugarcookie" list_reagents = list("nutriment" = 1, "sugar" = 3) tastes = list("sweetness" = 1) @@ -253,6 +278,7 @@ /obj/item/reagent_containers/food/snacks/pie name = "banana cream pie" desc = "Just like back home, on clown planet! HONK!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pie" trash = /obj/item/trash/plate filling_color = "#FBFFB8" @@ -268,6 +294,7 @@ /obj/item/reagent_containers/food/snacks/meatpie name = "meat-pie" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "meatpie" desc = "An old barber recipe, very delicious!" trash = /obj/item/trash/plate @@ -278,6 +305,7 @@ /obj/item/reagent_containers/food/snacks/tofupie name = "tofu-pie" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "meatpie" desc = "A delicious tofu pie." trash = /obj/item/trash/plate @@ -289,6 +317,7 @@ /obj/item/reagent_containers/food/snacks/amanita_pie name = "amanita pie" desc = "Sweet and tasty poison pie." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "amanita_pie" filling_color = "#FFCCCC" bitesize = 4 @@ -298,6 +327,7 @@ /obj/item/reagent_containers/food/snacks/plump_pie name = "plump pie" desc = "I bet you love stuff made out of plump helmets!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plump_pie" filling_color = "#B8279B" bitesize = 3 @@ -313,6 +343,7 @@ /obj/item/reagent_containers/food/snacks/xemeatpie name = "xeno-pie" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "xenomeatpie" desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate @@ -324,6 +355,7 @@ /obj/item/reagent_containers/food/snacks/applepie name = "apple pie" desc = "A pie containing sweet sweet love... or apple." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applepie" filling_color = "#E0EDC5" bitesize = 3 @@ -334,6 +366,7 @@ /obj/item/reagent_containers/food/snacks/cherrypie name = "cherry pie" desc = "Taste so good, make a grown man cry." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cherrypie" filling_color = "#FF525A" bitesize = 3 @@ -343,6 +376,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie name = "pumpkin pie" desc = "A delicious treat for the autumn months." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkinpie" slice_path = /obj/item/reagent_containers/food/snacks/pumpkinpieslice slices_num = 5 @@ -354,6 +388,7 @@ /obj/item/reagent_containers/food/snacks/pumpkinpieslice name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate filling_color = "#F5B951" @@ -366,6 +401,7 @@ /obj/item/reagent_containers/food/snacks/donut name = "donut" desc = "Goes great with Robust Coffee." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "donut1" bitesize = 5 list_reagents = list("nutriment" = 3, "sugar" = 2) @@ -445,10 +481,12 @@ /obj/item/reagent_containers/food/snacks/pancake name = "pancake" desc = "A plain pancake." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "pancake" filling_color = "#E7D8AB" bitesize = 2 list_reagents = list("nutriment" = 3, "sugar" = 3) + tastes = list("sweet cake" = 1) /obj/item/reagent_containers/food/snacks/pancake/attack_tk(mob/user) if(src in user.tkgrabbed_objects) @@ -470,12 +508,14 @@ desc = "A pancake loaded with berries." icon_state = "berry_pancake" list_reagents = list("nutriment" = 3, "sugar" = 3, "berryjuice" = 3) + tastes = list("sweet cake" = 2, "berries" = 2) /obj/item/reagent_containers/food/snacks/pancake/choc_chip_pancake name = "choc-chip pancake" desc = "A pancake loaded with chocolate chips." icon_state = "choc_chip_pancake" list_reagents = list("nutriment" = 3, "sugar" = 3, "cocoa" = 3) + tastes = list("sweet cake" = 2, "chocolate" = 3) ////////////////////// // Misc // @@ -484,6 +524,7 @@ /obj/item/reagent_containers/food/snacks/muffin name = "muffin" desc = "A delicious and spongy little cake." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "muffin" filling_color = "#E0CF9B" list_reagents = list("nutriment" = 6) @@ -492,6 +533,7 @@ /obj/item/reagent_containers/food/snacks/berryclafoutis name = "berry clafoutis" desc = "No black birds, this is a good sign." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "berryclafoutis" trash = /obj/item/trash/plate bitesize = 3 @@ -502,6 +544,7 @@ /obj/item/reagent_containers/food/snacks/poppypretzel name = "poppy pretzel" desc = "A large soft pretzel full of POP! It's all twisted up!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "poppypretzel" filling_color = "#916E36" list_reagents = list("nutriment" = 5) @@ -510,6 +553,7 @@ /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "phelmbiscuit" filling_color = "#CFB4C4" list_reagents = list("nutriment" = 5) @@ -525,6 +569,7 @@ /obj/item/reagent_containers/food/snacks/appletart name = "golden apple streusel tart" desc = "A tasty dessert that won't make it through a metal detector." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "gappletart" trash = /obj/item/trash/plate filling_color = "#FFFF00" @@ -536,6 +581,7 @@ /obj/item/reagent_containers/food/snacks/cracker name = "cracker" desc = "It's a salted cracker." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cracker" bitesize = 1 filling_color = "#F5DEB8" @@ -545,6 +591,7 @@ /obj/item/reagent_containers/food/snacks/croissant name = "croissant" desc = "Once a pastry reserved for the bourgeois, this flaky goodness is now on your table." + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "croissant" bitesize = 4 filling_color = "#ecb54f" diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 5580f600dfb..f3b30727f14 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -6,6 +6,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/meatbread name = "meatbread loaf" desc = "The culinary base of every self-respecting eloquen/tg/entleman." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbread" slice_path = /obj/item/reagent_containers/food/snacks/meatbreadslice slices_num = 5 @@ -16,12 +17,14 @@ /obj/item/reagent_containers/food/snacks/meatbreadslice name = "meatbread slice" desc = "A slice of delicious meatbread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbreadslice" filling_color = "#FF7575" /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread name = "xenomeatbread loaf" desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenomeatbread" slice_path = /obj/item/reagent_containers/food/snacks/xenomeatbreadslice slices_num = 5 @@ -32,12 +35,14 @@ /obj/item/reagent_containers/food/snacks/xenomeatbreadslice name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenobreadslice" filling_color = "#8AFF75" /obj/item/reagent_containers/food/snacks/sliceable/spidermeatbread name = "spider meat loaf" desc = "Reassuringly green meatloaf made from spider meat." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatbread" slice_path = /obj/item/reagent_containers/food/snacks/spidermeatbreadslice slices_num = 5 @@ -47,29 +52,34 @@ /obj/item/reagent_containers/food/snacks/spidermeatbreadslice name = "spider meat bread slice" desc = "A slice of meatloaf made from an animal that most likely still wants you dead." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatslice" + tastes = list("bread" = 10, "cobwebs" = 5) list_reagents = list("toxin" = 2) /obj/item/reagent_containers/food/snacks/sliceable/bananabread name = "banana-nut bread" desc = "A heavenly and filling treat." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabread" slice_path = /obj/item/reagent_containers/food/snacks/bananabreadslice slices_num = 5 filling_color = "#EDE5AD" list_reagents = list("banana" = 20, "nutriment" = 20) - tastes = list("bread" = 10) + tastes = list("bread" = 10, "banana" = 5) /obj/item/reagent_containers/food/snacks/bananabreadslice name = "banana-nut bread slice" desc = "A slice of delicious banana bread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabreadslice" filling_color = "#EDE5AD" - tastes = list("bread" = 10) + tastes = list("bread" = 10, "banana" = 5) /obj/item/reagent_containers/food/snacks/sliceable/tofubread name = "tofubread" desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubread" slice_path = /obj/item/reagent_containers/food/snacks/tofubreadslice slices_num = 5 @@ -80,30 +90,34 @@ /obj/item/reagent_containers/food/snacks/tofubreadslice name = "tofubread slice" desc = "A slice of delicious tofubread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubreadslice" filling_color = "#F7FFE0" /obj/item/reagent_containers/food/snacks/sliceable/bread name = "bread" desc = "Some plain old Earthen bread." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bread" slice_path = /obj/item/reagent_containers/food/snacks/breadslice slices_num = 6 filling_color = "#FFE396" list_reagents = list("nutriment" = 10) - tastes = list("bread" = 10) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/breadslice name = "bread slice" desc = "A slice of home." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "breadslice" filling_color = "#D27332" list_reagents = list("nutriment" = 2, "bread" = 5) - tastes = list("bread" = 10) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread name = "cream cheese bread" desc = "Yum yum yum!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "creamcheesebread" slice_path = /obj/item/reagent_containers/food/snacks/creamcheesebreadslice slices_num = 5 @@ -114,6 +128,7 @@ /obj/item/reagent_containers/food/snacks/creamcheesebreadslice name = "cream cheese bread slice" desc = "A slice of yum!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "creamcheesebreadslice" filling_color = "#FFF896" list_reagents = list("nutriment" = 4, "vitamin" = 1) @@ -122,6 +137,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/banarnarbread name = "banarnarbread loaf" desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "banarnarbread" slice_path = /obj/item/reagent_containers/food/snacks/banarnarbreadslice slices_num = 5 @@ -132,6 +148,7 @@ /obj/item/reagent_containers/food/snacks/banarnarbreadslice name = "banarnarbread slice" desc = "A slice of delicious mah'weyh pleggh at e'ntrath!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "banarnarbreadslice" filling_color = "#6F0000" list_reagents = list("nutriment" = 4, "vitamin" = 1) @@ -157,18 +174,19 @@ icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "flatbread" list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bread" = 2) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/baguette name = "baguette" desc = "Bon appetit!" + icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "baguette" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' filling_color = "#E3D796" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bread" = 2) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/baguette/combat sharp = TRUE @@ -181,24 +199,27 @@ /obj/item/reagent_containers/food/snacks/twobread name = "two bread" desc = "It is very bitter and winy." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "twobread" filling_color = "#DBCC9A" bitesize = 3 list_reagents = list("nutriment" = 2, "vitamin" = 2) - tastes = list("bread" = 2) + tastes = list("bread" = 1) /obj/item/reagent_containers/food/snacks/toast name = "toast" desc = "Yeah! Toast!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "toast" filling_color = "#B2580E" bitesize = 3 list_reagents = list("nutriment" = 3) - tastes = list("toast" = 2) + tastes = list("toast" = 1) /obj/item/reagent_containers/food/snacks/jelliedtoast name = "jellied toast" desc = "A slice of bread covered with delicious jam." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "jellytoast" filling_color = "#B572AB" bitesize = 3 @@ -213,6 +234,7 @@ /obj/item/reagent_containers/food/snacks/rofflewaffles name = "roffle waffles" desc = "Waffles from Roffle. Co." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "rofflewaffles" trash = /obj/item/trash/waffles filling_color = "#FF00F7" @@ -223,6 +245,7 @@ /obj/item/reagent_containers/food/snacks/waffles name = "waffles" desc = "Mmm, waffles." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "waffles" trash = /obj/item/trash/waffles filling_color = "#E6DEB5" diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index 568eeeaa285..bcfe970c80f 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -6,6 +6,7 @@ /obj/item/reagent_containers/food/snacks/meat name = "meat" desc = "A slab of meat." + icon = 'icons/obj/food/meat.dmi' icon_state = "meat" filling_color = "#FF1C1C" bitesize = 3 @@ -71,7 +72,7 @@ bitesize = 4 /obj/item/reagent_containers/food/snacks/meat/tomatomeat - name = "tomato slice" + name = "tomato meat slice" desc = "A slice from a huge tomato." icon_state = "tomatomeat" filling_color = "#DB0000" @@ -114,6 +115,7 @@ // DOES NOT SPAWN NATURALLY! name = "abstract monster meat" desc = "A slab of abstract monster meat. This shouldn't exist, contact a coder about this if you are seeing it in-game." + icon = 'icons/obj/food/meat.dmi' icon_state = "bearmeat" /obj/item/reagent_containers/food/snacks/monstermeat/bearmeat @@ -161,6 +163,7 @@ /obj/item/reagent_containers/food/snacks/raw_bacon name = "raw bacon" desc = "God's gift to man in uncooked form." + icon = 'icons/obj/food/meat.dmi' icon_state = "raw_bacon" list_reagents = list("nutriment" = 1, "porktonium" = 10) tastes = list("bacon" = 1) @@ -191,6 +194,7 @@ /obj/item/reagent_containers/food/snacks/meatsteak name = "meat steak" desc = "A piece of hot spicy meat." + icon = 'icons/obj/food/meat.dmi' icon_state = "meatstake" trash = /obj/item/trash/plate filling_color = "#7A3D11" @@ -201,6 +205,7 @@ /obj/item/reagent_containers/food/snacks/bacon name = "bacon" desc = "It looks crispy and tastes amazing! Mmm... Bacon." + icon = 'icons/obj/food/meat.dmi' icon_state = "bacon" list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4) tastes = list("bacon" = 1) @@ -208,6 +213,7 @@ /obj/item/reagent_containers/food/snacks/telebacon name = "tele bacon" desc = "It tastes a little odd but it's still delicious." + icon = 'icons/obj/food/meat.dmi' icon_state = "bacon" var/obj/item/radio/beacon/bacon/baconbeacon list_reagents = list("nutriment" = 4, "porktonium" = 10) @@ -230,6 +236,7 @@ /obj/item/reagent_containers/food/snacks/meatball name = "meatball" desc = "A great meal all round." + icon = 'icons/obj/food/meat.dmi' icon_state = "meatball" filling_color = "#DB0000" list_reagents = list("protein" = 4, "vitamin" = 1) @@ -238,6 +245,7 @@ /obj/item/reagent_containers/food/snacks/sausage name = "sausage" desc = "A piece of mixed and cased meat." + icon = 'icons/obj/food/meat.dmi' icon_state = "sausage" filling_color = "#DB0000" list_reagents = list("protein" = 6, "vitamin" = 1, "porktonium" = 10) @@ -254,6 +262,7 @@ /obj/item/reagent_containers/food/snacks/spidereggsham name = "green eggs and ham" desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" + icon = 'icons/obj/food/meat.dmi' icon_state = "spidereggsham" trash = /obj/item/trash/plate bitesize = 4 @@ -263,6 +272,7 @@ /obj/item/reagent_containers/food/snacks/boiledspiderleg name = "boiled spider leg" desc = "A giant spider's leg that's still twitching after being cooked. Gross!" + icon = 'icons/obj/food/meat.dmi' icon_state = "spiderlegcooked" trash = /obj/item/trash/plate bitesize = 3 @@ -272,6 +282,7 @@ /obj/item/reagent_containers/food/snacks/wingfangchu name = "wing fang chu" desc = "A savory dish of alien wing wang in soy. Wait, what?" + icon = 'icons/obj/food/meat.dmi' icon_state = "wingfangchu" trash = /obj/item/trash/snack_bowl filling_color = "#43DE18" @@ -282,6 +293,7 @@ name = "goliath steak" desc = "A delicious, lava cooked steak." resistance_flags = LAVA_PROOF | FIRE_PROOF + icon = 'icons/obj/food/meat.dmi' icon_state = "goliathsteak" trash = null list_reagents = list("protein" = 6, "vitamin" = 2) @@ -290,6 +302,7 @@ /obj/item/reagent_containers/food/snacks/fried_vox name = "Kentucky Fried Vox" desc = "Bucket of voxxy, yaya!" + icon = 'icons/obj/food/meat.dmi' icon_state = "fried_vox" trash = /obj/item/trash/fried_vox list_reagents = list("nutriment" = 3, "protein" = 5) @@ -369,6 +382,7 @@ /obj/item/reagent_containers/food/snacks/egg name = "egg" desc = "An egg!" + icon = 'icons/obj/food/breakfast.dmi' icon_state = "egg" filling_color = "#FDFFD1" list_reagents = list("protein" = 1, "egg" = 5) @@ -442,6 +456,7 @@ /obj/item/reagent_containers/food/snacks/friedegg name = "fried egg" desc = "A fried egg, with a touch of salt and pepper." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "friedegg" filling_color = "#FFDF78" bitesize = 1 @@ -451,6 +466,7 @@ /obj/item/reagent_containers/food/snacks/boiledegg name = "boiled egg" desc = "A hard boiled egg." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "egg" filling_color = "#FFFFFF" list_reagents = list("nutriment" = 2, "egg" = 5, "vitamin" = 1) @@ -458,6 +474,7 @@ /obj/item/reagent_containers/food/snacks/chocolateegg name = "chocolate egg" desc = "Such sweet, fattening food." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "chocolateegg" filling_color = "#7D5F46" list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2) @@ -465,6 +482,7 @@ /obj/item/reagent_containers/food/snacks/omelette name = "omelette du fromage" desc = "That's all you can say!" + icon = 'icons/obj/food/breakfast.dmi' icon_state = "omelette" trash = /obj/item/trash/plate filling_color = "#FFF9A8" @@ -475,6 +493,7 @@ /obj/item/reagent_containers/food/snacks/benedict name = "eggs benedict" desc = "There is only one egg on this, how rude." + icon = 'icons/obj/food/breakfast.dmi' icon_state = "benedict" bitesize = 3 list_reagents = list("nutriment" = 6, "egg" = 3, "vitamin" = 4) @@ -488,6 +507,7 @@ /obj/item/reagent_containers/food/snacks/hotdog name = "hotdog" desc = "Not made with actual dogs. Hopefully." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "hotdog" bitesize = 3 list_reagents = list("nutriment" = 6, "ketchup" = 3, "vitamin" = 3) @@ -496,6 +516,7 @@ /obj/item/reagent_containers/food/snacks/meatbun name = "meat bun" desc = "Has the potential to not be dog." + icon = 'icons/obj/food/meat.dmi' icon_state = "meatbun" bitesize = 6 list_reagents = list("nutriment" = 6, "vitamin" = 2) @@ -504,6 +525,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/turkey name = "turkey" desc = "A traditional turkey served with stuffing." + icon = 'icons/obj/food/meat.dmi' icon_state = "turkey" slice_path = /obj/item/reagent_containers/food/snacks/turkeyslice slices_num = 6 @@ -513,6 +535,7 @@ /obj/item/reagent_containers/food/snacks/turkeyslice name = "turkey serving" desc = "A serving of some tender and delicious turkey." + icon = 'icons/obj/food/meat.dmi' icon_state = "turkeyslice" trash = /obj/item/trash/plate filling_color = "#B97A57" @@ -546,7 +569,8 @@ /obj/item/reagent_containers/food/snacks/bbqribs name = "BBQ ribs" desc = "Sweet, smokey, savory, and gets everywhere. Perfect for Grilling." + icon = 'icons/obj/food/meat.dmi' + icon_state = "bbqribs" list_reagents = list("nutriment" = 3, "protein" = 10, "bbqsauce" = 10) filling_color = "#FF1C1C" bitesize = 3 - icon_state = "bbqribs" diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm index 22ec624f7cf..e9f6f69f5f3 100644 --- a/code/modules/food_and_drinks/food/foods/misc_food.dm +++ b/code/modules/food_and_drinks/food/foods/misc_food.dm @@ -28,7 +28,7 @@ trash = /obj/item/trash/waffles filling_color = "#E6FA61" list_reagents = list("nutriment" = 10, "vitamin" = 1) - tastes = list("waffles" = 10) + tastes = list("waffles" = 1) /obj/item/reagent_containers/food/snacks/monkeysdelight name = "monkey's delight" @@ -63,33 +63,101 @@ // Salads // ////////////////////// -/obj/item/reagent_containers/food/snacks/aesirsalad - name = "aesir salad" - desc = "Probably too incredible for mortal men to fully enjoy." - icon_state = "aesirsalad" +/obj/item/reagent_containers/food/snacks/salad + name = "salad" + desc = "Should not spawn or be possible to be created. Contact a coder if this somehow exists." + icon = 'icons/obj/food/soupsalad.dmi' + icon_state = "salad" trash = /obj/item/trash/snack_bowl filling_color = "#468C00" bitesize = 3 + list_reagents = list("nutriment" = 6,"vitamin" = 4) + tastes = list("lettuce" = 1) + +/obj/item/reagent_containers/food/snacks/salad/aesir + name = "aesir salad" + desc = "Probably too incredible for mortal men to fully enjoy." + icon_state = "aesirsalad" list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6) tastes = list("divinity" = 1, "lettuce" = 1) -/obj/item/reagent_containers/food/snacks/herbsalad +/obj/item/reagent_containers/food/snacks/salad/antipasto + name = "antipasto salad" + desc = "A traditional Italian salad made of salami, mozzarella cheese, olives, and tomatoes. Often served as a first course meal." + icon_state = "antipasto_salad" + list_reagents = list("nutriment" = 12, "protein" = 6, "vitamin" = 6) + tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1) + +/obj/item/reagent_containers/food/snacks/salad/caesar + name = "Caesar salad" + desc = "A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread!" + icon_state = "caesar_salad" + list_reagents = list("nutriment" = 12, "vitamin" = 6) + tastes = list("healthy greens" = 2, "olive dressing" = 2, "feta cheese" = 2, "pita bread" = 1) + +/obj/item/reagent_containers/food/snacks/salad/fruit + name = "fruit salad" + desc = "Your standard fruit salad." + icon_state = "fruitsalad" + list_reagents = list("nutriment" = 9, "vitamin" = 4) + tastes = list("fruit" = 1) + +/obj/item/reagent_containers/food/snacks/salad/greek + name = "Greek salad" + desc = "A popular salad made of tomatoes, onions, feta cheese, and olives all drizzled in olive oil. Though it feels like it's missing something..." + icon_state = "greek_salad" + list_reagents = list("nutriment" = 13, "vitamin" = 14) + tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1) + +/obj/item/reagent_containers/food/snacks/salad/citrusdelight + name = "citrus delight" + desc = "Citrus overload!" + icon_state = "citrusdelight" + list_reagents = list("nutriment" = 11, "vitamin" = 7) + tastes = list("sourness" = 1, "leaves" = 1) + +/obj/item/reagent_containers/food/snacks/salad/jungle + name = "jungle salad" + desc = "Exotic fruits in a bowl." + icon_state = "junglesalad" + list_reagents = list("banana" = 5, "nutriment" = 11, "vitamin" = 7) + tastes = list("fruit" = 1, "the jungle" = 1) + +/obj/item/reagent_containers/food/snacks/salad/kale + name = "kale salad" + desc = "A healthy kale salad drizzled in oil, perfect for warm summer months." + icon_state = "kale_salad" + list_reagents = list("nutriment" = 12, "vitamin" = 12) + tastes = list("healthy greens" = 2, "olive dressing" = 1) + +/obj/item/reagent_containers/food/snacks/salad/potato + name = "potato salad" + desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbeque." + icon_state = "potato_salad" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("potato" = 2, "egg" = 2, "mayonnaise" = 2) + +/obj/item/reagent_containers/food/snacks/salad/melonfruitbowl + name = "melon fruit bowl" + desc = "For people who wants edible fruit bowls." + icon_state = "melonfruitbowl" + trash = null + list_reagents = list("nutriment" = 6, "vitamin" = 4) + tastes = list("melon" = 1) + +/obj/item/reagent_containers/food/snacks/salad/herb name = "herb salad" desc = "A tasty salad with apples on top." icon_state = "herbsalad" - trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" - bitesize = 3 list_reagents = list("nutriment" = 8, "vitamin" = 2) tastes = list("lettuce" = 1, "apple" = 1) -/obj/item/reagent_containers/food/snacks/validsalad +/obj/item/reagent_containers/food/snacks/salad/valid name = "valid salad" desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." icon_state = "validsalad" - trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" - bitesize = 3 list_reagents = list("nutriment" = 8, "salglu_solution" = 5, "vitamin" = 2) tastes = list("fried potato" = 1, "lettuce" = 1, "meat" = 1, "valids" = 1) @@ -190,7 +258,7 @@ icon_state = "boiledrorocore" bitesize = 3 list_reagents = list("slimejelly" = 5) - tastes = list("jelly" = 3) + tastes = list("jelly" = 1) /obj/item/reagent_containers/food/snacks/popcorn name = "popcorn" diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm index 70d30f94d93..57cc1fb63c0 100644 --- a/code/modules/food_and_drinks/food/foods/sandwiches.dm +++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm @@ -3,7 +3,24 @@ // Burgers // ////////////////////// -/obj/item/reagent_containers/food/snacks/brainburger +// Abstract object used for inheritance. Should never spawn. Needed to not break recipes that use plain burgers; recipes that use "burger" would accept any burger and transfer reagents otherwise. + +/obj/item/reagent_containers/food/snacks/burger + name = "burger" + desc = "If you got this, something broke! Contact a coder if this somehow spawns." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "burger" + +/obj/item/reagent_containers/food/snacks/burger/plain + name = "burger" + desc = "The cornerstone of every nutritious breakfast." + icon_state = "hburger" + filling_color = "#D63C3C" + bitesize = 3 + list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("bun" = 4, "meat" = 1) + +/obj/item/reagent_containers/food/snacks/burger/brain name = "brainburger" desc = "A strange looking burger. It appears almost sentient." icon_state = "brainburger" @@ -12,7 +29,7 @@ list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1) tastes = list("bun" = 4, "brains" = 2) -/obj/item/reagent_containers/food/snacks/ghostburger +/obj/item/reagent_containers/food/snacks/burger/ghost name = "ghost burger" desc = "Spooky! It doesn't look very filling." icon_state = "ghostburger" @@ -29,12 +46,13 @@ /obj/item/reagent_containers/food/snacks/human/burger name = "-burger" desc = "A bloody burger." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "hburger" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "tender meat" = 2) -/obj/item/reagent_containers/food/snacks/cheeseburger +/obj/item/reagent_containers/food/snacks/burger/cheese name = "cheeseburger" desc = "The cheese adds a good flavor." icon_state = "cheeseburger" @@ -42,16 +60,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "meat" = 1, "cheese" = 1) -/obj/item/reagent_containers/food/snacks/monkeyburger - name = "burger" - desc = "The cornerstone of every nutritious breakfast." - icon_state = "hburger" - filling_color = "#D63C3C" - bitesize = 3 - list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bun" = 4, "meat" = 1, "the jungle" = 1) - -/obj/item/reagent_containers/food/snacks/tofuburger +/obj/item/reagent_containers/food/snacks/burger/tofu name = "tofu burger" desc = "Making this should probably be a criminal offense." icon_state = "tofuburger" @@ -60,7 +69,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "tofu" = 4) -/obj/item/reagent_containers/food/snacks/hamborger +/obj/item/reagent_containers/food/snacks/burger/hamborger name = "hamborger" desc = "Looking at this makes your flesh feel like a weakness." icon_state = "roburger" @@ -69,11 +78,11 @@ list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1) tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1) -/obj/item/reagent_containers/food/snacks/hamborger/Initialize(mapload) +/obj/item/reagent_containers/food/snacks/burger/hamborger/Initialize(mapload) . = ..() message_admins("A [name] has been created at [ADMIN_COORDJMP(src)].") -/obj/item/reagent_containers/food/snacks/xenoburger +/obj/item/reagent_containers/food/snacks/burger/xeno name = "xenoburger" desc = "Smells caustic and tastes like heresy." icon_state = "xburger" @@ -82,7 +91,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "acid" = 4) -/obj/item/reagent_containers/food/snacks/clownburger +/obj/item/reagent_containers/food/snacks/burger/clown name = "clown burger" desc = "This tastes funny..." icon_state = "clownburger" @@ -91,7 +100,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "banana" = 1, "magic" = 2) -/obj/item/reagent_containers/food/snacks/mimeburger +/obj/item/reagent_containers/food/snacks/burger/mime name = "mime burger" desc = "Its taste defies language." icon_state = "mimeburger" @@ -100,16 +109,16 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "silence" = 2) -/obj/item/reagent_containers/food/snacks/baseballburger +/obj/item/reagent_containers/food/snacks/burger/baseball name = "home run baseball burger" desc = "It's still warm. Batter up!" icon_state = "baseball" filling_color = "#CD853F" bitesize = 3 list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("bun" = 4) + tastes = list("bun" = 4, "a homerun" = 3) -/obj/item/reagent_containers/food/snacks/spellburger +/obj/item/reagent_containers/food/snacks/burger/spell name = "spell burger" desc = "This is absolutely Ei Nath." icon_state = "spellburger" @@ -118,7 +127,7 @@ list_reagents = list("nutriment" = 6, "vitamin" = 1) tastes = list("bun" = 4, "magic" = 2) -/obj/item/reagent_containers/food/snacks/bigbiteburger +/obj/item/reagent_containers/food/snacks/burger/bigbite name = "BigBite burger" desc = "Forget the Big Mac, THIS is the future!" icon_state = "bigbiteburger" @@ -127,7 +136,7 @@ list_reagents = list("nutriment" = 10, "vitamin" = 2) tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10) -/obj/item/reagent_containers/food/snacks/superbiteburger +/obj/item/reagent_containers/food/snacks/burger/superbite name = "SuperBite burger" desc = "This is a mountain of a burger. FOOD!" icon_state = "superbiteburger" @@ -136,7 +145,161 @@ list_reagents = list("nutriment" = 40, "vitamin" = 5) tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10) -/obj/item/reagent_containers/food/snacks/jellyburger +/obj/item/reagent_containers/food/snacks/burger/crazy + name = "crazy hamburger" + desc = "This looks like the sort of food that a demented clown in a trenchcoat would make." + icon_state = "crazyburger" + filling_color = "#E3D681" + bitesize = 3 + list_reagents = list("nutriment" = 10, "vitamin" = 2, "capsaicin" = 3, "condensedcapsaicin" = 2) + tastes = list("bun" = 2, "meat" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/white + name = "white pretty patty" + desc = "Delicious titanium!" + icon_state = "ppatty-mime" + filling_color = "#FFFFFF" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "white" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/red + name = "red pretty patty" + desc = "Perfect for hiding the fact that it's burnt to a crisp." + icon_state = "ppatty-red" + filling_color = "#D63C3C" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "red" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/orange + name = "orange pretty patty" + desc = "Contains 0% juice." + icon_state = "ppatty-orange" + filling_color = "#FFA500" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "orange" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/yellow + name = "yellow pretty patty" + desc = "Bright to the last bite." + icon_state = "ppatty-yellow" + filling_color = "#FFFF00" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "yellow" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/green + name = "green pretty patty" + desc = "It's not tainted meat, it's painted meat!" + icon_state = "ppatty-green" + filling_color = "#00FF00" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "green" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/blue + name = "blue pretty patty" + desc = "Is this blue rare?" + icon_state = "ppatty-blue" + filling_color = "#0000FF" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "blue" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/purple + name = "purple pretty patty" + desc = "Regal and low class at the same time." + icon_state = "ppatty-purple" + filling_color = "#800080" + bitesize = 2 + list_reagents = list("nutriment" = 7, "protein" = 1) + tastes = list("bun" = 2, "meat" = 2, "purple" = 2) + +/obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow + name = "rainbow pretty patty" + desc = "Taste the rainbow, eat the rainbow." + icon_state = "ppatty-rainbow" + filling_color = "#0000FF" + bitesize = 4 + list_reagents = list("nutriment" = 14, "protein" = 5, "omnizine" = 10) + tastes = list("bun" = 2, "meat" = 2, "rainbow" = 5) + +/obj/item/reagent_containers/food/snacks/burger/elec + name = "empowered burger" + desc = "It's shockingly good, if you live off of electricity that is." + icon_state = "empoweredburger" + filling_color = "#FFFF00" + bitesize = 2 + list_reagents = list("nutriment" = 5, "protein" = 1, "plasma" = 2) + tastes = list("bun" = 2, "pure electricity" = 5) + +/obj/item/reagent_containers/food/snacks/burger/rat + name = "mouse burger" + desc = "Pretty much what you'd expect..." + icon_state = "ratburger" + filling_color = "#808080" + bitesize = 2 + list_reagents = list("nutriment" = 5, "protein" = 1) + tastes = list("bun" = 2, "dead rat" = 5) + +/obj/item/reagent_containers/food/snacks/burger/appendix + name = "appendix burger" + desc = "Tastes like appendicitis." + icon_state = "appendixburger" + filling_color = "#F2B6EA" + bitesize = 3 + list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6) + tastes = list("bun" = 1, "grass" = 1) + +/obj/item/reagent_containers/food/snacks/burger/bacon + name = "bacon burger" + desc = "The perfect combination of all things American." + icon_state = "baconburger" + filling_color = "#F2B6EA" + bitesize = 3 + list_reagents = list("nutriment" = 3, "vitamin" = 2, "protein" = 6) + tastes = list("bun" = 1, "bacon" = 1) + + +/obj/item/reagent_containers/food/snacks/burger/bearger + name = "bearger" + desc = "Best served rawr." + icon_state = "bearger" + filling_color = "#F2B6EA" + bitesize = 3 + list_reagents = list("nutriment" = 3, "protein" = 6, "vitamin" = 2) + tastes = list("bun" = 1, "meat" = 1, "salmon" = 1) + +/obj/item/reagent_containers/food/snacks/burger/fivealarm + name = "five alarm burger" + desc = "HOT! HOT!" + icon_state = "fivealarmburger" + bitesize = 3 + filling_color = "#F2B6EA" + list_reagents = list("nutriment" = 4, "protein" = 6, "condensedcapsaicin" = 5, "capsaicin" = 5) + tastes = list("bun" = 1, "extreme heat" = 1) + +/obj/item/reagent_containers/food/snacks/burger/mcguffin + name = "mcGuffin" + desc = "A cheap and greasy imitation of an eggs benedict." + icon_state = "mcguffin" + bitesize = 3 + filling_color = "#F2B6EA" + list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 1) + tastes = list("muffin" = 1, "bacon" = 1) + +/obj/item/reagent_containers/food/snacks/burger/mcrib + name = "mcRib" + desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." + icon_state = "mcrib" + bitesize = 3 + filling_color = "#F2B6EA" + list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 4, "bbqsauce" = 1) + tastes = list("bun" = 1, "pork" = 1, "patty" = 1) + +/obj/item/reagent_containers/food/snacks/burger/jelly name = "jelly burger" desc = "Culinary delight...?" icon_state = "jellyburger" @@ -144,10 +307,10 @@ bitesize = 3 tastes = list("bun" = 4, "jelly" = 2) -/obj/item/reagent_containers/food/snacks/jellyburger/slime +/obj/item/reagent_containers/food/snacks/burger/jelly/slime list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1) -/obj/item/reagent_containers/food/snacks/jellyburger/cherry +/obj/item/reagent_containers/food/snacks/burger/jelly/cherry list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1) @@ -158,6 +321,7 @@ /obj/item/reagent_containers/food/snacks/sandwich name = "sandwich" desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "sandwich" filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "vitamin" = 1) @@ -166,6 +330,7 @@ /obj/item/reagent_containers/food/snacks/toastedsandwich name = "toasted sandwich" desc = "Now if you only had a pepper bar." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "toastedsandwich" filling_color = "#D9BE29" list_reagents = list("nutriment" = 6, "carbon" = 2) @@ -174,6 +339,7 @@ /obj/item/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" desc = "Goes great with tomato soup!" + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "grilledcheese" filling_color = "#D9BE29" list_reagents = list("nutriment" = 7, "vitamin" = 1) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value? @@ -182,6 +348,7 @@ /obj/item/reagent_containers/food/snacks/jellysandwich name = "jelly sandwich" desc = "You wish you had some peanut butter to go with this..." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "jellysandwich" filling_color = "#9E3A78" bitesize = 3 @@ -196,6 +363,7 @@ /obj/item/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "notasandwich" list_reagents = list("nutriment" = 6, "vitamin" = 6) tastes = list("nothing suspicious" = 1) @@ -203,60 +371,52 @@ /obj/item/reagent_containers/food/snacks/wrap name = "egg wrap" desc = "The precursor to Pigs in a Blanket." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "wrap" list_reagents = list("nutriment" = 5) tastes = list("egg" = 1) -/obj/item/reagent_containers/food/snacks/appendixburger - name = "appendix burger" - desc = "Tastes like appendicitis." - icon_state = "appendixburger" - list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6) - bitesize = 3 - tastes = list("bun" = 1, "grass" = 1) - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/blt + name = "\improper BLT" + desc = "A classic bacon, lettuce, and tomato sandwich." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "blt" + filling_color = "#D63C3C" + bitesize = 4 + list_reagents = list("nutriment" = 5, "protein" = 2) + tastes = list("bacon" = 3, "lettuce" = 2, "tomato" = 2, "bread" = 2) -/obj/item/reagent_containers/food/snacks/baconburger - name = "bacon burger" - desc = "The perfect combination of all things American." - icon_state = "baconburger" - tastes = list("bun" = 1, "bacon" = 1) - list_reagents = list("nutriment" = 3, "vitamin" = 2, "protein" = 6) - filling_color = "#F2B6EA" - bitesize = 3 +/obj/item/reagent_containers/food/snacks/peanut_butter_jelly + name = "peanut butter and jelly sandwich" + desc = "A classic PB&J sandwich, just like your mom used to make." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanut_butter_jelly_sandwich" + filling_color = "#9E3A78" + bitesize = 2 + tastes = list("peanut butter" = 3, "jelly" = 3, "bread" = 2) -/obj/item/reagent_containers/food/snacks/bearger - name = "bearger" - desc = "Best served rawr." - icon_state = "bearger" - tastes = list("bun" = 1, "meat" = 1, "salmon" = 1) - list_reagents = list("nutriment" = 3, "protein" = 6, "vitamin" = 2) - filling_color = "#F2B6EA" - bitesize = 3 +/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime + list_reagents = list("peanutbutter" = 2, "slimejelly" = 5, "nutriment" = 5, "protein" = 2) -/obj/item/reagent_containers/food/snacks/fivealarmburger - name = "five alarm burger" - desc = "HOT! HOT!" - icon_state = "fivealarmburger" - list_reagents = list("nutriment" = 4, "protein" = 6, "condensedcapsaicin" = 5, "capsaicin" = 5) - tastes = list("bun" = 1, "extreme heat" = 1) - bitesize = 3 - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry + list_reagents = list("peanutbutter" = 2, "cherryjelly" = 5, "nutriment" = 5, "protein" = 2) -/obj/item/reagent_containers/food/snacks/mcguffin - name = "mcGuffin" - desc = "A cheap and greasy imitation of an eggs benedict." - icon_state = "mcguffin" - list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 1) - tastes = list("muffin" = 1, "bacon" = 1) - bitesize = 3 - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/philly_cheesesteak + name = "Philly cheesesteak" + desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "philly_cheesesteak" + filling_color = "#D9BE29" + bitesize = 4 + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("steak" = 3, "melted cheese" = 3, "onions" = 2, "bread" = 2) -/obj/item/reagent_containers/food/snacks/mcrib - name = "mcRib" - desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it." - icon_state = "mcrib" - list_reagents = list("nutriment" = 2, "protein" = 7, "vitamin" = 4, "bbqsauce" = 1) - tastes = list("bun" = 1, "pork" = 1, "patty" = 1) - bitesize = 3 - filling_color = "#F2B6EA" +/obj/item/reagent_containers/food/snacks/peanut_butter_banana + name = "peanut butter and banana sandwich" + desc = "A peanut butter sandwich with banana slices mixed in, a good high protein treat." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "peanut_butter_banana_sandwich" + filling_color = "#D9BE29" + bitesize = 2 + list_reagents = list("nutriment" = 5, "protein" = 2) + tastes = list("peanutbutter" = 3, "banana" = 3, "bread" = 2) diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm index 26bc0c75aeb..efe2cc630fe 100644 --- a/code/modules/food_and_drinks/food/foods/soups.dm +++ b/code/modules/food_and_drinks/food/foods/soups.dm @@ -7,6 +7,7 @@ /obj/item/reagent_containers/food/snacks/soup name = "impossible soup" desc = "This soup is so good, it shouldn't even exist!" + icon = 'icons/obj/food/soupsalad.dmi' icon_state = "beans" // If you don't have a sprite, you get beans. consume_sound = 'sound/items/drink.ogg' trash = /obj/item/trash/snack_bowl @@ -123,6 +124,77 @@ . = ..() name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht") +/obj/item/reagent_containers/food/snacks/soup/eyesoup + name = "eyeball soup" + desc = "It looks back at you..." + icon_state = "eyeballsoup" + filling_color = "#E386BF" + list_reagents = list("nutriment" = 7, "protein" = 2) + tastes = list("squirming" = 2, "tomato" = 2) + +/obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup + name = "sweet potato soup" + desc = "Delicious sweet potato in soup form." + icon_state = "sweetpotatosoup" + list_reagents = list("nutriment" = 5) + tastes = list("sweet potato" = 1) + +/obj/item/reagent_containers/food/snacks/soup/redbeetsoup + name = "red beet soup" + desc = "Quite a delicacy." + icon_state = "redbeetsoup" + list_reagents = list("nutriment" = 5) + tastes = list("red beet" = 1) + +/obj/item/reagent_containers/food/snacks/soup/frenchonionsoup + name = "french onion soup" + desc = "Good enough to make a grown mime cry." + icon_state = "onionsoup" + list_reagents = list("nutriment" = 8) + tastes = list("caramelized onions" = 3, "cheese" = 1) + +/obj/item/reagent_containers/food/snacks/soup/zurek + name = "zurek" + desc = "A traditional Polish soup composed of vegetables, meat, and an egg. Goes great with bread." + icon_state = "zurek" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("creamy vegetables" = 3, "sausage" = 2) + +/obj/item/reagent_containers/food/snacks/soup/cullenskink + name = "cullen skink" + desc = "A thick Scottish soup made of smoked fish, potatoes and onions." + icon_state = "cullen_skink" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("creamy broth" = 2, "fish" = 2, "vegetables" = 2) + +/obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup + name = "chicken noodle soup" + desc = "A hearty bowl of chicken noodle soup, perfect for when you're stuck at home and sick." + icon_state = "chicken_noodle_soup" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("broth" = 1, "chicken" = 1, "carrots" = 1, "noodles" = 1) + +/obj/item/reagent_containers/food/snacks/soup/cornchowder + name = "corn chowder" + desc = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough." + icon_state = "corn_chowder" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("creamy broth" = 1, "bacon" = 1, "mixed vegetables" = 1) + +/obj/item/reagent_containers/food/snacks/soup/meatball_noodles + name = "meatball noodle soup" + desc = "A hearty noodle soup made from meatballs and pasta in a rich broth. Commonly topped with a handful of chopped nuts." + icon_state = "meatball_noodles" + list_reagents = list("nutriment" = 10, "protein" = 4) + tastes = list("bone broth" = 1, "meat" = 1, "gnocchi" = 1, "peanuts" = 1) + +/obj/item/reagent_containers/food/snacks/soup/seedsoup + name = "Misklmæsch" //miskl = seed, mæsch = soup + desc = "A seed based soup, made by germinating seeds and then boiling them. \ + Produces a particularly bitter broth which is usually balanced by the addition of vinegar." + icon_state = "moth_seed_soup" + list_reagents = list("nutriment" = 6) + tastes = list("bitterness" = 1, "sourness" = 1, "nature" = 1) ////////////////////// // Stews // @@ -140,11 +212,39 @@ /obj/item/reagent_containers/food/snacks/stewedsoymeat name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" + icon = 'icons/obj/food/soupsalad.dmi' icon_state = "stewedsoymeat" trash = /obj/item/trash/plate list_reagents = list("nutriment" = 8) tastes = list("soy" = 1, "vegetables" = 1) +/obj/item/reagent_containers/food/snacks/soup/beanstew + name = "Prickeldröndolhaskl" //prickeld = spicy, röndol = bean, haskl = stew + desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread." + icon_state = "moth_bean_stew" + list_reagents = list("nutriment" = 10) + tastes = list("beans" = 1, "cabbage" = 1, "spicy sauce" = 1) + +/obj/item/reagent_containers/food/snacks/soup/oatstew + name = "Häfmisklhaskl" //häfmiskl = oat (häf from German hafer meaning oat, miskl meaning seed), haskl = stew + desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread." + icon_state = "moth_oat_stew" + list_reagents = list("nutriment" = 10) + tastes = list("oats" = 1, "sweet potato" = 1, "carrot" = 1, "pumpkin" = 1, "parsnip" = 1) + +/obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht + name = "hong kong borscht" + desc = "Also known as luo song tang or Russian soup, this dish bears little to no resemblance to Eastern European borscht- indeed, it's a tomato-based soup with no beets in sight." + icon_state = "hong_kong_borscht" + list_reagents = list("nutriment" = 10, "protein" = 2) + tastes = list("tomato" = 1, "cabbage" = 1, "meat" = 1) + +/obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni + name = "hong kong macaroni" + desc = "A favourite from Hong Kong's Cha Chaan Tengs, this macaroni soup came to Mars with Cantonese settlers under Cybersun Industries, and has become as much of a breakfast staple there as it is in its homeland." + icon_state = "hong_kong_macaroni" + list_reagents = list("nutriment" = 8, "protein" = 2) + tastes = list("cream" = 1, "chicken" = 1, "pasta" = 1, "ham" =1) ////////////////////// // Chili // @@ -165,3 +265,11 @@ filling_color = "#2B00FF" list_reagents = list("nutriment" = 5, "frostoil" = 1, "tomatojuice" = 2, "vitamin" = 2) tastes = list("tomato" = 1, "mint" = 1) + +/obj/item/reagent_containers/food/snacks/soup/clownchili + name = "chili con carnival" + desc = "A delicious stew of meat, chiles, and salty, salty clown tears." + icon_state = "clownchili" + filling_color = "#FF3C00" + list_reagents = list("nutriment" = 5, "tomatojuice" = 2, "protein" = 2) + tastes = list("tomato" = 1, "chili" = 1, "meat" = 1, "sad clowns" = 4) diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index ba2481e973d..70fa653cc1c 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -61,34 +61,34 @@ /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/microwave/humanburger ) - result = /obj/item/reagent_containers/food/snacks/monkeyburger + result = /obj/item/reagent_containers/food/snacks/burger/plain /datum/recipe/microwave/syntiburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/meat/syntiflesh ) - result = /obj/item/reagent_containers/food/snacks/monkeyburger + result = /obj/item/reagent_containers/food/snacks/burger/plain /datum/recipe/microwave/brainburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/organ/internal/brain ) - result = /obj/item/reagent_containers/food/snacks/brainburger + result = /obj/item/reagent_containers/food/snacks/burger/brain /datum/recipe/microwave/hamborger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/robot_parts/head ) - result = /obj/item/reagent_containers/food/snacks/hamborger + result = /obj/item/reagent_containers/food/snacks/burger/hamborger /datum/recipe/microwave/xenoburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/monstermeat/xenomeat ) - result = /obj/item/reagent_containers/food/snacks/xenoburger + result = /obj/item/reagent_containers/food/snacks/burger/xeno /datum/recipe/microwave/fishburger items = list( @@ -102,35 +102,35 @@ /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/tofu ) - result = /obj/item/reagent_containers/food/snacks/tofuburger + result = /obj/item/reagent_containers/food/snacks/burger/tofu /datum/recipe/microwave/ghostburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/ectoplasm //where do you even find this stuff ) - result = /obj/item/reagent_containers/food/snacks/ghostburger + result = /obj/item/reagent_containers/food/snacks/burger/ghost /datum/recipe/microwave/clownburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/mask/gas/clown_hat, ) - result = /obj/item/reagent_containers/food/snacks/clownburger + result = /obj/item/reagent_containers/food/snacks/burger/clown /datum/recipe/microwave/mimeburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/beret ) - result = /obj/item/reagent_containers/food/snacks/mimeburger + result = /obj/item/reagent_containers/food/snacks/burger/mime /datum/recipe/microwave/baseballburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/melee/baseball_bat ) - result = /obj/item/reagent_containers/food/snacks/baseballburger + result = /obj/item/reagent_containers/food/snacks/burger/baseball /datum/recipe/microwave/cheeseburger items = list( @@ -138,28 +138,28 @@ /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/cheesewedge, ) - result = /obj/item/reagent_containers/food/snacks/cheeseburger + result = /obj/item/reagent_containers/food/snacks/burger/cheese /datum/recipe/microwave/appendixburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/organ/internal/appendix ) - result = /obj/item/reagent_containers/food/snacks/appendixburger + result = /obj/item/reagent_containers/food/snacks/burger/appendix /datum/recipe/microwave/appendixburger_bitten items = list( /obj/item/reagent_containers/food/snacks/appendix, /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/appendixburger + result = /obj/item/reagent_containers/food/snacks/burger/appendix /datum/recipe/microwave/bearger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/monstermeat/bearmeat ) - result = /obj/item/reagent_containers/food/snacks/bearger + result = /obj/item/reagent_containers/food/snacks/burger/bearger /datum/recipe/microwave/fivealarmburger items = list( @@ -167,7 +167,7 @@ /obj/item/reagent_containers/food/snacks/grown/ghost_chili, /obj/item/reagent_containers/food/snacks/grown/ghost_chili ) - result = /obj/item/reagent_containers/food/snacks/fivealarmburger + result = /obj/item/reagent_containers/food/snacks/burger/fivealarm /datum/recipe/microwave/baconburger items = list( @@ -176,7 +176,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/cheesewedge ) - result = /obj/item/reagent_containers/food/snacks/baconburger + result = /obj/item/reagent_containers/food/snacks/burger/bacon /datum/recipe/microwave/mcrib items = list( @@ -184,7 +184,7 @@ /obj/item/reagent_containers/food/snacks/bbqribs, /obj/item/reagent_containers/food/snacks/onion_slice ) - result = /obj/item/reagent_containers/food/snacks/mcrib + result = /obj/item/reagent_containers/food/snacks/burger/mcrib /datum/recipe/microwave/mcguffin items = list( @@ -193,7 +193,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/friedegg ) - result = /obj/item/reagent_containers/food/snacks/mcguffin + result = /obj/item/reagent_containers/food/snacks/burger/mcguffin /datum/recipe/microwave/hotdog items = list( @@ -320,27 +320,31 @@ /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/wizard/fake, ) - result = /obj/item/reagent_containers/food/snacks/spellburger + result = /obj/item/reagent_containers/food/snacks/burger/spell /datum/recipe/microwave/spellburger items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/wizard, ) - result = /obj/item/reagent_containers/food/snacks/spellburger + result = /obj/item/reagent_containers/food/snacks/burger/spell /datum/recipe/microwave/bigbiteburger items = list( - /obj/item/reagent_containers/food/snacks/monkeyburger, + /obj/item/reagent_containers/food/snacks/burger/plain, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/egg, ) - result = /obj/item/reagent_containers/food/snacks/bigbiteburger + result = /obj/item/reagent_containers/food/snacks/burger/bigbite /datum/recipe/microwave/enchiladas - items = list(/obj/item/reagent_containers/food/snacks/cutlet, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/corn) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/corn) result = /obj/item/reagent_containers/food/snacks/enchiladas /datum/recipe/microwave/burrito @@ -355,7 +359,9 @@ /datum/recipe/microwave/monkeysdelight reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) - items = list(/obj/item/reagent_containers/food/snacks/monkeycube, /obj/item/reagent_containers/food/snacks/grown/banana) + items = list( + /obj/item/reagent_containers/food/snacks/monkeycube, + /obj/item/reagent_containers/food/snacks/grown/banana) result = /obj/item/reagent_containers/food/snacks/monkeysdelight /datum/recipe/microwave/fishandchips @@ -376,14 +382,20 @@ /datum/recipe/microwave/tomatosoup reagents = list("water" = 10) - items = list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/tomato) + items = list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/tomato) result = /obj/item/reagent_containers/food/snacks/soup/tomatosoup /datum/recipe/microwave/stew reagents = list("water" = 10) - items= list(/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/item/reagent_containers/food/snacks/grown/potato, - /obj/item/reagent_containers/food/snacks/grown/carrot, /obj/item/reagent_containers/food/snacks/grown/eggplant, - /obj/item/reagent_containers/food/snacks/grown/mushroom, /obj/item/reagent_containers/food/snacks/meat) + items= list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/grown/eggplant, + /obj/item/reagent_containers/food/snacks/grown/mushroom, + /obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/soup/stew /datum/recipe/microwave/slimetoast @@ -471,14 +483,157 @@ /datum/recipe/microwave/superbiteburger reagents = list("sodiumchloride" = 5, "blackpepper" = 5) items = list( - /obj/item/reagent_containers/food/snacks/bigbiteburger, + /obj/item/reagent_containers/food/snacks/burger/bigbite, /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/boiledegg, - /obj/item/reagent_containers/food/snacks/grown/tomato + /obj/item/reagent_containers/food/snacks/tomatoslice ) - result = /obj/item/reagent_containers/food/snacks/superbiteburger + result = /obj/item/reagent_containers/food/snacks/burger/superbite + +/datum/recipe/microwave/crazyburger + reagents = list("cornoil" = 15) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/toy/crayon/green, + /obj/item/flashlight/flare + ) + result = /obj/item/reagent_containers/food/snacks/burger/crazy + +/datum/recipe/microwave/blt + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/tomatoslice, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/blt + +/datum/recipe/microwave/peanut_butter_jelly/cherry + reagents = list("cherryjelly" = 5, "peanutbutter" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/cherry + +/datum/recipe/microwave/peanut_butter_jelly/slime + reagents = list("slimejelly" = 5, "peanutbutter" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/peanut_butter_jelly/slime + +/datum/recipe/microwave/peanut_butter_banana + reagents = list("peanutbutter" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/grown/banana + ) + result = /obj/item/reagent_containers/food/snacks/peanut_butter_banana + +/datum/recipe/microwave/philly_cheesesteak + items = list( + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/grown/cabbage + ) + result = /obj/item/reagent_containers/food/snacks/philly_cheesesteak + +/datum/recipe/microwave/ppattyred + reagents = list("cherryjelly" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/red + +/datum/recipe/microwave/ppattyorange + reagents = list("orangejuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/orange + +/datum/recipe/microwave/ppattyyellow + reagents = list("lemonjuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow + +/datum/recipe/microwave/ppattygreen + reagents = list("limejuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/green + +/datum/recipe/microwave/ppattyblue + reagents = list("berryjuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/blue + +/datum/recipe/microwave/ppattypurple + reagents = list("grapejuice" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/purple + +/datum/recipe/microwave/ppattywhite + reagents = list("sugar" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/white + +/datum/recipe/microwave/ppattyrainbow + items = list( + /obj/item/reagent_containers/food/snacks/burger/ppatty/red, + /obj/item/reagent_containers/food/snacks/burger/ppatty/orange, + /obj/item/reagent_containers/food/snacks/burger/ppatty/yellow, + /obj/item/reagent_containers/food/snacks/burger/ppatty/green, + /obj/item/reagent_containers/food/snacks/burger/ppatty/blue, + /obj/item/reagent_containers/food/snacks/burger/ppatty/purple, + /obj/item/reagent_containers/food/snacks/burger/ppatty/white + ) + result = /obj/item/reagent_containers/food/snacks/burger/ppatty/rainbow + +/datum/recipe/microwave/elecburger + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/stack/sheet/mineral/plasma, + /obj/item/stack/sheet/mineral/plasma + ) + result = /obj/item/reagent_containers/food/snacks/burger/elec + +/datum/recipe/microwave/ratburger + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/holder/mouse + ) + result = /obj/item/reagent_containers/food/snacks/burger/rat /datum/recipe/microwave/candiedapple reagents = list("water" = 5, "sugar" = 5) @@ -490,14 +645,14 @@ items = list( /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/jellyburger/slime + result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime /datum/recipe/microwave/jellyburger reagents = list("cherryjelly" = 5) items = list( /obj/item/reagent_containers/food/snacks/bun ) - result = /obj/item/reagent_containers/food/snacks/jellyburger/cherry + result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry /datum/recipe/microwave/twobread reagents = list("wine" = 5) @@ -540,6 +695,153 @@ ) result = /obj/item/reagent_containers/food/snacks/soup/clownstears +/datum/recipe/microwave/clownchili + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/clothing/shoes/clown_shoes + ) + result = /obj/item/reagent_containers/food/snacks/soup/clownchili + +/datum/recipe/microwave/eyesoup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/organ/internal/eyes + ) + result = /obj/item/reagent_containers/food/snacks/soup/eyesoup + +/datum/recipe/microwave/sweetpotatosoup + reagents = list("water" = 10, "milk" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/potato/sweet, + /obj/item/reagent_containers/food/snacks/grown/potato/sweet + ) + result = /obj/item/reagent_containers/food/snacks/soup/sweetpotatosoup + +/datum/recipe/microwave/redbeetsoup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/redbeet, + /obj/item/reagent_containers/food/snacks/grown/redbeet, + /obj/item/reagent_containers/food/snacks/grown/cabbage + ) + result = /obj/item/reagent_containers/food/snacks/soup/redbeetsoup + +/datum/recipe/microwave/frenchonionsoup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/soup/frenchonionsoup + +/datum/recipe/microwave/zurek + reagents = list("water" = 10, "flour" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/boiledegg, + /obj/item/reagent_containers/food/snacks/sausage, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/grown/onion + ) + result = /obj/item/reagent_containers/food/snacks/soup/zurek + +/datum/recipe/microwave/cullenskink + reagents = list("water" = 10, "milk" = 10, "blackpepper" = 4) + items = list( + /obj/item/reagent_containers/food/snacks/salmonmeat, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/potato + ) + result = /obj/item/reagent_containers/food/snacks/soup/cullenskink + +/datum/recipe/microwave/chicken_noodle_soup + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/boiledspaghetti + ) + result = /obj/item/reagent_containers/food/snacks/soup/chicken_noodle_soup + +/datum/recipe/microwave/cornchowder + reagents = list("water" = 10, "cream" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/corn, + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/soup/cornchowder + +/datum/recipe/microwave/meatball_noodles + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/peanuts, + /obj/item/reagent_containers/food/snacks/meatball, + /obj/item/reagent_containers/food/snacks/meatball, + /obj/item/reagent_containers/food/snacks/spaghetti + ) + result = /obj/item/reagent_containers/food/snacks/soup/meatball_noodles + +/datum/recipe/microwave/seedsoup + reagents = list("water" = 10, "vinegar" = 10) + items = list( + /obj/item/seeds/sunflower, + /obj/item/seeds/poppy/lily, + /obj/item/seeds/ambrosia + ) + result = /obj/item/reagent_containers/food/snacks/soup/seedsoup + +/datum/recipe/microwave/beanstew + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/beans, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/chili, + /obj/item/reagent_containers/food/snacks/grown/corn + ) + result = /obj/item/reagent_containers/food/snacks/soup/beanstew + +/datum/recipe/microwave/oatstew + reagents = list("water" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/grown/oat, + /obj/item/reagent_containers/food/snacks/grown/potato/sweet, + /obj/item/reagent_containers/food/snacks/grown/parsnip, + /obj/item/reagent_containers/food/snacks/grown/carrot + ) + result = /obj/item/reagent_containers/food/snacks/soup/oatstew + +/datum/recipe/microwave/hong_kong_borscht + reagents = list("water" = 10, "soysauce" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/onion, + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/cutlet + ) + result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_borscht + +/datum/recipe/microwave/hong_kong_macaroni + reagents = list("water" = 10, "cream" = 10) + items = list( + /obj/item/reagent_containers/food/snacks/boiledspaghetti, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/soup/hong_kong_macaroni + /datum/recipe/microwave/boiledslimeextract reagents = list("water" = 5) items = list( @@ -587,29 +889,127 @@ items = list(/obj/item/reagent_containers/food/snacks/grown/whitebeet, /obj/item/reagent_containers/food/snacks/grown/cabbage) result = /obj/item/reagent_containers/food/snacks/soup/beetsoup +/datum/recipe/microwave/salad + items = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/cabbage + ) + result = /obj/item/reagent_containers/food/snacks/salad +/datum/recipe/microwave/antipasto_salad + items = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/grown/olive, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/salad/antipasto + +/datum/recipe/microwave/caesar_salad + reagents = list("oliveoil" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/salad/caesar + +/datum/recipe/microwave/citrusdelight + items = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/lime, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon + ) + result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight + +/datum/recipe/microwave/fruitsalad + items = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/grapes, + /obj/item/reagent_containers/food/snacks/watermelonslice + ) + result = /obj/item/reagent_containers/food/snacks/salad/fruit + +/datum/recipe/microwave/greek_salad + reagents = list("oliveoil" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/olive, + /obj/item/reagent_containers/food/snacks/grown/tomato, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/salad/greek + +/datum/recipe/microwave/junglesalad + items = list( + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/grapes, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/watermelonslice, + /obj/item/reagent_containers/food/snacks/watermelonslice + ) + result = /obj/item/reagent_containers/food/snacks/salad/jungle + +/datum/recipe/microwave/kale_salad + reagents = list("oliveoil" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/carrot, + /obj/item/reagent_containers/food/snacks/grown/cabbage, + /obj/item/reagent_containers/food/snacks/onion_slice/red, + /obj/item/reagent_containers/food/snacks/onion_slice/red + ) + result = /obj/item/reagent_containers/food/snacks/salad/kale + +/datum/recipe/microwave/potato_salad + reagents = list("mayonnaise" = 5) + items = list( + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/grown/potato, + /obj/item/reagent_containers/food/snacks/boiledegg + ) + result = /obj/item/reagent_containers/food/snacks/salad/potato + +/datum/recipe/microwave/melonfruitbowl + items = list( + /obj/item/reagent_containers/food/snacks/grown/watermelon, + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/ambrosia, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon + ) + result = /obj/item/reagent_containers/food/snacks/salad/melonfruitbowl + + /datum/recipe/microwave/herbsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/apple) - result = /obj/item/reagent_containers/food/snacks/herbsalad + result = /obj/item/reagent_containers/food/snacks/salad/herb /datum/recipe/microwave/herbsalad/make_food(obj/container) - var/obj/item/reagent_containers/food/snacks/herbsalad/being_cooked = ..() + var/obj/item/reagent_containers/food/snacks/salad/herb/being_cooked = ..() being_cooked.reagents.del_reagent("toxin") return being_cooked /datum/recipe/microwave/aesirsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /obj/item/reagent_containers/food/snacks/grown/apple/gold) - result = /obj/item/reagent_containers/food/snacks/aesirsalad + result = /obj/item/reagent_containers/food/snacks/salad/aesir /datum/recipe/microwave/validsalad items = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /obj/item/reagent_containers/food/snacks/grown/potato, /obj/item/reagent_containers/food/snacks/meatball) - result = /obj/item/reagent_containers/food/snacks/validsalad + result = /obj/item/reagent_containers/food/snacks/salad/valid /datum/recipe/microwave/validsalad/make_food(obj/container) - var/obj/item/reagent_containers/food/snacks/validsalad/being_cooked = ..() + var/obj/item/reagent_containers/food/snacks/salad/valid/being_cooked = ..() being_cooked.reagents.del_reagent("toxin") return being_cooked diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm index 110cd9314a8..c13c81bb5ab 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm @@ -45,7 +45,7 @@ /datum/reagent/slimejelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1, ) - result = list(/obj/item/reagent_containers/food/snacks/jellyburger/slime) + result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/slime) category = CAT_FOOD subcategory = CAT_SANDWICH @@ -55,7 +55,7 @@ /datum/reagent/consumable/cherryjelly = 5, /obj/item/reagent_containers/food/snacks/bun = 1, ) - result = list(/obj/item/reagent_containers/food/snacks/jellyburger/cherry) + result = list(/obj/item/reagent_containers/food/snacks/burger/jelly/cherry) category = CAT_FOOD subcategory = CAT_SANDWICH @@ -65,7 +65,7 @@ /obj/item/melee/baseball_bat = 1, /obj/item/reagent_containers/food/snacks/bun = 1, ) - result = list(/obj/item/reagent_containers/food/snacks/baseballburger) + result = list(/obj/item/reagent_containers/food/snacks/burger/baseball) category = CAT_FOOD subcategory = CAT_SANDWICH diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 19321fad7a7..706272a2a16 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -342,8 +342,8 @@ EQUIPMENT("Medical Marijuana", /obj/item/storage/fancy/cigarettes/cigpack_med, 250), EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), EQUIPMENT("Box of matches", /obj/item/storage/box/matches, 50), - EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/cheeseburger, 150), - EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/bigbiteburger, 250), + EQUIPMENT("Cheeseburger", /obj/item/reagent_containers/food/snacks/burger/cheese, 150), + EQUIPMENT("Big Burger", /obj/item/reagent_containers/food/snacks/burger/bigbite, 250), EQUIPMENT("Recycled Prisoner", /obj/item/reagent_containers/food/snacks/soylentgreen, 500), EQUIPMENT("Crayons", /obj/item/storage/fancy/crayons, 350), EQUIPMENT("Plushie", /obj/random/plushie, 750), diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index d79223c6189..0e97863a532 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -303,7 +303,7 @@ incompatible_modules = list(/obj/item/mod/module/dispenser) cooldown_time = 5 SECONDS /// Path we dispense. - var/dispense_type = /obj/item/reagent_containers/food/snacks/cheeseburger + var/dispense_type = /obj/item/reagent_containers/food/snacks/burger/cheese /// Time it takes for us to dispense. var/dispense_time = 0 SECONDS diff --git a/icons/obj/food/bakedgoods.dmi b/icons/obj/food/bakedgoods.dmi new file mode 100644 index 00000000000..0bca50c02da Binary files /dev/null and b/icons/obj/food/bakedgoods.dmi differ diff --git a/icons/obj/food/breakfast.dmi b/icons/obj/food/breakfast.dmi new file mode 100644 index 00000000000..6a2ade58b16 Binary files /dev/null and b/icons/obj/food/breakfast.dmi differ diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi new file mode 100644 index 00000000000..31bc1959e4e Binary files /dev/null and b/icons/obj/food/burgerbread.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index e0ac931b235..10287972d09 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi new file mode 100644 index 00000000000..9370c46c8eb Binary files /dev/null and b/icons/obj/food/meat.dmi differ diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi new file mode 100644 index 00000000000..d9bbda673fc Binary files /dev/null and b/icons/obj/food/soupsalad.dmi differ