diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index c30e4a0105..7820b46a8d 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -1739,20 +1739,6 @@ . = ..() bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/mashedpotato - name = "Mashed Potato" - desc = "Pillowy mounds of mashed potato." - icon_state = "mashedpotato" - trash = /obj/item/trash/plate - filling_color = "#EDDD00" - center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 4 - nutriment_desc = list("fluffy mashed potatoes" = 4) - -/obj/item/weapon/reagent_containers/food/snacks/mashedpotato/Initialize() - . = ..() - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/bangersandmash name = "Bangers and Mash" desc = "An English treat." @@ -2339,34 +2325,6 @@ reagents.add_reagent("tomatojuice", 10) bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/onionsoup - name = "Onion Soup" - desc = "A soup with layers." - icon_state = "onionsoup" - trash = /obj/item/trash/snack_bowl - filling_color = "#E0C367" - center_of_mass = list("x"=16, "y"=7) - nutriment_amt = 5 - nutriment_desc = list("onion" = 2, "soup" = 2) - -/obj/item/weapon/reagent_containers/food/snacks/onionsoup/Initialize() - . = ..() - bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/onionrings - name = "Onion Rings" - desc = "Crispy rings." - icon_state = "onionrings" - trash = /obj/item/trash/plate - filling_color = "#E0C367" - center_of_mass = list("x"=16, "y"=7) - nutriment_amt = 5 - nutriment_desc = list("onion" = 2) - -/obj/item/weapon/reagent_containers/food/snacks/onionrings/Initialize() - . = ..() - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles name = "Roffle Waffles" desc = "Waffles from Roffle. Co." @@ -2445,7 +2403,7 @@ reagents.add_reagent("cherryjelly", 5) /obj/item/weapon/reagent_containers/food/snacks/milosoup - name = "Milosoup" + name = "Miso soup" desc = "The universes best soup! Yum!!!" icon_state = "milosoup" trash = /obj/item/trash/snack_bowl @@ -3444,32 +3402,35 @@ filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple - name = "Hawaiian" - desc = "The accursed wheel from ancient times." - icon_state = "pizzamargherita" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/pineapple + name = "ham & pineapple pizza" + desc = "One of the most debated pizzas in existence." + icon = 'icons/obj/food_syn.dmi' + icon_state = "pineapple_pizza" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/pineappleslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 5, "tomato" = 5, "cheese" = 5, "pineapple" = 20) - nutriment_amt = 35 + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10) + nutriment_amt = 30 + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("pineapplejuice", 6) - bitesize = 2 + reagents.add_reagent("protein", 4) + reagents.add_reagent("cheese", 5) + reagents.add_reagent("tomatojuice", 6) -/obj/item/weapon/reagent_containers/food/snacks/slice/pineapple - name = "Hawaiian slice" - desc = "A slice of the accursed pizza." - icon_state = "pizzamargheritaslice" +/obj/item/weapon/reagent_containers/food/snacks/pineappleslice + name = "ham & pineapple pizza slice" + desc = "A slice of contraband." + icon = 'icons/obj/food_syn.dmi' + icon_state = "pineapple_pizza_slice" filling_color = "#BAA14C" bitesize = 2 - center_of_mass = list("x"=16, "y"=13) - whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple + center_of_mass = list("x"=18, "y"=13) -/obj/item/weapon/reagent_containers/food/snacks/slice/pineapple/filled - filled = TRUE +/obj/item/weapon/reagent_containers/food/snacks/pineappleslice/filled + nutriment_desc = list("pizza crust" = 5, "tomato" = 5) + nutriment_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza name = "Meatpizza" @@ -4190,32 +4151,8 @@ reagents.add_reagent("capsaicin", 2) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/croissant - name = "croissant" - desc = "True French cuisine." - filling_color = "#E3D796" - icon_state = "croissant" - nutriment_amt = 6 - nutriment_desc = list("french bread" = 6) - -/obj/item/weapon/reagent_containers/food/snacks/croissant/Initialize() - . = ..() - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/meatbun - name = "meat bun" - desc = "Chinese street food, in neither China nor a street." - filling_color = "#DEDEAB" - icon_state = "meatbun" - nutriment_amt = 4 - -/obj/item/weapon/reagent_containers/food/snacks/meatbun/Initialize() - . = ..() - bitesize = 2 - reagents.add_reagent("protein", 4) - /obj/item/weapon/reagent_containers/food/snacks/sashimi - name = "carp sashimi" + name = "sashimi" desc = "Expertly prepared. Hopefully the toxins got removed." filling_color = "#FFDEFE" icon_state = "sashimi" @@ -4352,7 +4289,7 @@ bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/flowerchildsalad - name = "flowerchild salad" + name = "flowerchild poppy salad" desc = "A fragrant salad." icon_state = "flowerchildsalad" filling_color = "#FF3867" @@ -4365,7 +4302,7 @@ bitesize = 4 /obj/item/weapon/reagent_containers/food/snacks/rosesalad - name = "flowerchild salad" + name = "flowerchild rose salad" desc = "A fragrant salad." icon_state = "rosesalad" filling_color = "#FF3867" @@ -4393,21 +4330,6 @@ reagents.add_reagent("protein", 4) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/porkbowl - name = "pork bowl" - desc = "A bowl of fried rice with cuts of meat." - icon_state = "porkbowl" - trash = /obj/item/trash/snack_bowl - filling_color = "#FFFBDB" - nutriment_amt = 6 - nutriment_desc = list("rice" = 2, "meat" = 4) - -/obj/item/weapon/reagent_containers/food/snacks/porkbowl/Initialize() - . = ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("protein", 4) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/tortilla name = "tortilla" desc = "The base for all your burritos." @@ -4420,69 +4342,6 @@ reagents.add_reagent("nutriment", 2) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/meatburrito - name = "carne asada burrito" - desc = "The best burrito for meat lovers." - icon_state = "carneburrito" - nutriment_amt = 6 - nutriment_desc = list("tortilla" = 3, "meat" = 3) - -/obj/item/weapon/reagent_containers/food/snacks/meatburrito/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito - name = "Cheese burrito" - desc = "It's a burrito filled with cheese." - icon_state = "cheeseburrito" - nutriment_amt = 6 - nutriment_desc = list("tortilla" = 3, "cheese" = 3) - -/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito/Initialize() - . = ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("protein", 2) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito - name = "fuego phoron burrito" - desc = "A super spicy burrito." - icon_state = "fuegoburrito" - nutriment_amt = 6 - nutriment_desc = list("chili peppers" = 5, "tortilla" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito/Initialize() - . = ..() - reagents.add_reagent("nutriment", 6) - reagents.add_reagent("capsaicin", 4) - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/nachos - name = "nachos" - desc = "Chips from Old Mexico." - icon_state = "nachos" - nutriment_amt = 2 - nutriment_desc = list("salt" = 1) - -/obj/item/weapon/reagent_containers/food/snacks/nachos/Initialize() - . = ..() - reagents.add_reagent("nutriment", 1) - bitesize = 1 - -/obj/item/weapon/reagent_containers/food/snacks/cheesenachos - name = "cheesy nachos" - desc = "The delicious combination of nachos and melting cheese." - icon_state = "cheesenachos" - nutriment_amt = 5 - nutriment_desc = list("salt" = 2, "cheese" = 3) - -/obj/item/weapon/reagent_containers/food/snacks/cheesenachos/Initialize() - . = ..() - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("protein", 2) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/cubannachos name = "cuban nachos" desc = "That's some dangerously spicy nachos." @@ -4907,7 +4766,7 @@ /obj/item/weapon/reagent_containers/food/snacks/chickenkatsu name = "chicken katsu" - desc = "A Terran delicacy consisting of chicken fried in a light beer batter." + desc = "An Earth delicacy consisting of chicken fried in a light beer batter." icon = 'icons/obj/food_syn.dmi' icon_state = "katsu" trash = /obj/item/trash/plate @@ -5098,8 +4957,8 @@ reagents.add_reagent("egg", 1) /obj/item/weapon/reagent_containers/food/snacks/chilied_eggs - name = "chilied eggs" - desc = "Three deviled eggs floating in a bowl of meat chili. A popular lunchtime meal for Unathi in Ouerea." + name = "Redeemed eggs" + desc = "Three deviled eggs floating in a bowl of meat chili. A popular lunchtime meal for Unathi, with mild religious undertones." icon_state = "chilied_eggs" trash = /obj/item/trash/snack_bowl @@ -5108,7 +4967,6 @@ reagents.add_reagent("egg", 6) reagents.add_reagent("protein", 2) - /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker name = "supreme cheese toast" desc = "A piece of toast lathered with butter, cheese, spices, and herbs." @@ -5200,7 +5058,7 @@ reagents.add_reagent("protein", 3) /obj/item/weapon/reagent_containers/food/snacks/fish_taco - name = "carp taco" + name = "fish taco" desc = "A questionably cooked fish taco decorated with herbs, spices, and special sauce." icon = 'icons/obj/food_syn.dmi' icon_state = "fish_taco" @@ -5212,8 +5070,8 @@ reagents.add_reagent("seafood",3) /obj/item/weapon/reagent_containers/food/snacks/nt_muffin - name = "\improper NtMuffin" - desc = "A NanoTrasen sponsered biscuit with egg, cheese, and sausage." + name = "breakfast muffin" + desc = "An english muffin with egg, cheese, and sausage, as sold in fast food joints galaxy-wide." icon = 'icons/obj/food_syn.dmi' icon_state = "nt_muffin" nutriment_desc = list("biscuit" = 3) @@ -5225,7 +5083,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring name = "pineapple ring" - desc = "What the hell is this?" + desc = "So retro." icon = 'icons/obj/food_syn.dmi' icon_state = "pineapple_ring" nutriment_desc = list("sweetness" = 2) @@ -5235,36 +5093,6 @@ . = ..() reagents.add_reagent("pineapplejuice",3) -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple - name = "ham & pineapple pizza" - desc = "One of the most debated pizzas in existence." - icon = 'icons/obj/food_syn.dmi' - icon_state = "pineapple_pizza" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/pineappleslice - slices_num = 6 - center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10) - nutriment_amt = 30 - bitesize = 2 - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() - . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("cheese", 5) - reagents.add_reagent("tomatojuice", 6) - -/obj/item/weapon/reagent_containers/food/snacks/pineappleslice - name = "ham & pineapple pizza slice" - desc = "A slice of contraband." - icon = 'icons/obj/food_syn.dmi' - icon_state = "pineapple_pizza_slice" - filling_color = "#BAA14C" - bitesize = 2 - center_of_mass = list("x"=18, "y"=13) - -/obj/item/weapon/reagent_containers/food/snacks/pineappleslice/filled - nutriment_desc = list("pizza crust" = 5, "tomato" = 5) - nutriment_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/burger/bacon name = "bacon burger" @@ -5308,17 +5136,6 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/berrymuffin - name = "berry muffin" - desc = "A delicious and spongy little cake, with berries." - icon = 'icons/obj/food_syn.dmi' - icon_state = "berrymuffin" - filling_color = "#E0CF9B" - center_of_mass = list("x"=17, "y"=4) - nutriment_amt = 5 - nutriment_desc = list("sweetness" = 1, "muffin" = 2, "berries" = 2) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/soup/onion name = "onion soup" desc = "A soup with layers." @@ -5670,8 +5487,8 @@ //burritos /obj/item/weapon/reagent_containers/food/snacks/burrito - name = "meat burrito" - desc = "Meat wrapped in a flour tortilla. It's a burrito by definition." + name = "chilli burrito" + desc = "Minced meat wrapped in a flour tortilla. It's a burrito by definition." icon = 'icons/obj/food_syn.dmi' icon_state = "burrito" bitesize = 4 @@ -5698,22 +5515,12 @@ . = ..() reagents.add_reagent("tofu", 6) -/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy - name = "spicy meat burrito" - desc = "Meat and chilis wrapped in a flour tortilla." - icon = 'icons/obj/food_syn.dmi' - icon_state = "burrito_spicy" - bitesize = 4 - center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("tortilla" = 6) - nutriment_amt = 6 - /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize() . = ..() reagents.add_reagent("protein", 6) /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese - name = "meat cheese burrito" + name = "carne queso burrito" desc = "Meat and melted cheese wrapped in a flour tortilla." icon = 'icons/obj/food_syn.dmi' icon_state = "burrito_cheese" @@ -5726,9 +5533,45 @@ . = ..() reagents.add_reagent("protein", 6) +/obj/item/weapon/reagent_containers/food/snacks/burrito_hell + name = "el diablo" + desc = "Meat and an insane amount of chillis packed in a flour tortilla. The Chaplain will see you now." + icon = 'icons/obj/food_syn.dmi' + icon_state = "burrito_hell" + bitesize = 4 + center_of_mass = list("x"=16, "y"=16) + nutriment_desc = list("hellfire" = 6) + nutriment_amt = 24// 10 Chilis is a lot. + +/obj/item/weapon/reagent_containers/food/snacks/meatburrito + name = "carne asada burrito" + desc = "Sliced meat and beans, it's another basic burrito!" + icon_state = "carneburrito" + nutriment_amt = 6 + nutriment_desc = list("tortilla" = 3, "meat" = 3) + +/obj/item/weapon/reagent_containers/food/snacks/meatburrito/Initialize() + . = ..() + reagents.add_reagent("protein", 6) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito + name = "Cheese burrito" + desc = "It's a burrito filled with beans and cheese." + icon_state = "cheeseburrito" + nutriment_amt = 6 + nutriment_desc = list("tortilla" = 3, "cheese" = 3) + +/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito/Initialize() + . = ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("protein", 2) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy - name = "spicy cheese meat burrito" - desc = "Meat, melted cheese, and chilis wrapped in a flour tortilla." + name = "spicy cheese burrito" + desc = "Melted cheese, beans and chillis wrapped in a flour tortilla." + icon = 'icons/obj/food_syn.dmi' icon_state = "burrito_cheese_spicy" bitesize = 4 center_of_mass = list("x"=16, "y"=16) @@ -5739,18 +5582,21 @@ . = ..() reagents.add_reagent("protein", 6) -/obj/item/weapon/reagent_containers/food/snacks/burrito_hell - name = "el diablo" - desc = "Meat and an insane amount of chilis packed in a flour tortilla. The Chaplain will see you now." - icon = 'icons/obj/food_syn.dmi' - icon_state = "burrito_hell" - bitesize = 4 - center_of_mass = list("x"=16, "y"=16) - nutriment_desc = list("hellfire" = 6) - nutriment_amt = 24// 10 Chilis is a lot. +/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito + name = "fuego phoron burrito" + desc = "A super spicy vegetarian burrito." + icon_state = "fuegoburrito" + nutriment_amt = 6 + nutriment_desc = list("chilli peppers" = 5, "tortilla" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito/Initialize() + . = ..() + reagents.add_reagent("nutriment", 6) + reagents.add_reagent("capsaicin", 4) + bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/breakfast_wrap - name = "breakfast wrap" + name = "breakfast burrito" desc = "Bacon, eggs, cheese, and tortilla grilled to perfection." icon = 'icons/obj/food_syn.dmi' icon_state = "breakfast_wrap" @@ -5788,7 +5634,7 @@ /obj/item/weapon/reagent_containers/food/snacks/red_sun_special name = "red sun special" - desc = "One lousy piece of sausage sitting on melted cheese curds. A cheap meal for the Unathi peasants of Moghes." + desc = "One lousy piece of sausage sitting on melted cheese curds. A popular utilitarian meal for the Unathi of Moghes." icon = 'icons/obj/food_syn.dmi' icon_state = "red_sun_special" trash = /obj/item/trash/plate @@ -5843,8 +5689,8 @@ reagents.add_reagent("egg", 2) /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp - name = "korlaaskak" - desc = "A well-dressed carp, seared to perfection and adorned with herbs and spices. Can be sliced into proper serving sizes." + name = "Njarir Merana Grill" + desc = "A well-dressed fish, seared to perfection and adorned with herbs and spices in a traditional Nerahni Tajaran style. Can be sliced into proper serving sizes." icon = 'icons/obj/food_syn.dmi' icon_state = "grilled_carp" slice_path = /obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice @@ -6033,12 +5879,12 @@ . = ..() reagents.add_reagent("protein", 8) bitesize = 3 - + /obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup name = "chicken noodle soup" gender = PLURAL desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots." - icon = 'icons/obj/food_custom.dmi' + icon = 'icons/obj/food_syn.dmi' icon_state = "chickennoodlesoup" filling_color = "#ead90c" nutriment_amt = 6 @@ -6102,16 +5948,31 @@ bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/meatbun - name = "meat bun" - desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a spiced meat filling." + name = "meat and leaf bun" + desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a meat and cabbage filling." + filling_color = "#DEDEAB" + icon = 'icons/obj/food_syn.dmi' + icon_state = "meatbun" + nutriment_amt = 5 + nutriment_desc = list("fried meat" = 5) + center_of_mass = list("x"=16, "y"=11) + +/obj/item/weapon/reagent_containers/food/snacks/meatbun/Initialize() + . = ..() + bitesize = 2 + reagents.add_reagent("protein", 4) + +/obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun + name = "char sui meat bun" + desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a traditionally spiced meat filling." icon = 'icons/obj/food_syn.dmi' icon_state = "meatbun" filling_color = "#edd7d7" nutriment_amt = 5 - nutriment_desc = list("spice" = 5) + nutriment_desc = list("char sui" = 5) center_of_mass = list("x"=16, "y"=11) -/obj/item/weapon/reagent_containers/food/snacks/meatbun/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun/Initialize() . = ..() reagents.add_reagent("protein", 3) bitesize = 5 @@ -6249,7 +6110,7 @@ reagents.add_reagent("honey", 5) bitesize = 4 -// SLICEABLE FOODS - SYNNONO MEME FOOD EXPANSION - Credit to Synnono from Aurorastation (again) +//Sliceables /obj/item/weapon/reagent_containers/food/snacks/sliceable/keylimepie name = "key lime pie" @@ -6425,7 +6286,7 @@ /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger desc = "A large crème caramel made with extra hate" icon_state = "angerpuddi" - + /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel name = "\improper Buche de Noel" desc = "Merry Christmas" @@ -6476,7 +6337,7 @@ icon_state = "turkey_drumstick" trash = /obj/item/trash/plate bitesize = 2 - + /obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter name = "suppermatter" desc = "Extremely dense and powerful food." @@ -6550,7 +6411,7 @@ /obj/item/weapon/reagent_containers/food/snacks/omurice/face icon = 'icons/obj/food.dmi' icon_state = "omuriceface" - + /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun name = "cinnamon bun" desc = "Life needs frosting!" diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index ded2f80125..8b38c909dd 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -29,10 +29,17 @@ /datum/recipe/bellefritter appliance = FRYER - reagents = list("sugar" = 5, "batter" = 10) + coating = /datum/reagent/nutriment/coating/batter + reagents = list("sugar" = 5) items = list(/obj/item/weapon/reagent_containers/food/snacks/frostbelle) result = /obj/item/weapon/reagent_containers/food/snacks/bellefritter +/datum/recipe/onionrings + appliance = FRYER + coating = /datum/reagent/nutriment/coating/batter + fruit = list("onion" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/onionrings + //Meaty Recipes //==================== /datum/recipe/cubancarp @@ -86,6 +93,31 @@ reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/weapon/reagent_containers/food/snacks/friedmushroom +/datum/recipe/fishfingers + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + ) + coating = /datum/reagent/nutriment/coating/batter + result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers + reagent_mix = RECIPE_REAGENT_REPLACE + +/datum/recipe/corn_dog + appliance = FRYER + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sausage + ) + fruit = list("corn" = 1) + coating = /datum/reagent/nutriment/coating/batter + result = /obj/item/weapon/reagent_containers/food/snacks/corn_dog + +/datum/recipe/sweet_and_sour + appliance = FRYER + items = list( + /obj/item/weapon/reagent_containers/food/snacks/bacon, + /obj/item/weapon/reagent_containers/food/snacks/cutlet + ) + reagents = list("soysauce" = 5, "batter" = 10) + result = /obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour //Sweet Recipes. //================== @@ -145,20 +177,3 @@ result = /obj/item/weapon/reagent_containers/food/snacks/pisanggoreng coating = /datum/reagent/nutriment/coating/batter -/datum/recipe/corn_dog - appliance = FRYER - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sausage - ) - fruit = list("corn" = 1) - coating = /datum/reagent/nutriment/coating/batter - result = /obj/item/weapon/reagent_containers/food/snacks/corn_dog - -/datum/recipe/sweet_and_sour - appliance = FRYER - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bacon, - /obj/item/weapon/reagent_containers/food/snacks/cutlet - ) - reagents = list("soysauce" = 5, "batter" = 10) - result = /obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index c69b8a59aa..3ece25a755 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -13,7 +13,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/humanburger ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger - + /datum/recipe/syntiburger appliance = GRILL items = list( @@ -85,7 +85,7 @@ /obj/item/clothing/head/beret ) result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger - + /datum/recipe/mouseburger appliance = GRILL items = list( @@ -93,7 +93,7 @@ /obj/item/weapon/holder/mouse ) result = /obj/item/weapon/reagent_containers/food/snacks/mouseburger - + /datum/recipe/bunbun appliance = GRILL items = list( @@ -109,7 +109,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sausage ) result = /obj/item/weapon/reagent_containers/food/snacks/hotdog - + /datum/recipe/humankabob appliance = GRILL items = list( @@ -127,7 +127,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat, ) result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob - + /datum/recipe/monkeykabob appliance = GRILL items = list( @@ -154,7 +154,7 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu, ) result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob - + /datum/recipe/fakespellburger appliance = GRILL items = list( @@ -182,7 +182,7 @@ reagents = list("egg" = 3) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger - + /datum/recipe/superbiteburger appliance = GRILL fruit = list("tomato" = 1) @@ -195,7 +195,7 @@ /obj/item/weapon/reagent_containers/food/snacks/boiledegg, ) result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger - + /datum/recipe/slimeburger appliance = GRILL reagents = list("slimejelly" = 5) @@ -211,7 +211,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bun ) result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry - + /datum/recipe/bearburger appliance = GRILL items = list( @@ -230,6 +230,16 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/bacon +/datum/recipe/omelette + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + ) + reagents = list("egg" = 6) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/weapon/reagent_containers/food/snacks/omelette + /datum/recipe/omurice appliance = GRILL reagents = list("rice" = 5, "ketchup" = 5, "egg" = 3) @@ -243,4 +253,76 @@ /datum/recipe/omurice/face appliance = GRILL reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 5, "egg" = 3) - result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face + +/datum/recipe/meatsteak + appliance = GRILL + reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + items = list(/obj/item/weapon/reagent_containers/food/snacks/meat) + result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak + +/datum/recipe/honeytoast + appliance = GRILL + reagents = list("honey" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/slice/bread + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast + +/datum/recipe/grilled_carp + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat, + /obj/item/weapon/reagent_containers/food/snacks/carpmeat + ) + reagents = list("spacespice" = 1) + fruit = list("cabbage" = 1, "lime" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp + +/datum/recipe/grilledcheese + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese + +/datum/recipe/toastedsandwich + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sandwich + ) + result = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich + +/datum/recipe/cheese_cracker + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spreads/butter, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge + ) + reagents = list("spacespice" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker + result_quantity = 4 + +/datum/recipe/bacongrill + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/spreads, + /obj/item/weapon/reagent_containers/food/snacks/rawbacon + ) + result = /obj/item/weapon/reagent_containers/food/snacks/bacon + +/datum/recipe/chickenfillet //Also just combinable, like burgers and hot dogs. + appliance = GRILL + items = list( + /obj/item/weapon/reagent_containers/food/snacks/chickenkatsu, + /obj/item/weapon/reagent_containers/food/snacks/bun + ) + result = /obj/item/weapon/reagent_containers/food/snacks/chickenfillet \ No newline at end of file diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 33af2ce7a6..39e73a9b1e 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -43,14 +43,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/devilledegg -/datum/recipe/waffles - reagents = list("sugar" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough, - /obj/item/weapon/reagent_containers/food/snacks/dough - ) - result = /obj/item/weapon/reagent_containers/food/snacks/waffles - /datum/recipe/donkpocket items = list( /obj/item/weapon/reagent_containers/food/snacks/dough, @@ -72,15 +64,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL -/datum/recipe/omelette - items = list( - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - ) - reagents = list("egg" = 6) - reagent_mix = RECIPE_REAGENT_REPLACE - result = /obj/item/weapon/reagent_containers/food/snacks/omelette - /datum/recipe/muffin reagents = list("milk" = 5, "sugar" = 5) reagent_mix = RECIPE_REAGENT_REPLACE @@ -137,7 +120,7 @@ I said no! fruit = list("potato" = 1) items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge) result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato - + /datum/recipe/microchips appliance = MICROWAVE items = list( @@ -145,10 +128,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/microchips -/datum/recipe/mashedpotato - fruit = list("potato" = 1) - result = /obj/item/weapon/reagent_containers/food/snacks/mashedpotato - /datum/recipe/bangersandmash items = list( /obj/item/weapon/reagent_containers/food/snacks/mashedpotato, @@ -182,25 +161,11 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie -/datum/recipe/meatsteak - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) - items = list(/obj/item/weapon/reagent_containers/food/snacks/meat) - result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak - /datum/recipe/syntisteak reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list(/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh) result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak -/datum/recipe/pizzahawaiian - fruit = list("tomato" = 1, "pineapple" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/weapon/reagent_containers/food/snacks/cutlet, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple - /datum/recipe/spacylibertyduff reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff @@ -208,7 +173,7 @@ I said no! /datum/recipe/amanitajelly reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly - + /datum/recipe/amanitajelly/make_food(var/obj/container as obj) . = ..(container) for(var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked in .) @@ -260,12 +225,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/sandwich -/datum/recipe/toastedsandwich - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sandwich - ) - result = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich - /datum/recipe/peanutbutterjellysandwich reagents = list("cherryjelly" = 5, "peanutbutter" = 5) items = list( @@ -274,13 +233,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/peanutbutter -/datum/recipe/grilledcheese - items = list( - /obj/item/weapon/reagent_containers/food/snacks/slice/bread, - /obj/item/weapon/reagent_containers/food/snacks/slice/bread, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese /datum/recipe/tomatosoup fruit = list("tomato" = 2) @@ -379,11 +331,6 @@ I said no! reagents = list("water" = 5, "sugar" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple -/datum/recipe/applepie - fruit = list("apple" = 1) - items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough) - result = /obj/item/weapon/reagent_containers/food/snacks/applepie - /datum/recipe/twobread reagents = list("wine" = 5) items = list( @@ -439,30 +386,6 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/sausage result_quantity = 2 -/datum/recipe/fishfingers - reagents = list("flour" = 10, "egg" = 3) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers - reagent_mix = RECIPE_REAGENT_REPLACE - -/datum/recipe/zestfish - fruit = list("lemon" = 1) - reagents = list("sodiumchloride" = 3) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/carpmeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/zestfish - -/datum/recipe/limezestfish - fruit = list("lime" = 1) - reagents = list("sodiumchloride" = 3) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/carpmeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/zestfish - /datum/recipe/kudzudonburi fruit = list("kudzu" = 1) reagents = list("rice" = 10) @@ -494,11 +417,7 @@ I said no! /datum/recipe/chawanmushi fruit = list("mushroom" = 1) - reagents = list("water" = 5, "soysauce" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg - ) + reagents = list("water" = 5, "soysauce" = 5, "egg" = 6) result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi /datum/recipe/beetsoup @@ -532,7 +451,7 @@ I said no! fruit = list("potato" = 1, "ambrosia" = 3) items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball) result = /obj/item/weapon/reagent_containers/food/snacks/validsalad - + /datum/recipe/validsalad/make_food(var/obj/container as obj) . = ..(container) for (var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked in .) @@ -545,17 +464,9 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/stuffing -/datum/recipe/tofurkey - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/tofu, - /obj/item/weapon/reagent_containers/food/snacks/stuffing, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey - /datum/recipe/mashedpotato items = list( - /obj/item/weapon/reagent_containers/food/snacks/spreads/butter // to prevent conflicts with yellow curry + /obj/item/weapon/reagent_containers/food/snacks/spreads ) fruit = list("potato" = 1) result = /obj/item/weapon/reagent_containers/food/snacks/mashedpotato @@ -574,27 +485,11 @@ I said no! ) result = /obj/item/weapon/ruinedvirusdish -/datum/recipe/onionrings - fruit = list("onion" = 1) - reagents = list("flour" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/onionrings /datum/recipe/onionsoup fruit = list("onion" = 1) reagents = list("water" = 10) - result = /obj/item/weapon/reagent_containers/food/snacks/onionsoup - -////////////////////////////////////////// -// bs12 food port stuff -////////////////////////////////////////// - -/datum/recipe/taco - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/cutlet, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/taco + result = /obj/item/weapon/reagent_containers/food/snacks/soup/onion /datum/recipe/microwavebun items = list( @@ -643,18 +538,6 @@ I said no! reagents = list("sugar" = 5, "frostoil" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/mint -//////////////////////// -// TGstation food ports -//////////////////////// - -/datum/recipe/meatbun - fruit = list("cabbage" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meatball, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatbun - /datum/recipe/sashimi reagents = list("soysauce" = 5) items = list( @@ -739,53 +622,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl -/datum/recipe/microwavetortilla - reagents = list("flour" = 5, "water" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough - ) - result = /obj/item/weapon/reagent_containers/food/snacks/tortilla - -/datum/recipe/meatburrito - fruit = list("soybeans" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tortilla, - /obj/item/weapon/reagent_containers/food/snacks/cutlet, - /obj/item/weapon/reagent_containers/food/snacks/cutlet - ) - result = /obj/item/weapon/reagent_containers/food/snacks/meatburrito - -/datum/recipe/cheeseburrito - fruit = list("soybeans" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tortilla, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito - -/datum/recipe/fuegoburrito - fruit = list("soybeans" = 1, "chili" = 2) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tortilla - ) - result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito - -/datum/recipe/nachos - reagents = list("sodiumchloride" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tortilla - ) - result = /obj/item/weapon/reagent_containers/food/snacks/nachos - -/datum/recipe/cheesenachos - reagents = list("sodiumchloride" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/tortilla, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cheesenachos - /datum/recipe/cubannachos fruit = list("chili" = 1) reagents = list("ketchup" = 5) @@ -860,16 +696,12 @@ I said no! /obj/item/device/soulstone ) result = /obj/item/weapon/reagent_containers/food/snacks/bageltwo - -///////////////////////////////////////////////////////////// -//Synnono Meme Foods -// -//Most recipes replace reagents with RECIPE_REAGENT_REPLACE -//to simplify the end product and balance the amount of reagents + + +//Recipes that use RECIPE_REAGENT_REPLACE will +//simplify the end product and balance the amount of reagents //in some foods. Many require the space spice reagent/condiment //to reduce the risk of future recipe conflicts. -///////////////////////////////////////////////////////////// - /datum/recipe/redcurry reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5) @@ -934,13 +766,6 @@ I said no! reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/weapon/reagent_containers/food/snacks/lomein -/datum/recipe/chickenfillet //Also just combinable, like burgers and hot dogs. - items = list( - /obj/item/weapon/reagent_containers/food/snacks/chickenkatsu, - /obj/item/weapon/reagent_containers/food/snacks/bun - ) - result = /obj/item/weapon/reagent_containers/food/snacks/chickenfillet - /datum/recipe/chickennoodlesoup fruit = list("carrot" = 1) reagents = list("water" = 10) @@ -957,45 +782,6 @@ I said no! reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/weapon/reagent_containers/food/snacks/chilicheesefries -/datum/recipe/meatbun - reagents = list("spacespice" = 1, "water" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/rawcutlet - ) - reagent_mix = RECIPE_REAGENT_REPLACE //Water used up in cooking - result = /obj/item/weapon/reagent_containers/food/snacks/meatbun - -/datum/recipe/custardbun - reagents = list("spacespice" = 1, "water" = 5, "egg" = 3) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice - ) - reagent_mix = RECIPE_REAGENT_REPLACE //Water, egg used up in cooking - result = /obj/item/weapon/reagent_containers/food/snacks/custardbun - -/datum/recipe/chickenmomo - reagents = list("spacespice" = 2, "water" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/meat/chicken - ) - reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product - result = /obj/item/weapon/reagent_containers/food/snacks/chickenmomo - -/datum/recipe/veggiemomo - reagents = list("spacespice" = 2, "water" = 5) - fruit = list("carrot" = 1, "cabbage" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/doughslice, - /obj/item/weapon/reagent_containers/food/snacks/doughslice - ) - reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here - result = /obj/item/weapon/reagent_containers/food/snacks/veggiemomo - /datum/recipe/risotto reagents = list("wine" = 5, "rice" = 10, "spacespice" = 1) fruit = list("mushroom" = 1) @@ -1010,21 +796,6 @@ I said no! reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here result = /obj/item/weapon/reagent_containers/food/snacks/poachedegg -/datum/recipe/honeytoast - reagents = list("honey" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/slice/bread - ) - reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product - result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast - -/datum/recipe/sashimi - reagents = list("soysauce" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/carpmeat - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sashimi - /datum/recipe/nugget reagents = list("flour" = 5) items = list( @@ -1034,12 +805,15 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/nugget // Chip update -/datum/recipe/tortila - reagents = list("flour" = 5,"water" = 5) +/datum/recipe/microwavetortilla + reagents = list("flour" = 5, "water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough + ) result = /obj/item/weapon/reagent_containers/food/snacks/tortilla reagent_mix = RECIPE_REAGENT_REPLACE //no gross flour or water -/datum/recipe/taconew +/datum/recipe/taco items = list( /obj/item/weapon/reagent_containers/food/snacks/tortilla, /obj/item/weapon/reagent_containers/food/snacks/cutlet, @@ -1101,36 +875,61 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan -/datum/recipe/burrito_spicy - fruit = list("chili" = 2) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/burrito - ) - result = /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy - /datum/recipe/burrito_cheese items = list( - /obj/item/weapon/reagent_containers/food/snacks/burrito, + /obj/item/weapon/reagent_containers/food/snacks/tortilla, + /obj/item/weapon/reagent_containers/food/snacks/meatball, + /obj/item/weapon/reagent_containers/food/snacks/meatball, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge ) result = /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese /datum/recipe/burrito_cheese_spicy - fruit = list("chili" = 2) + fruit = list("chili" = 2, "soybeans" = 1) items = list( - /obj/item/weapon/reagent_containers/food/snacks/burrito, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge + /obj/item/weapon/reagent_containers/food/snacks/tortilla, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy /datum/recipe/burrito_hell - fruit = list("chili" = 10) + fruit = list("soybeans" = 1, "chili" = 10) + reagents = list("spacespice" = 1) items = list( - /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy + /obj/item/weapon/reagent_containers/food/snacks/tortilla, + /obj/item/weapon/reagent_containers/food/snacks/meatball, + /obj/item/weapon/reagent_containers/food/snacks/meatball ) + result result = /obj/item/weapon/reagent_containers/food/snacks/burrito_hell reagent_mix = RECIPE_REAGENT_REPLACE //Already hot sauce +/datum/recipe/meatburrito + fruit = list("soybeans" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/tortilla, + /obj/item/weapon/reagent_containers/food/snacks/cutlet, + /obj/item/weapon/reagent_containers/food/snacks/cutlet + ) + result = /obj/item/weapon/reagent_containers/food/snacks/meatburrito + +/datum/recipe/cheeseburrito + fruit = list("soybeans" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/tortilla, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito + +/datum/recipe/fuegoburrito + fruit = list("soybeans" = 1, "chili" = 2) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/tortilla + ) + result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito + /datum/recipe/breakfast_wrap items = list( /obj/item/weapon/reagent_containers/food/snacks/bacon, @@ -1142,18 +941,16 @@ I said no! /datum/recipe/burrito_mystery items = list( - /obj/item/weapon/reagent_containers/food/snacks/burrito, + /obj/item/weapon/reagent_containers/food/snacks/tortilla, /obj/item/weapon/reagent_containers/food/snacks/mysterysoup ) result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery -//Ligger food, and also bacon. - -/datum/recipe/bacon +/datum/recipe/baconmicrowave items = list( /obj/item/weapon/reagent_containers/food/snacks/rawbacon ) - result = /obj/item/weapon/reagent_containers/food/snacks/bacon + result = /obj/item/weapon/reagent_containers/food/snacks/bacon/microwave /datum/recipe/chilied_eggs items = list( @@ -1194,9 +991,9 @@ I said no! /datum/recipe/father_breakfast items = list( /obj/item/weapon/reagent_containers/food/snacks/sausage, - /obj/item/weapon/reagent_containers/food/snacks/omelette, /obj/item/weapon/reagent_containers/food/snacks/meatsteak ) + reagents = list("egg" = 6) result = /obj/item/weapon/reagent_containers/food/snacks/father_breakfast /datum/recipe/stuffed_meatball @@ -1211,24 +1008,11 @@ I said no! items = list( /obj/item/weapon/reagent_containers/food/snacks/meatball, /obj/item/weapon/reagent_containers/food/snacks/meatball, - /obj/item/weapon/reagent_containers/food/snacks/meatball, - /obj/item/weapon/reagent_containers/food/snacks/omelette + /obj/item/weapon/reagent_containers/food/snacks/meatball ) + reagents = list("egg" = 6) result = /obj/item/weapon/reagent_containers/food/snacks/egg_pancake -/datum/recipe/grilled_carp - items = list( - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat, - /obj/item/weapon/reagent_containers/food/snacks/carpmeat - ) - reagents = list("spacespice" = 1) - fruit = list("cabbage" = 1, "lime" = 1) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp - /datum/recipe/bacon_stick items = list( /obj/item/weapon/reagent_containers/food/snacks/bacon, @@ -1236,16 +1020,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/bacon_stick -/datum/recipe/cheese_cracker - items = list( - /obj/item/weapon/reagent_containers/food/snacks/spreads/butter, - /obj/item/weapon/reagent_containers/food/snacks/slice/bread, - /obj/item/weapon/reagent_containers/food/snacks/cheesewedge - ) - reagents = list("spacespice" = 1) - result = /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker - result_quantity = 4 - /datum/recipe/bacon_and_eggs items = list( /obj/item/weapon/reagent_containers/food/snacks/bacon, @@ -1280,35 +1054,6 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/blt -/datum/recipe/onionrings - fruit = list("onion" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/doughslice - ) - result = /obj/item/weapon/reagent_containers/food/snacks/onionrings - -/datum/recipe/berrymuffin - reagents = list("milk" = 5, "sugar" = 5) - reagent_mix = RECIPE_REAGENT_REPLACE - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough - ) - fruit = list("berries" = 1) - result = /obj/item/weapon/reagent_containers/food/snacks/muffin - -/datum/recipe/onionsoup - fruit = list("onion" = 1) - reagents = list("water" = 10) - result = /obj/item/weapon/reagent_containers/food/snacks/soup/onion - -/datum/recipe/porkbowl - reagents = list("water" = 5, "rice" = 10) - reagent_mix = RECIPE_REAGENT_REPLACE - items = list( - /obj/item/weapon/reagent_containers/food/snacks/bacon - ) - result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl - /datum/recipe/gigapuddi reagents = list("milk" = 15) items = list( @@ -1331,26 +1076,4 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/egg, /obj/item/weapon/reagent_containers/food/snacks/egg ) - result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger - -/datum/recipe/buchedenoel - fruit = list("berries" = 2) - reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel - -/datum/recipe/turkey - fruit = list("carrot" = 2) - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, - /obj/item/weapon/reagent_containers/food/snacks/slice/bread, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey - -/datum/recipe/cinnamonbun - reagents = list("sugar" = 15, "cream" = 10) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/dough - ) - result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun - result_quantity = 4 + result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger \ No newline at end of file diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index b92f04b09e..e04d437982 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -5,7 +5,8 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/ovenchips - +//Roasts +//--------------- /datum/recipe/dionaroast appliance = OVEN @@ -15,15 +16,59 @@ result = /obj/item/weapon/reagent_containers/food/snacks/dionaroast reagent_mix = RECIPE_REAGENT_REPLACE //No eating polyacid +/datum/recipe/monkeysdelight + appliance = OVEN + fruit = list("banana" = 1) + reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/monkeycube + ) + result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight + reagent_mix = RECIPE_REAGENT_REPLACE -/datum/recipe/ribplate //Putting this here for not seeing a roast section. +/datum/recipe/ribplate appliance = OVEN reagents = list("honey" = 5, "spacespice" = 2, "blackpepper" = 1) items = list(/obj/item/weapon/reagent_containers/food/snacks/meat) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/weapon/reagent_containers/food/snacks/ribplate +/datum/recipe/turkey + appliance = OVEN + reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meat/chicken, + /obj/item/weapon/reagent_containers/food/snacks/stuffing + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey +/datum/recipe/tofurkey + appliance = OVEN + reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/tofu, + /obj/item/weapon/reagent_containers/food/snacks/tofu, + /obj/item/weapon/reagent_containers/food/snacks/stuffing + ) + result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey + +/datum/recipe/zestfish + appliance = OVEN + fruit = list("lemon" = 1) + reagents = list("sodiumchloride" = 3) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/zestfish + +/datum/recipe/limezestfish + appliance = OVEN + fruit = list("lime" = 1) + reagents = list("sodiumchloride" = 3) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/zestfish //Predesigned breads @@ -197,7 +242,6 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie - /datum/recipe/amanita_pie appliance = OVEN reagents = list("amatoxin" = 5) @@ -210,18 +254,24 @@ items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/weapon/reagent_containers/food/snacks/plump_pie +/datum/recipe/applepie + appliance = OVEN + fruit = list("apple" = 1) + items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough) + result = /obj/item/weapon/reagent_containers/food/snacks/applepie /datum/recipe/pumpkinpie appliance = OVEN fruit = list("pumpkin" = 1) - reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10) + reagents = list("sugar" = 5) + items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie - reagent_mix = RECIPE_REAGENT_REPLACE //We dont want raw egg in the result /datum/recipe/appletart appliance = OVEN fruit = list("goldapple" = 1) - reagents = list("sugar" = 5, "milk" = 5, "flour" = 10, "egg" = 3) + reagents = list("sugar" = 10) + items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/weapon/reagent_containers/food/snacks/appletart reagent_mix = RECIPE_REAGENT_REPLACE @@ -292,7 +342,20 @@ reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cosmicbrownies +/datum/recipe/buchedenoel + appliance = OVEN + fruit = list("berries" = 2) + reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel +/datum/recipe/cinnamonbun + appliance = OVEN + reagents = list("sugar" = 15, "cream" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/dough + ) + result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun + result_quantity = 4 //Pizzas @@ -366,24 +429,15 @@ //Spicy //================ + /datum/recipe/enchiladas appliance = OVEN - fruit = list("chili" = 2, "corn" = 1) - items = list(/obj/item/weapon/reagent_containers/food/snacks/cutlet) - result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas - -/datum/recipe/monkeysdelight - appliance = OVEN - fruit = list("banana" = 1) - reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) + fruit = list("chili" = 2) items = list( - /obj/item/weapon/reagent_containers/food/snacks/monkeycube + /obj/item/weapon/reagent_containers/food/snacks/cutlet, + /obj/item/weapon/reagent_containers/food/snacks/tortilla ) - result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight - reagent_mix = RECIPE_REAGENT_REPLACE - - - + result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas // Cakes. @@ -485,15 +539,6 @@ reagents = list("milk" = 5, "egg" = 3,"honey" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/honeybun -/datum/recipe/enchiladas_new - appliance = OVEN - fruit = list("chili" = 2) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/cutlet, - /obj/item/weapon/reagent_containers/food/snacks/tortilla - ) - result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas - //Bacon /datum/recipe/bacon_oven appliance = OVEN @@ -558,7 +603,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge ) result = /obj/item/weapon/reagent_containers/food/snacks/macncheese - + /datum/recipe/suppermatter appliance = OVEN reagents = list("radium" = 5, "milk" = 5) @@ -576,3 +621,72 @@ ) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter + +/datum/recipe/waffles + appliance = OVEN + reagents = list("sugar" = 10) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough + ) + result = /obj/item/weapon/reagent_containers/food/snacks/waffles + +/datum/recipe/loadedbakedpotatooven + appliance = OVEN + fruit = list("potato" = 1) + items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge) + result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato + +/datum/recipe/meatbun + appliance = OVEN + fruit = list("cabbage" = 1) + reagents = list("water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/meatball, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Water used up in cooking + result = /obj/item/weapon/reagent_containers/food/snacks/meatbun + +/datum/recipe/spicedmeatbun + appliance = OVEN + reagents = list("spacespice" = 2, "water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/rawcutlet + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Water used up in cooking + result = /obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun + +/datum/recipe/custardbun + appliance = OVEN + reagents = list("spacespice" = 1, "water" = 5, "egg" = 3) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/doughslice + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Water, egg used up in cooking + result = /obj/item/weapon/reagent_containers/food/snacks/custardbun + +/datum/recipe/chickenmomo + appliance = OVEN + reagents = list("spacespice" = 2, "water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/weapon/reagent_containers/food/snacks/chickenmomo + +/datum/recipe/veggiemomo + appliance = OVEN + reagents = list("spacespice" = 2, "water" = 5) + fruit = list("carrot" = 1, "cabbage" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/doughslice, + /obj/item/weapon/reagent_containers/food/snacks/doughslice + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here + result = /obj/item/weapon/reagent_containers/food/snacks/veggiemomo \ No newline at end of file diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index dd91e78a07..01aef78746 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -225,6 +225,11 @@ new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return + else if(!isnull(seed.chems["pineapplejuice"])) + to_chat(user, "You slice \the [src] into rings.") + new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) + qdel(src) + return else if(!isnull(seed.chems["soymilk"])) to_chat(user, "You roughly chop up \the [src].") new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 2ded29cdf5..af17253513 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -320,8 +320,8 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/eggyplant seed_type = "egg-plant" -/obj/item/seeds/spineapple - seed_type = "spineapple" +/obj/item/seeds/pineapple + seed_type = "pineapple" /obj/item/seeds/durian seed_type = "durian" diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index f82e90b0bf..2c26ac8394 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -127,7 +127,7 @@ /obj/item/seeds/riceseed = 3, /obj/item/seeds/rose = 3, /obj/item/seeds/soyaseed = 3, - /obj/item/seeds/spineapple = 3, + /obj/item/seeds/pineapple = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, @@ -185,7 +185,7 @@ /obj/item/seeds/riceseed = 3, /obj/item/seeds/rose = 3, /obj/item/seeds/soyaseed = 3, - /obj/item/seeds/spineapple = 3, + /obj/item/seeds/pineapple = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm new file mode 100644 index 0000000000..9e14b244dc --- /dev/null +++ b/code/modules/hydroponics/seedtypes/pineapple.dm @@ -0,0 +1,49 @@ +//pineapple and variants + +/datum/seed/pineapple + name = "pineapple" + seed_name = "pineapple" + display_name = "pineapple" + kitchen_tag = "pineapple" + mutants = list("spineapple") + chems = list("nutriment" = list(1,5), "pineapplejuice" = list(1, 20)) + +/datum/seed/pineapple/New() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_MATURATION,10) + set_trait(TRAIT_PRODUCTION,6) + set_trait(TRAIT_YIELD,1) + set_trait(TRAIT_POTENCY,13) + set_trait(TRAIT_PRODUCT_ICON,"pineapple") + set_trait(TRAIT_PRODUCT_COLOUR,"#FFF23B") + set_trait(TRAIT_PLANT_COLOUR,"#87C969") + set_trait(TRAIT_PLANT_ICON,"corn") + set_trait(TRAIT_IDEAL_HEAT, 298) + set_trait(TRAIT_IDEAL_LIGHT, 4) + set_trait(TRAIT_WATER_CONSUMPTION, 8) + +//A pineapple that stings and produces enzymes. + +/datum/seed/spineapple + name = "spineapple" + seed_name = "spineapple" + display_name = "spineapple" + kitchen_tag = "spineapple" + chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20)) + +/datum/seed/spineapple/New() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_MATURATION,10) + set_trait(TRAIT_PRODUCTION,6) + set_trait(TRAIT_YIELD,1) + set_trait(TRAIT_POTENCY,13) + set_trait(TRAIT_PRODUCT_ICON,"pineapple") + set_trait(TRAIT_PRODUCT_COLOUR,"#FFF23B") + set_trait(TRAIT_PLANT_COLOUR,"#87C969") + set_trait(TRAIT_PLANT_ICON,"corn") + set_trait(TRAIT_IDEAL_HEAT, 298) + set_trait(TRAIT_IDEAL_LIGHT, 4) + set_trait(TRAIT_WATER_CONSUMPTION, 6) + set_trait(TRAIT_STINGS,1) \ No newline at end of file diff --git a/code/modules/hydroponics/seedtypes/spineapple.dm b/code/modules/hydroponics/seedtypes/spineapple.dm deleted file mode 100644 index b8ff58f597..0000000000 --- a/code/modules/hydroponics/seedtypes/spineapple.dm +++ /dev/null @@ -1,22 +0,0 @@ -/datum/seed/spineapple - name = "spineapple" - seed_name = "spineapple" - display_name = "spineapple" - kitchen_tag = "pineapple" - chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20)) - -/datum/seed/spineapple/New() - ..() - set_trait(TRAIT_HARVEST_REPEAT,1) - set_trait(TRAIT_MATURATION,10) - set_trait(TRAIT_PRODUCTION,6) - set_trait(TRAIT_YIELD,1) - set_trait(TRAIT_POTENCY,13) - set_trait(TRAIT_PRODUCT_ICON,"pineapple") - set_trait(TRAIT_PRODUCT_COLOUR,"#FFF23B") - set_trait(TRAIT_PLANT_COLOUR,"#87C969") - set_trait(TRAIT_PLANT_ICON,"corn") - set_trait(TRAIT_IDEAL_HEAT, 298) - set_trait(TRAIT_IDEAL_LIGHT, 4) - set_trait(TRAIT_WATER_CONSUMPTION, 8) - set_trait(TRAIT_STINGS,1) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 1b826e6fe4..0471a66f98 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -421,7 +421,7 @@ color = "#c07c40" /datum/reagent/nutriment/soysauce - name = "Soysauce" + name = "Soy Sauce" id = "soysauce" description = "A salty sauce made from the soy plant." taste_description = "umami" @@ -439,6 +439,15 @@ nutriment_factor = 5 color = "#731008" +/datum/reagent/nutriment/barbecue + name = "Barbeque Sauce" + id = "barbecue" + description = "Barbecue sauce for barbecues and long shifts." + taste_description = "barbeque" + reagent_state = LIQUID + nutriment_factor = 5 + color = "#4F330F" + /datum/reagent/nutriment/rice name = "Rice" id = "rice" @@ -1479,13 +1488,13 @@ /datum/reagent/drink/soda/pineappleade name = "Pineappleade" id = "pineappleade" - description = "Spineapple, juiced up." + description = "Pineapple, juiced up." taste_description = "sweet`n`sour pineapples" color = "#FFFF00" adj_temp = -5 glass_name = "pineappleade" - glass_desc = "Spineapple, juiced up." + glass_desc = "Pineapple, juiced up." glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/kiraspecial diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index cb4f1732c0..f2f00ac350 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1275,6 +1275,13 @@ required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1) result_amount = 4 +/datum/chemical_reaction/food/barbecue + name = "Barbeque Sauce" + id = "barbecue" + result = "barbecue" + required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1) + result_amount = 4 + /datum/chemical_reaction/food/peanutbutter name = "Peanut Butter" id = "peanutbutter" diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index a69cd8179e..49d5ef211f 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -37,7 +37,7 @@ /obj/item/weapon/virusdish name = "virus dish" icon = 'icons/obj/items.dmi' - icon_state = "implantcase-b" + icon_state = "virussample" var/datum/disease2/disease/virus2 = null var/growth = 0 var/basic_info = null @@ -81,7 +81,7 @@ /obj/item/weapon/ruinedvirusdish name = "ruined virus sample" icon = 'icons/obj/items.dmi' - icon_state = "implantcase-b" + icon_state = "virussample-ruined" desc = "The bacteria in the dish are completely dead." /obj/item/weapon/ruinedvirusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob) diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 56d13d9fc6..549cbea007 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi index e8be40f76d..ee26eb7777 100644 Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ diff --git a/icons/obj/food_syn.dmi b/icons/obj/food_syn.dmi index f186b53089..9c8787e529 100644 Binary files a/icons/obj/food_syn.dmi and b/icons/obj/food_syn.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 47a6a0cf6e..b711d3bb80 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/polaris.dme b/polaris.dme index f497af1b64..1b75bff375 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1934,13 +1934,13 @@ #include "code\modules\hydroponics\seedtypes\nettles.dm" #include "code\modules\hydroponics\seedtypes\onion.dm" #include "code\modules\hydroponics\seedtypes\peanuts.dm" +#include "code\modules\hydroponics\seedtypes\pineapple.dm" #include "code\modules\hydroponics\seedtypes\potato.dm" #include "code\modules\hydroponics\seedtypes\pumpkin.dm" #include "code\modules\hydroponics\seedtypes\rhubarb.dm" #include "code\modules\hydroponics\seedtypes\rice.dm" #include "code\modules\hydroponics\seedtypes\selemhand.dm" #include "code\modules\hydroponics\seedtypes\soybean.dm" -#include "code\modules\hydroponics\seedtypes\spineapple.dm" #include "code\modules\hydroponics\seedtypes\sugarcane.dm" #include "code\modules\hydroponics\seedtypes\surik.dm" #include "code\modules\hydroponics\seedtypes\telriis.dm"