From f312297f9db9e0fafe36e31d4992acf34651abbe Mon Sep 17 00:00:00 2001 From: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com> Date: Wed, 21 Oct 2020 09:40:27 -0400 Subject: [PATCH] A variety of minor food related fixes and tweaks (#14656) * Changed Milo to Miso * Update baked_goods.dm * typo fix * Revert "typo fix" This reverts commit 3f6ca6a5b9cdcbb87159bee2d1c6cbb509cb82ce. * Revert "Revert "typo fix"" This reverts commit b67ed80d8dd47c088b6394b27af2efa10530e3d9. * Update food.dm * removing beff and pepperoni * adding onions as juiceable * made drying grapes give you homemade raisins since homemade raisins were already in the code * undo the onionjuice because it crashed my test server * replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge * updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game) * Moved onion rings to the deepfryer instead of microwave * makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries) * made macaroni and cheese names consistent * moved two recipes to oven from microwave * Wine comes from grapes ya dingus * name fix * made burger recipes consistent except for the big bite and super big bites * yaki imo is baked whole sweet potato, not processed! * Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/pizza.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * made food names consistently lower case Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger * Missed one * Back to american mac 'n' cheese spelling * Macaroniiiii Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- code/game/objects/items/weapons/RSF.dm | 2 +- .../food_and_drinks/food/foods/baked_goods.dm | 4 +- .../food_and_drinks/food/foods/bread.dm | 26 ++++----- .../food_and_drinks/food/foods/desserts.dm | 10 ++-- .../food_and_drinks/food/foods/misc.dm | 4 +- .../food_and_drinks/food/foods/pasta.dm | 6 +- .../food_and_drinks/food/foods/pizza.dm | 10 ++-- .../food_and_drinks/food/foods/seafood.dm | 2 +- .../food_and_drinks/food/foods/side_dishes.dm | 2 +- .../food_and_drinks/food/foods/soups.dm | 10 ++-- .../kitchen_machinery/deep_fryer.dm | 12 ++-- .../kitchen_machinery/processor.dm | 8 +-- .../recipes/recipes_microwave.dm | 35 ++---------- .../food_and_drinks/recipes/recipes_oven.dm | 20 +++++++ code/modules/hydroponics/grown/berries.dm | 2 +- .../reagents/chemistry/reagents/food.dm | 53 +----------------- .../reagents/chemistry/recipes/drinks.dm | 4 +- .../reagents/chemistry/recipes/food.dm | 52 +++++------------ icons/obj/food/food.dmi | Bin 101673 -> 101673 bytes 19 files changed, 96 insertions(+), 166 deletions(-) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 26cef27a0b4..ef0fd7b01c8 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -30,7 +30,7 @@ RSF configured_items[++configured_items.len] = list("Snack - Newdles", 4000, /obj/item/reagent_containers/food/snacks/chinese/newdles) configured_items[++configured_items.len] = list("Snack - Donut", 4000, /obj/item/reagent_containers/food/snacks/donut) configured_items[++configured_items.len] = list("Snack - Chicken Soup", 4000, /obj/item/reagent_containers/food/drinks/chicken_soup) - configured_items[++configured_items.len] = list("Snack - Turkey Burger", 4000, /obj/item/reagent_containers/food/snacks/tofuburger) + configured_items[++configured_items.len] = list("Snack - Tofu Burger", 4000, /obj/item/reagent_containers/food/snacks/tofuburger) /obj/item/rsf/attackby(obj/item/W as obj, mob/user as mob, params) ..() 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 c9270076d68..cf080c449b9 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -36,7 +36,7 @@ /obj/item/reagent_containers/food/snacks/braincakeslice name = "brain cake slice" - desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." + desc = "Lemme tell you something about brains. THEY'RE DELICIOUS." icon_state = "braincakeslice" trash = /obj/item/trash/plate filling_color = "#E6AEDB" @@ -310,7 +310,7 @@ reagents.add_reagent("omnizine", 5) /obj/item/reagent_containers/food/snacks/xemeatpie - name = "Xeno-pie" + name = "xeno-pie" icon_state = "xenomeatpie" desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 55255658233..47c185c3ff0 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -54,7 +54,7 @@ list_reagents = list("toxin" = 2) /obj/item/reagent_containers/food/snacks/sliceable/bananabread - name = "Banana-nut bread" + name = "banana-nut bread" desc = "A heavenly and filling treat." icon_state = "bananabread" slice_path = /obj/item/reagent_containers/food/snacks/bananabreadslice @@ -64,7 +64,7 @@ tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/bananabreadslice - name = "Banana-nut bread slice" + name = "banana-nut bread slice" desc = "A slice of delicious banana bread." icon_state = "bananabreadslice" trash = /obj/item/trash/plate @@ -72,7 +72,7 @@ tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/sliceable/tofubread - name = "Tofubread" + name = "tofubread" icon_state = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." icon_state = "tofubread" slice_path = /obj/item/reagent_containers/food/snacks/tofubreadslice @@ -82,14 +82,14 @@ tastes = list("bread" = 10, "tofu" = 10) /obj/item/reagent_containers/food/snacks/tofubreadslice - name = "Tofubread slice" + name = "tofubread slice" desc = "A slice of delicious tofubread." icon_state = "tofubreadslice" trash = /obj/item/trash/plate filling_color = "#F7FFE0" /obj/item/reagent_containers/food/snacks/sliceable/bread - name = "Bread" + name = "bread" icon_state = "Some plain old Earthen bread." icon_state = "bread" slice_path = /obj/item/reagent_containers/food/snacks/breadslice @@ -99,7 +99,7 @@ tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/breadslice - name = "Bread slice" + name = "bread slice" desc = "A slice of home." icon_state = "breadslice" trash = /obj/item/trash/plate @@ -108,7 +108,7 @@ tastes = list("bread" = 10) /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread - name = "Cream Cheese Bread" + name = "cream cheese bread" desc = "Yum yum yum!" icon_state = "creamcheesebread" slice_path = /obj/item/reagent_containers/food/snacks/creamcheesebreadslice @@ -118,7 +118,7 @@ tastes = list("bread" = 10, "cheese" = 10) /obj/item/reagent_containers/food/snacks/creamcheesebreadslice - name = "Cream Cheese Bread slice" + name = "cream cheese bread slice" desc = "A slice of yum!" icon_state = "creamcheesebreadslice" trash = /obj/item/trash/plate @@ -158,7 +158,7 @@ tastes = list("bread" = 2) /obj/item/reagent_containers/food/snacks/twobread - name = "Two Bread" + name = "two bread" desc = "It is very bitter and winy." icon_state = "twobread" filling_color = "#DBCC9A" @@ -167,16 +167,16 @@ tastes = list("bread" = 2) /obj/item/reagent_containers/food/snacks/toast - name = "Toast" + name = "toast" desc = "Yeah! Toast!" icon_state = "toast" filling_color = "#B2580E" bitesize = 3 - list_reagents = list("nutriment" = 3) + list_reagents = list("nutriment" = 3) tastes = list("toast" = 2) /obj/item/reagent_containers/food/snacks/jelliedtoast - name = "Jellied Toast" + name = "jellied toast" desc = "A slice of bread covered with delicious jam." icon_state = "jellytoast" trash = /obj/item/trash/plate @@ -191,7 +191,7 @@ list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2) /obj/item/reagent_containers/food/snacks/rofflewaffles - name = "Roffle Waffles" + name = "roffle waffles" desc = "Waffles from Roffle. Co." icon_state = "rofflewaffles" trash = /obj/item/trash/waffles diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm index 67034e164ce..4acdaefe284 100644 --- a/code/modules/food_and_drinks/food/foods/desserts.dm +++ b/code/modules/food_and_drinks/food/foods/desserts.dm @@ -50,13 +50,13 @@ ////////////////////// /obj/item/reagent_containers/food/snacks/friedbanana - name = "Fried Banana" + name = "fried banana" desc = "Goreng Pisang, also known as fried bananas." icon_state = "friedbanana" list_reagents = list("sugar" = 5, "nutriment" = 8, "cornoil" = 4) /obj/item/reagent_containers/food/snacks/ricepudding - name = "Rice Pudding" + name = "rice pudding" desc = "Where's the Jam!" icon_state = "rpudding" trash = /obj/item/trash/snack_bowl @@ -65,7 +65,7 @@ tastes = list("rice" = 1, "sweetness" = 1) /obj/item/reagent_containers/food/snacks/spacylibertyduff - name = "Spacy Liberty Duff" + name = "spacy liberty duff" desc = "Jello gelatin, from Alfred Hubbard's cookbook." icon_state = "spacylibertyduff" trash = /obj/item/trash/snack_bowl @@ -75,7 +75,7 @@ tastes = list("jelly" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/amanitajelly - name = "Amanita Jelly" + name = "amanita jelly" desc = "Looks curiously toxic." icon_state = "amanitajelly" trash = /obj/item/trash/snack_bowl @@ -85,7 +85,7 @@ tastes = list("jelly" = 1, "mushroom" = 1) /obj/item/reagent_containers/food/snacks/candiedapple - name = "Candied Apple" + name = "candied apple" desc = "An apple coated in sugary sweetness." icon_state = "candiedapple" filling_color = "#F21873" diff --git a/code/modules/food_and_drinks/food/foods/misc.dm b/code/modules/food_and_drinks/food/foods/misc.dm index 1fcd4a52c18..00cffaa9301 100644 --- a/code/modules/food_and_drinks/food/foods/misc.dm +++ b/code/modules/food_and_drinks/food/foods/misc.dm @@ -64,7 +64,7 @@ ////////////////////// /obj/item/reagent_containers/food/snacks/aesirsalad - name = "Aesir salad" + name = "aesir salad" desc = "Probably too incredible for mortal men to fully enjoy." icon_state = "aesirsalad" trash = /obj/item/trash/snack_bowl @@ -154,7 +154,7 @@ tastes = list("jelly" = 3) /obj/item/reagent_containers/food/snacks/popcorn - name = "Popcorn" + name = "popcorn" desc = "Now let's find some cinema." icon_state = "popcorn" trash = /obj/item/trash/popcorn diff --git a/code/modules/food_and_drinks/food/foods/pasta.dm b/code/modules/food_and_drinks/food/foods/pasta.dm index 5ba56146560..eaa470e2783 100644 --- a/code/modules/food_and_drinks/food/foods/pasta.dm +++ b/code/modules/food_and_drinks/food/foods/pasta.dm @@ -58,7 +58,7 @@ tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1) /obj/item/reagent_containers/food/snacks/spesslaw - name = "Spesslaw" + name = "spesslaw" desc = "A lawyer's favourite." icon = 'icons/obj/food/pasta.dmi' icon_state = "spesslaw" @@ -67,7 +67,7 @@ tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2) /obj/item/reagent_containers/food/snacks/macncheese - name = "mac n cheese" + name = "mac 'n' cheese" desc = "One of the most comforting foods in the world. Apparently." trash = /obj/item/trash/snack_bowl icon = 'icons/obj/food/pasta.dmi' @@ -77,7 +77,7 @@ tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1) /obj/item/reagent_containers/food/snacks/lasagna - name = "Lasagna" + name = "lasagna" desc = "Tajara love to eat this, for some reason." icon = 'icons/obj/food/pasta.dmi' icon_state = "lasagna" diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index d0c17648fed..50b270d1bbe 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -76,7 +76,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "carrot" = 1, "vegetables" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza - name = "Hawaiian pizza" + name = "hawaiian pizza" desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple." icon_state = "hawaiianpizza" //NEEDED slice_path = /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice @@ -84,7 +84,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1) /obj/item/reagent_containers/food/snacks/hawaiianpizzaslice - name = "Hawaiian pizza slice" + name = "hawaiian pizza slice" desc = "A slice of polarising pizza." icon = 'icons/obj/food/pizza.dmi' icon_state = "hawaiianpizzaslice" @@ -92,7 +92,7 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza - name = "mac n cheese pizza" + name = "mac 'n' cheese pizza" desc = "Gastronomists have yet to classify this dish as 'pizza'." icon_state = "macpizza" slice_path = /obj/item/reagent_containers/food/snacks/macpizzaslice @@ -101,8 +101,8 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1) /obj/item/reagent_containers/food/snacks/macpizzaslice - name = "mac n cheese pizza slice" - desc = "A delicious slice of pizza topped with macaroni cheese... wait, what the hell? Who would do this?!" + name = "mac 'n' cheese pizza slice" + desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!" icon = 'icons/obj/food/pizza.dmi' icon_state = "macpizzaslice" filling_color = "#ffe45d" diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm index d4134ebe516..0edb18df72f 100644 --- a/code/modules/food_and_drinks/food/foods/seafood.dm +++ b/code/modules/food_and_drinks/food/foods/seafood.dm @@ -61,7 +61,7 @@ tastes = list("bun" = 4, "fish" = 4) /obj/item/reagent_containers/food/snacks/cubancarp - name = "Cuban carp" + name = "cuban carp" desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" icon = 'icons/obj/food/seafood.dmi' icon_state = "cubancarp" diff --git a/code/modules/food_and_drinks/food/foods/side_dishes.dm b/code/modules/food_and_drinks/food/foods/side_dishes.dm index e90bf4827cf..df31cc51c86 100644 --- a/code/modules/food_and_drinks/food/foods/side_dishes.dm +++ b/code/modules/food_and_drinks/food/foods/side_dishes.dm @@ -17,7 +17,7 @@ ////////////////////// /obj/item/reagent_containers/food/snacks/fries - name = "Space fries" + name = "space fries" desc = "AKA: French Fries, Freedom Fries, etc." icon_state = "fries" trash = /obj/item/trash/plate diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm index 9b07945f424..17b70a26308 100644 --- a/code/modules/food_and_drinks/food/foods/soups.dm +++ b/code/modules/food_and_drinks/food/foods/soups.dm @@ -75,7 +75,7 @@ reagents.add_reagent("[extra_reagent]", 5) /obj/item/reagent_containers/food/snacks/wishsoup - name = "Wish Soup" + name = "wish soup" desc = "I wish this was soup." icon_state = "wishsoup" trash = /obj/item/trash/snack_bowl @@ -101,14 +101,14 @@ list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3) tastes = list("tomato" = 1) -/obj/item/reagent_containers/food/snacks/milosoup - name = "milosoup" +/obj/item/reagent_containers/food/snacks/misosoup + name = "miso soup" desc = "The universe's best soup! Yum!!!" - icon_state = "milosoup" + icon_state = "misosoup" trash = /obj/item/trash/snack_bowl bitesize = 5 list_reagents = list("nutriment" = 7, "vitamin" = 2) - tastes = list("milo" = 1) + tastes = list("miso" = 1) /obj/item/reagent_containers/food/snacks/mushroomsoup name = "chantrelle soup" diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 14089cfb671..40b76258007 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -103,9 +103,9 @@ input = /obj/item/reagent_containers/food/snacks/grown/banana output = /obj/item/reagent_containers/food/snacks/friedbanana -/datum/deepfryer_special/potato_chips +/datum/deepfryer_special/fries input = /obj/item/reagent_containers/food/snacks/rawsticks - output = /obj/item/reagent_containers/food/snacks/chips + output = /obj/item/reagent_containers/food/snacks/fries /datum/deepfryer_special/corn_chips input = /obj/item/reagent_containers/food/snacks/grown/corn @@ -119,14 +119,18 @@ input = /obj/item/reagent_containers/food/snacks/burrito output = /obj/item/reagent_containers/food/snacks/chimichanga -/datum/deepfryer_special/fries +/datum/deepfryer_special/potato_chips input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges - output = /obj/item/reagent_containers/food/snacks/fries + output = /obj/item/reagent_containers/food/snacks/chips /datum/deepfryer_special/carrotfries input = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges output = /obj/item/reagent_containers/food/snacks/carrotfries +/datum/deepfryer_special/onionrings + input = /obj/item/reagent_containers/food/snacks/onion_slice + output = /obj/item/reagent_containers/food/snacks/onionrings + /datum/deepfryer_special/fried_vox input = /obj/item/organ/external output = /obj/item/reagent_containers/food/snacks/fried_vox diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 6891ab578bc..cd0a5d295ef 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -68,12 +68,12 @@ input = /obj/item/reagent_containers/food/snacks/meat output = /obj/item/reagent_containers/food/snacks/meatball -/datum/food_processor_process/sweetpotato - input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet - output = /obj/item/reagent_containers/food/snacks/yakiimo - /datum/food_processor_process/potato input = /obj/item/reagent_containers/food/snacks/grown/potato + output = /obj/item/reagent_containers/food/snacks/rawsticks + +/datum/food_processor_process/rawsticks + input = /obj/item/reagent_containers/food/snacks/rawsticks output = /obj/item/reagent_containers/food/snacks/tatortot /datum/food_processor_process/soybeans diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index df22e612830..2214e44b772 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -134,7 +134,8 @@ /datum/recipe/microwave/cheeseburger items = list( - /obj/item/reagent_containers/food/snacks/monkeyburger, + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/reagent_containers/food/snacks/cheeseburger @@ -253,14 +254,14 @@ /datum/recipe/microwave/spellburger items = list( - /obj/item/reagent_containers/food/snacks/monkeyburger, + /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/wizard/fake, ) result = /obj/item/reagent_containers/food/snacks/spellburger /datum/recipe/microwave/spellburger items = list( - /obj/item/reagent_containers/food/snacks/monkeyburger, + /obj/item/reagent_containers/food/snacks/bun, /obj/item/clothing/head/wizard, ) result = /obj/item/reagent_containers/food/snacks/spellburger @@ -310,12 +311,6 @@ ) result = /obj/item/reagent_containers/food/snacks/sandwich -/datum/recipe/microwave/toastedsandwich - items = list( - /obj/item/reagent_containers/food/snacks/sandwich - ) - result = /obj/item/reagent_containers/food/snacks/toastedsandwich - /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) @@ -342,7 +337,7 @@ ) result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry -/datum/recipe/microwave/milosoup +/datum/recipe/microwave/misosoup reagents = list("water" = 10) items = list( /obj/item/reagent_containers/food/snacks/soydope, @@ -350,7 +345,7 @@ /obj/item/reagent_containers/food/snacks/tofu, /obj/item/reagent_containers/food/snacks/tofu, ) - result = /obj/item/reagent_containers/food/snacks/milosoup + result = /obj/item/reagent_containers/food/snacks/misosoup /datum/recipe/microwave/stewedsoymeat items = list(/obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope, @@ -555,10 +550,6 @@ being_cooked.reagents.del_reagent("toxin") return being_cooked -/datum/recipe/microwave/onionrings - items = list(/obj/item/reagent_containers/food/snacks/onion_slice) - result = /obj/item/reagent_containers/food/snacks/onionrings - ////////////////////////////FOOD ADDITTIONS/////////////////////////////// /datum/recipe/microwave/wrap @@ -618,14 +609,6 @@ ) result = /obj/item/reagent_containers/food/snacks/stuffing -/datum/recipe/microwave/tofurkey - items = list( - /obj/item/reagent_containers/food/snacks/tofu, - /obj/item/reagent_containers/food/snacks/tofu, - /obj/item/reagent_containers/food/snacks/stuffing, - ) - result = /obj/item/reagent_containers/food/snacks/tofurkey - /datum/recipe/microwave/boiledspiderleg reagents = list("water" = 10) items = list( @@ -666,12 +649,6 @@ ) result = /obj/item/reagent_containers/food/snacks/taco -/datum/recipe/microwave/fries - items = list( - /obj/item/reagent_containers/food/snacks/rawsticks - ) - result = /obj/item/reagent_containers/food/snacks/fries - /datum/recipe/microwave/mint_2 reagents = list("sugar" = 5, "frostoil" = 5) result = /obj/item/reagent_containers/food/snacks/mint diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 1a4b7f387a1..5fc2b6d8c25 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -163,6 +163,12 @@ ) result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato +/datum/recipe/oven/yakiimo + items = list( + /obj/item/reagent_containers/food/snacks/grown/potato/sweet + ) + result = /obj/item/reagent_containers/food/snacks/yakiimo + ////cookies by Ume /datum/recipe/oven/cookies @@ -457,6 +463,12 @@ ) result = /obj/item/reagent_containers/food/snacks/flatbread +/datum/recipe/oven/toastedsandwich + items = list( + /obj/item/reagent_containers/food/snacks/sandwich + ) + result = /obj/item/reagent_containers/food/snacks/toastedsandwich + /datum/recipe/oven/turkey // Magic items = list( /obj/item/reagent_containers/food/snacks/meat, @@ -468,6 +480,14 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/turkey +/datum/recipe/oven/tofurkey + items = list( + /obj/item/reagent_containers/food/snacks/tofu, + /obj/item/reagent_containers/food/snacks/tofu, + /obj/item/reagent_containers/food/snacks/stuffing, + ) + result = /obj/item/reagent_containers/food/snacks/tofurkey + /datum/recipe/oven/lasagna items = list( /obj/item/reagent_containers/food/snacks/meat, diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 9682b5ba19f..5a383049f21 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -181,7 +181,7 @@ name = "bunch of grapes" desc = "Nutritious!" icon_state = "grapes" - dried_type = /obj/item/reagent_containers/food/snacks/no_raisin + dried_type = /obj/item/reagent_containers/food/snacks/no_raisin/healthy filling_color = "#FF1493" bitesize_mod = 2 tastes = list("grapes" = 1) diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index 966e8ae93eb..a0550221029 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -404,9 +404,9 @@ qdel(hotspot) /datum/reagent/consumable/enzyme - name = "Denatured Enzyme" + name = "Universal Enzyme" id = "enzyme" - description = "Heated beyond usefulness, this enzyme is now worthless." + description = "A special catalyst that makes certain culinary chemical reactions happen instantly instead of taking hours or days." reagent_state = LIQUID color = "#282314" // rgb: 54, 94, 48 taste_description = "sweetness" @@ -436,7 +436,7 @@ /datum/reagent/consumable/hell_ramen name = "Hell Ramen" id = "hell_ramen" - description = "The noodles are boiled, the flavors are artificial, just like being back in school." + description = "The noodles are boiled, the flavors are artificial, just like being back in school...IN HELL" reagent_state = LIQUID nutriment_factor = 5 * REAGENTS_METABOLISM color = "#302000" // rgb: 48, 32, 0 @@ -791,53 +791,6 @@ color = "#B4641B" taste_description = "gravy" -/datum/reagent/consumable/beff - name = "Beff" - id = "beff" - description = "An advanced blend of mechanically-recovered meat and textured synthesized protein product notable for its unusual crystalline grain when sliced." - reagent_state = SOLID - color = "#AC7E67" - taste_description = "meat" - -/datum/reagent/consumable/beff/on_mob_life(mob/living/M) - if(prob(5)) - M.reagents.add_reagent("cholesterol", rand(1,3)) - if(prob(8)) - M.reagents.add_reagent(pick("blood", "corn_syrup", "synthflesh", "hydrogenated_soybeanoil", "porktonium", "toxic_slurry"), 0.8) - else if(prob(6)) - to_chat(M, "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]") - M.emote(pick("groan","moan")) - return ..() - -/datum/reagent/consumable/pepperoni - name = "Pepperoni" - id = "pepperoni" - description = "An Italian-American variety of salami usually made from beef and pork" - reagent_state = SOLID - color = "#AC7E67" - taste_description = "pepperoni" - -/datum/reagent/consumable/pepperoni/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) - if(method == REAGENT_TOUCH) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - - if(H.wear_mask) - to_chat(H, "The pepperoni bounces off your mask!") - return - - if(H.head) - to_chat(H, "Your mask protects you from the errant pepperoni!") - return - - if(prob(50)) - M.adjustBruteLoss(1) - playsound(M, 'sound/effects/woodhit.ogg', 50, 1) - to_chat(M, "A slice of pepperoni slaps you!") - else - M.emote("burp") - to_chat(M, "My goodness, that was tasty!") - ///Food Related, but non-nutritious diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index ab326d9d9ca..d821175eda2 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -93,7 +93,7 @@ name = "Wine" id = "wine" result = "wine" - required_reagents = list("berryjuice" = 10) + required_reagents = list("grapejuice" = 10) required_catalysts = list("enzyme" = 5) result_amount = 10 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' @@ -868,7 +868,7 @@ required_reagents = list("hooch" = 1, "absinthe" = 1, "manlydorf" = 1, "syndicatebomb" = 1) result_amount = 4 mix_message = "The mixture turns to a sickening froth." - + /datum/chemical_reaction/icecoco name = "Iced Cocoa" id = "icecoco" diff --git a/code/modules/reagents/chemistry/recipes/food.dm b/code/modules/reagents/chemistry/recipes/food.dm index 5b5efc105d6..d9c0e0727aa 100644 --- a/code/modules/reagents/chemistry/recipes/food.dm +++ b/code/modules/reagents/chemistry/recipes/food.dm @@ -82,13 +82,6 @@ required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) result_amount = 6 -/datum/chemical_reaction/doughball - name = "Ball of dough" - id = "dough_ball" - result = "dough_ball" - required_reagents = list("flour" = 15, "water" = 5) - required_catalysts = list("enzyme" = 5) - /datum/chemical_reaction/dough name = "Dough" id = "dough" @@ -145,30 +138,31 @@ mix_message = "The mixture begins to fizz." mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' -/datum/chemical_reaction/cheese - name = "cheese" - id = "cheese" - result = "cheese" - required_reagents = list("vomit" = 1, "milk" = 1) - result_amount = 1 +/datum/chemical_reaction/fake_cheese + name = "Fake cheese" + id = "fake_cheese" + result = "fake_cheese" + required_reagents = list("vomit" = 5, "milk" = 5) + result_amount = 5 mix_message = "The mixture curdles up." /datum/chemical_reaction/cheese/on_reaction(datum/reagents/holder) var/turf/T = get_turf(holder.my_atom) - T.visible_message("A faint cheesy smell drifts through the air...") + T.visible_message("A faint cheese-ish smell drifts through the air...") /datum/chemical_reaction/weird_cheese name = "Weird cheese" id = "weird_cheese" - result = "weird_cheese" - required_reagents = list("green_vomit" = 1, "milk" = 1) + result = null + required_reagents = list("green_vomit" = 5, "milk" = 5) result_amount = 1 mix_message = "The disgusting mixture sloughs together horribly, emitting a foul stench." mix_sound = 'sound/goonstation/misc/gurggle.ogg' -/datum/chemical_reaction/weird_cheese/on_reaction(datum/reagents/holder) - var/turf/T = get_turf(holder.my_atom) - T.visible_message("A horrible smell assaults your nose! What in space is it?") +/datum/chemical_reaction/weird_cheese/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i in 1 to created_volume) + new /obj/item/reagent_containers/food/snacks/weirdcheesewedge(location) /datum/chemical_reaction/hydrogenated_soybeanoil name = "Partially hydrogenated space-soybean oil" @@ -197,24 +191,6 @@ min_temp = T0C + 100 mix_message = "The substance thickens and takes on a meaty odor." -/datum/chemical_reaction/beff - name = "Beff" - id = "beff" - result = "beff" - required_reagents = list("hydrogenated_soybeanoil" = 2, "meatslurry" = 1, "plasma" = 1) - result_amount = 4 - mix_message = "The mixture solidifies, taking a crystalline appearance." - mix_sound = 'sound/effects/blobattack.ogg' - -/datum/chemical_reaction/pepperoni - name = "Pepperoni" - id = "pepperoni" - result = "pepperoni" - required_reagents = list("beff" = 1, "saltpetre" = 1, "synthflesh" = 1) - result_amount = 2 - mix_message = "The beff and the synthflesh combine to form a smoky red log." - mix_sound = 'sound/effects/blobattack.ogg' - /datum/chemical_reaction/enzyme name = "Universal enzyme" id = "enzyme" @@ -225,7 +201,7 @@ mix_message = "The mixture emits a horrible smell as you heat up the contents. Luckily, enzymes don't stink." mix_sound = 'sound/goonstation/misc/fuse.ogg' -/datum/chemical_reaction/enzyme +/datum/chemical_reaction/enzyme2 name = "Universal enzyme" id = "enzyme" result = "enzyme" diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index e0b815edf60718da3c25d7fc410974dce14a8967..aad271e4f7687b4ad5b15f8ba22b254658fd79d7 100644 GIT binary patch delta 34 qcmZ2Ei*4mBwhh6|jKP~jnC+N2>`Ij%U&uVr*F1}L`z%(*{&oP}Yz+