diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 71ba5dfe41..9cf5ea31a0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -337,7 +337,7 @@ name = "Chocolate Strawberry" reqs = list( /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberries = 1 + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry subcategory = CAT_MISCFOOD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index f3675ccb0d..931a78212f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -329,7 +329,7 @@ datum/crafting_recipe/food/donut/meat name = "Strawberry cherry cupcake" reqs = list( /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberries = 1 + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/strawberrycupcake subcategory = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm index a0a225c44f..81824dc4b8 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -164,7 +164,7 @@ name = "Strawberry pie" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberries = 1 + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie subcategory = CAT_PIE diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index d24160ad6f..e9ad49eedd 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -217,20 +217,20 @@ distill_reagent = "cognac" // Strawberry -/obj/item/seeds/strawberries - name = "pack of strawberrie seeds" - desc = "These seeds grow into strawberries vines." +/obj/item/seeds/strawberry + name = "pack of strawberry seeds" + desc = "These seeds grow into strawberry vines." icon_state = "seed-strawberry" species = "strawberry" plantname = "Strawberry Vine" - product = /obj/item/reagent_containers/food/snacks/grown/strawberries + product = /obj/item/reagent_containers/food/snacks/grown/strawberry reagents_add = list("vitamin" = 0.07, "nutriment" = 0.1, "sugar" = 0.2) mutatelist = list() -/obj/item/reagent_containers/food/snacks/grown/strawberries - seed = /obj/item/seeds/strawberries +/obj/item/reagent_containers/food/snacks/grown/strawberry + seed = /obj/item/seeds/strawberry name = "strawberry" - icon_state = "strawberries" + icon_state = "strawberry" filling_color = "#7FFF00" tastes = list("strawberries" = 1) wine_power = 20 diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 4e1718f853..f1aea5706a 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -25,6 +25,7 @@ slot_flags = ITEM_SLOT_HEAD filling_color = "#FF6347" bitesize_mod = 3 + tastes = list("sesame seeds" = 1) foodtype = VEGETABLES | GROSS distill_reagent = "vermouth" @@ -43,6 +44,7 @@ name = "lily" desc = "A beautiful orange flower." icon_state = "lily" + tastes = list("pelts " = 1) filling_color = "#FFA500" // Geranium @@ -61,6 +63,7 @@ desc = "A beautiful blue flower." icon_state = "geranium" filling_color = "#008B8B" + tastes = list("pelts " = 1) // Harebell /obj/item/seeds/harebell @@ -86,6 +89,7 @@ name = "harebell" desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\"" icon_state = "harebell" + tastes = list("salt" = 1) slot_flags = ITEM_SLOT_HEAD filling_color = "#E6E6FA" bitesize_mod = 3 @@ -123,6 +127,7 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 1 throw_range = 3 + tastes = list("seeds" = 1) /obj/item/grown/sunflower/attack(mob/M, mob/user) to_chat(M, " [user] smacks you with a sunflower!FLOWER POWER") @@ -153,6 +158,7 @@ filling_color = "#E6E6FA" bitesize_mod = 2 distill_reagent = "absinthe" //It's made from flowers. + tastes = list("glowbugs" = 1) // Novaflower /obj/item/seeds/sunflower/novaflower @@ -184,6 +190,7 @@ throw_range = 3 attack_verb = list("roasted", "scorched", "burned") grind_results = list("capsaicin" = 0, "condensedcapsaicin" = 0) + tastes = list("cooked sunflower" = 1) /obj/item/grown/novaflower/add_juice() ..() diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 5aeef19b1a..c0e3beaf79 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -7,6 +7,7 @@ icon = 'icons/obj/hydroponics/harvest.dmi' resistance_flags = FLAMMABLE var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item. + var/tastes = list("indescribable" = 1) //Stops runtimes. Grown are un-eatable anyways so if you do then its a bug /obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed) . = ..() diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index ddf3835f4a..b1b69a8cd2 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -34,7 +34,7 @@ /obj/item/seeds/soya = 3, /obj/item/seeds/sugarcane = 3, /obj/item/seeds/sunflower = 3, - /obj/item/seeds/strawberries = 3, + /obj/item/seeds/strawberry = 3, /obj/item/seeds/tea = 3, /obj/item/seeds/tobacco = 3, /obj/item/seeds/tomato = 3,