diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 505adf019ed..fdd0d447634 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1064,6 +1064,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/seeds/replicapod, /obj/item/seeds/replicapod, /obj/item/seeds/replicapod, + /obj/item/seeds/nymph, + /obj/item/seeds/nymph, + /obj/item/seeds/nymph, /obj/item/seeds/plump, /obj/item/seeds/liberty, /obj/item/seeds/amanita, diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index efc5016d5c3..2148c339000 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -76,8 +76,8 @@ is_service = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen) - minimal_access = list(access_hydroponics, access_maint_tunnels) + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) + minimal_access = list(access_hydroponics, access_morgue, access_maint_tunnels) alt_titles = list("Hydroponicist", "Botanical Researcher") diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7bf0e0aa520..42e505ad601 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -967,11 +967,11 @@ product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" icon_state = "seeds" - products = list(/obj/item/seeds/ambrosia = 3,/obj/item/seeds/apple = 3,/obj/item/seeds/banana = 3,/obj/item/seeds/berry = 3, + products = list(/obj/item/seeds/aloe =3, /obj/item/seeds/ambrosia = 3,/obj/item/seeds/apple = 3,/obj/item/seeds/banana = 3,/obj/item/seeds/berry = 3, /obj/item/seeds/cabbage = 3,/obj/item/seeds/carrot = 3,/obj/item/seeds/cherry = 3,/obj/item/seeds/chanter = 3, - /obj/item/seeds/chili = 3,/obj/item/seeds/cocoapod = 3,/obj/item/seeds/coffee = 3,/obj/item/seeds/corn = 3, - /obj/item/seeds/eggplant = 3,/obj/item/seeds/grape = 3,/obj/item/seeds/grass = 3,/obj/item/seeds/lemon = 3, - /obj/item/seeds/lime = 3,/obj/item/seeds/orange = 3,/obj/item/seeds/potato = 3,/obj/item/seeds/poppy = 3, + /obj/item/seeds/chili = 3,/obj/item/seeds/cocoapod = 3,/obj/item/seeds/coffee = 3, /obj/item/seeds/comfrey =3, /obj/item/seeds/corn = 3, + /obj/item/seeds/nymph =3, /obj/item/seeds/eggplant = 3,/obj/item/seeds/grape = 3,/obj/item/seeds/grass = 3,/obj/item/seeds/lemon = 3, + /obj/item/seeds/lime = 3,/obj/item/seeds/orange = 3, /obj/item/seeds/peanuts = 3, /obj/item/seeds/potato = 3,/obj/item/seeds/poppy = 3, /obj/item/seeds/pumpkin = 3,/obj/item/seeds/replicapod = 3,/obj/item/seeds/wheat/rice = 3,/obj/item/seeds/soya = 3,/obj/item/seeds/sunflower = 3, /obj/item/seeds/tea = 3,/obj/item/seeds/tobacco = 3,/obj/item/seeds/tomato = 3, /obj/item/seeds/tower = 3,/obj/item/seeds/watermelon = 3,/obj/item/seeds/wheat = 3,/obj/item/seeds/whitebeet = 3) diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm index 74a54ab2752..aebe2204e8b 100644 --- a/code/modules/hydroponics/grown/herbals.dm +++ b/code/modules/hydroponics/grown/herbals.dm @@ -11,6 +11,7 @@ growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' /obj/item/weapon/grown/holder_spawner/comfrey + seed = /obj/item/seeds/comfrey spawned_thing = /obj/item/stack/medical/bruise_pack/comfrey /obj/item/weapon/grown/holder_spawner/comfrey/alter_stats(obj/item/stack/medical/bruise_pack/comfrey/C) @@ -28,6 +29,7 @@ icon_dead = "ambrosia-dead" /obj/item/weapon/grown/holder_spawner/aloe + seed = /obj/item/seeds/aloe spawned_thing = /obj/item/stack/medical/ointment/aloe /obj/item/weapon/grown/holder_spawner/aloe/alter_stats(obj/item/stack/medical/ointment/aloe/A) diff --git a/code/modules/hydroponics/grown/nymph.dm b/code/modules/hydroponics/grown/nymph.dm new file mode 100644 index 00000000000..39807f670c2 --- /dev/null +++ b/code/modules/hydroponics/grown/nymph.dm @@ -0,0 +1,16 @@ +/obj/item/seeds/nymph + name = "pack of diona nymph seeds" + desc = "These seeds grow into diona nymphs." + icon_state = "seed-replicapod" + species = "replicapod" + plantname = "Nymph Pod" + product = /obj/item/weapon/grown/holder_spawner/nymph + lifespan = 50 + endurance = 8 + maturation = 10 + production = 1 + yield = 1 + +/obj/item/weapon/grown/holder_spawner/nymph + seed = /obj/item/seeds/nymph + spawned_thing = /mob/living/simple_animal/diona \ No newline at end of file diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm index 8b8488f3d52..922b64a8a20 100644 --- a/code/modules/hydroponics/grown/peanut.dm +++ b/code/modules/hydroponics/grown/peanut.dm @@ -1,4 +1,4 @@ -// Peanuuts +// Peanuts /obj/item/seeds/peanuts name = "pack of peanut seeds" desc = "These seeds grow into peanuts." @@ -6,10 +6,11 @@ species = "potato" plantname = "Peanut Vines" product = /obj/item/weapon/reagent_containers/food/snacks/grown/peanuts - maturation = 6 - production = 6 - yield = 6 - potency = 10 + lifespan = 30 + maturation = 10 + production = 1 + yield = 4 + growthstages = 4 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "potato-grow" icon_dead = "potato-dead" diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index d1cb0a30d57..954232f3097 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -64,13 +64,13 @@ //For if You want to spawn something that is a non-grown and alter it stats /obj/item/weapon/grown/holder_spawner - var/obj/item/spawned_thing = null + var/atom/spawned_thing = null -/obj/item/weapon/grown/holder_spawner/proc/alter_stats(obj/item/I) +/obj/item/weapon/grown/holder_spawner/proc/alter_stats(atom/A) return /obj/item/weapon/grown/holder_spawner/New() ..() - new spawned_thing(loc) - alter_stats(spawned_thing) + var/atom/thing = new spawned_thing(loc) + alter_stats(thing) qdel(src) \ No newline at end of file diff --git a/paradise.dme b/paradise.dme index e62e1d4b1b7..52573a68466 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1394,6 +1394,7 @@ #include "code\modules\hydroponics\grown\misc.dm" #include "code\modules\hydroponics\grown\mushrooms.dm" #include "code\modules\hydroponics\grown\nettle.dm" +#include "code\modules\hydroponics\grown\nymph.dm" #include "code\modules\hydroponics\grown\peanut.dm" #include "code\modules\hydroponics\grown\potato.dm" #include "code\modules\hydroponics\grown\pumpkin.dm"