diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm index aebe2204e8b..05efe26bd99 100644 --- a/code/modules/hydroponics/grown/herbals.dm +++ b/code/modules/hydroponics/grown/herbals.dm @@ -4,19 +4,27 @@ icon_state = "seed-cabbage" species = "cabbage" plantname = "comfrey" - product = /obj/item/weapon/grown/holder_spawner/comfrey - yield = 4 + product = /obj/item/weapon/reagent_containers/food/snacks/grown/comfrey + yield = 2 maturation = 3 growthstages = 1 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' + reagents_add = list("nutriment" = 0.1) -/obj/item/weapon/grown/holder_spawner/comfrey +/obj/item/weapon/reagent_containers/food/snacks/grown/comfrey seed = /obj/item/seeds/comfrey - spawned_thing = /obj/item/stack/medical/bruise_pack/comfrey + name = "comfrey leaf" + desc = "Mash to turn into a poultice." + icon_state = "tea_astra_leaves" + color = "#378C61" + bitesize_mod = 2 -/obj/item/weapon/grown/holder_spawner/comfrey/alter_stats(obj/item/stack/medical/bruise_pack/comfrey/C) +/obj/item/weapon/reagent_containers/food/snacks/grown/comfrey/attack_self(mob/user) + var/obj/item/stack/medical/bruise_pack/comfrey/C = new(get_turf(user)) C.heal_brute = seed.potency - + to_chat(user, "You mash [src] into a poultice.") + user.drop_item() + qdel(src) /obj/item/seeds/aloe name = "pack of aloe seeds" @@ -24,13 +32,22 @@ icon_state = "seed-ambrosiavulgaris" species = "ambrosiavulgaris" plantname = "Aloe Vera Plant" - product = /obj/item/weapon/grown/holder_spawner/aloe - yield = 4 + product = /obj/item/weapon/reagent_containers/food/snacks/grown/aloe + yield = 2 icon_dead = "ambrosia-dead" + reagents_add = list("nutriment" = 0.1) -/obj/item/weapon/grown/holder_spawner/aloe +/obj/item/weapon/reagent_containers/food/snacks/grown/aloe seed = /obj/item/seeds/aloe - spawned_thing = /obj/item/stack/medical/ointment/aloe + name = "aloe leaf" + desc = "Mash to turn into a poultice." + icon_state = "ambrosiavulgaris" + color = "#4CC5C7" + bitesize_mod = 2 -/obj/item/weapon/grown/holder_spawner/aloe/alter_stats(obj/item/stack/medical/ointment/aloe/A) - A.heal_burn = seed.potency \ No newline at end of file +/obj/item/weapon/reagent_containers/food/snacks/grown/aloe/attack_self(mob/user) + var/obj/item/stack/medical/ointment/aloe/A = new(get_turf(user)) + A.heal_burn = seed.potency + to_chat(user, "You mash [src] into a poultice.") + user.drop_item() + qdel(src) \ No newline at end of file diff --git a/code/modules/hydroponics/grown/nymph.dm b/code/modules/hydroponics/grown/nymph.dm index 39807f670c2..b1868f10a11 100644 --- a/code/modules/hydroponics/grown/nymph.dm +++ b/code/modules/hydroponics/grown/nymph.dm @@ -4,13 +4,23 @@ icon_state = "seed-replicapod" species = "replicapod" plantname = "Nymph Pod" - product = /obj/item/weapon/grown/holder_spawner/nymph + product = /obj/item/weapon/reagent_containers/food/snacks/grown/nymph_pod lifespan = 50 endurance = 8 maturation = 10 production = 1 yield = 1 + reagents_add = list("nutriment" = 0.1) -/obj/item/weapon/grown/holder_spawner/nymph +/obj/item/weapon/reagent_containers/food/snacks/grown/nymph_pod seed = /obj/item/seeds/nymph - spawned_thing = /mob/living/simple_animal/diona \ No newline at end of file + name = "nymph pod" + desc = "A peculiar wriggling pod with a grown nymph inside. Crack it open to let the nymph out." + icon_state = "mushy" + bitesize_mod = 2 + +/obj/item/weapon/reagent_containers/food/snacks/grown/nymph_pod/attack_self(mob/user) + new /mob/living/simple_animal/diona(get_turf(user)) + to_chat(user, "You crack open [src] letting the nymph out.") + user.drop_item() + qdel(src) \ No newline at end of file diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 954232f3097..64d2eff90b7 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -58,19 +58,4 @@ if(!..()) //was it caught by a mob? if(seed) for(var/datum/plant_gene/trait/T in seed.genes) - T.on_throw_impact(src, hit_atom) - - -//For if You want to spawn something that is a non-grown and alter it stats - -/obj/item/weapon/grown/holder_spawner - var/atom/spawned_thing = null - -/obj/item/weapon/grown/holder_spawner/proc/alter_stats(atom/A) - return - -/obj/item/weapon/grown/holder_spawner/New() - ..() - var/atom/thing = new spawned_thing(loc) - alter_stats(thing) - qdel(src) \ No newline at end of file + T.on_throw_impact(src, hit_atom) \ No newline at end of file