diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index df5dfe8aca..79a3b7a931 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -962,6 +962,23 @@ plant_type = 0 growthstages = 5 +/obj/item/seeds/cherryseed + name = "pack of cherry pits" + desc = "Careful not to crack a tooth on one... That'd be the pits." + icon_state = "seed-cherry" + mypath = "/obj/item/seeds/cherryseed" + species = "cherry" + plantname = "Cherry Tree" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/cherries" + lifespan = 35 + endurance = 35 + maturation = 5 + production = 5 + yield = 3 + potency = 10 + plant_type = 0 + growthstages = 5 + /* // Maybe one day when I get it to work like a grenade which exlodes gibs. /obj/item/seeds/gibtomatoseed name = "Gib Tomato seeds" diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 8745dfc04b..db293e2203 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -101,6 +101,17 @@ reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) bitesize = 1+round(reagents.total_volume / 2, 1) +/obj/item/weapon/reagent_containers/food/snacks/grown/cherries + seed = "/obj/item/seeds/cherryseed" + name = "cherries" + desc = "Great for toppings!" + icon_state = "cherry" + New() + ..() + spawn(5) //So potency can be set in the proc that creates these crops + reagents.add_reagent("nutriment", 1+round((potency / 15), 1)) + reagents.add_reagent("sugar", 1+round((potency / 15), 1)) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/poppy seed = "/obj/item/seeds/poppyseed" diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 00cafff2a4..96a52e24cc 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 07e31c3882..e45d28d3c2 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index fb401ecc6a..f2addb36ae 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 5be48b640b..75d70969e9 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 494401b975..c8a88ee9de 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ