diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 25be1aabfea..840d431bfa5 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -432,6 +432,18 @@ . = ..() AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/sushi/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6) +/obj/item/food/seaweedsheet/saltcane + name = "dried saltcane sheathe" + desc = "A dried sheet of saltcane sheathe can used for making sushi. Use an ingredient on it to start making custom sushi!" + icon_state = "seaweedsheet" + food_reagents = list( + /datum/reagent/consumable/nutriment = 1, + /datum/reagent/consumable/nutriment/vitamin = 1, + ) + tastes = list("seaweed" = 1) + foodtypes = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + /obj/item/food/granola_bar name = "granola bar" desc = "A dried mixture of oats, nuts, fruits, and chocolate condensed into a chewy bar. Makes a great snack while space-hiking." diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm index a4c03cf6b53..fb827377114 100644 --- a/code/modules/hydroponics/grown/beans.dm +++ b/code/modules/hydroponics/grown/beans.dm @@ -14,7 +14,7 @@ icon_grow = "soybean-grow" icon_dead = "soybean-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) - mutatelist = list(/obj/item/seeds/soya/koi) + mutatelist = list(/obj/item/seeds/soya/koi, /obj/item/seeds/soya/butter) reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/consumable/nutriment/fat/oil = 0.03) //Vegetable oil! /obj/item/food/grown/soybeans @@ -26,7 +26,7 @@ foodtypes = VEGETABLES grind_results = list(/datum/reagent/consumable/soymilk = 0) tastes = list("soy" = 1) - wine_power = 20 + distill_reagent = /datum/reagent/consumable/soysauce // Koibean /obj/item/seeds/soya/koi @@ -50,6 +50,38 @@ tastes = list("koi" = 1) wine_power = 40 +//Butterbeans, the beans wid da butta! +// Butterbeans! - Squeeze for a single butter slice! +/obj/item/seeds/soya/butter + name = "pack of butterbean seeds" + desc = "These seeds grow into butterbean plants." + icon_state = "seed-butterbean" + species = "butterbean" + plantname = "butterbean Plants" + product = /obj/item/food/grown/butterbeans + potency = 10 + mutatelist = null + reagents_add = list(/datum/reagent/consumable/milk = 0.05, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/cream = 0.05) + rarity = 20 + +/obj/item/food/grown/butterbeans + seed = /obj/item/seeds/soya/butter + name = "butterbean" + desc = "Soft, creamy and milky... You could almost smear them over toast." + icon_state = "butterbeans" + foodtypes = VEGETABLES | DAIRY + tastes = list("creamy butter" = 1) + distill_reagent = /datum/reagent/consumable/yoghurt + +/obj/item/food/grown/butterbeans/attack_self(mob/living/user) + user.visible_message(span_notice("[user] crushes [src] into a pat of butter."), span_notice("You crush [src] into something that resembles butter.")) + playsound(user, 'sound/effects/blobattack.ogg', 50, TRUE) + var/obj/item/food/butterslice/butties = new(null) + butties.reagents.set_all_reagents_purity(seed.get_reagent_purity()) + qdel(src) + user.put_in_hands(butties) + return TRUE + // Green Beans /obj/item/seeds/greenbean name = "pack of green bean seeds" diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index 1b3a7979cf0..8eab962d751 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -13,7 +13,7 @@ growing_icon = 'icons/obj/service/hydroponics/growing_vegetables.dmi' icon_grow = "corn-grow" // Uses one growth icons set for all the subtypes icon_dead = "corn-dead" // Same for the dead icon - mutatelist = list(/obj/item/seeds/corn/snapcorn) + mutatelist = list(/obj/item/seeds/corn/snapcorn, /obj/item/seeds/corn/pepper) reagents_add = list(/datum/reagent/consumable/nutriment/fat/oil/corn = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) /obj/item/food/grown/corn @@ -97,3 +97,29 @@ seed = /obj/item/seeds/corn/snapcorn name = "snap corn cob" desc = "A reminder of pranks gone by." + +//Pepper-corn - Heh funny. +/obj/item/seeds/corn/pepper + name = "pack of pepper-corn seeds" + desc = "If Peter picked a pack of pepper-corn..." + icon_state = "seed-peppercorn" + species = "peppercorn" + plantname = "Pepper-Corn Stalks" + product = /obj/item/food/grown/peppercorn + mutatelist = null + reagents_add = list(/datum/reagent/consumable/blackpepper = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + +/obj/item/food/grown/peppercorn + seed = /obj/item/seeds/corn/pepper + name = "ear of pepper-peppercorn" + desc = "This dusty monster needs god..." + icon_state = "peppercorn" + trash_type = /obj/item/grown/corncob/pepper + foodtypes = VEGETABLES + grind_results = list(/datum/reagent/consumable/blackpepper = 0) + tastes = list("pepper" = 1, "sneezing" = 1) + +/obj/item/grown/corncob/pepper + seed = /obj/item/seeds/corn/pepper + name = "pepper corn cob" + desc = "A reminder of genetic abominations gone by." diff --git a/code/modules/hydroponics/grown/sugarcane.dm b/code/modules/hydroponics/grown/sugarcane.dm index 9a1646443dc..be2214ca1d0 100644 --- a/code/modules/hydroponics/grown/sugarcane.dm +++ b/code/modules/hydroponics/grown/sugarcane.dm @@ -15,7 +15,7 @@ instability = 15 growthstages = 2 reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/sugar = 0.25) - mutatelist = list(/obj/item/seeds/bamboo) + mutatelist = list(/obj/item/seeds/bamboo, /obj/item/seeds/sugarcane/saltcane) /obj/item/food/grown/sugarcane seed = /obj/item/seeds/sugarcane @@ -56,3 +56,25 @@ /obj/item/grown/log/bamboo/CheckAccepted(obj/item/I) return FALSE + +//Saltcane - Gross, salty shafts! +/obj/item/seeds/sugarcane/saltcane + name = "pack of saltcane seeds" + desc = "These seeds grow into saltcane." + icon_state = "seed-saltcane" + species = "saltcane" + plantname = "Saltcane" + product = /obj/item/food/grown/sugarcane/saltcane + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/salt = 0.25) + mutatelist = null + +/obj/item/food/grown/sugarcane/saltcane + seed = /obj/item/seeds/sugarcane/saltcane + name = "saltcane" + desc = "Ungodly salty, bane of slugs, treasure of horses." + icon_state = "saltcane" + foodtypes = VEGETABLES | GROSS + +/obj/item/food/grown/sugarcane/saltcane/make_dryable() + AddElement(/datum/element/dryable, /obj/item/food/seaweedsheet/saltcane) //soooshi diff --git a/icons/obj/service/hydroponics/growing.dmi b/icons/obj/service/hydroponics/growing.dmi index fcf73899863..aee567daa54 100644 Binary files a/icons/obj/service/hydroponics/growing.dmi and b/icons/obj/service/hydroponics/growing.dmi differ diff --git a/icons/obj/service/hydroponics/growing_vegetables.dmi b/icons/obj/service/hydroponics/growing_vegetables.dmi index bf49c72ba79..30f02e862e0 100644 Binary files a/icons/obj/service/hydroponics/growing_vegetables.dmi and b/icons/obj/service/hydroponics/growing_vegetables.dmi differ diff --git a/icons/obj/service/hydroponics/harvest.dmi b/icons/obj/service/hydroponics/harvest.dmi index f4489b01fa0..b15a34105de 100644 Binary files a/icons/obj/service/hydroponics/harvest.dmi and b/icons/obj/service/hydroponics/harvest.dmi differ diff --git a/icons/obj/service/hydroponics/seeds.dmi b/icons/obj/service/hydroponics/seeds.dmi index db6f93878d0..83008668654 100644 Binary files a/icons/obj/service/hydroponics/seeds.dmi and b/icons/obj/service/hydroponics/seeds.dmi differ