diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 58431d24fd5..21f89fb2e7b 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -369,14 +369,6 @@ attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' -/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity) - if(!proximity) return - if(istype(A, /obj/effect/spacevine)) - for(var/obj/effect/spacevine/B in orange(A,1)) - if(prob(80)) - qdel(B) - qdel(A) - /* /obj/item/weapon/cigarpacket name = "Pete's Cuban Cigars" diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 35162d4ded4..4323a6a65e8 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -112,9 +112,9 @@ if(hitter) var/chance if(I) - chance = I.force + chance = I.force * 2 else - chance = 4 + chance = 8 if(prob(chance)) qdel(holder) return 1 @@ -169,6 +169,11 @@ if(/obj/item/weapon/twohanded/fireaxe) qdel(src) if(/obj/item/weapon/hatchet) qdel(src) if(/obj/item/weapon/melee/energy) qdel(src) + if(/obj/item/weapon/scythe) + for(var/obj/effect/spacevine/B in orange(src,1)) + if(prob(80)) + qdel(B) + qdel(src) //less effective weapons if(/obj/item/weapon/wirecutters) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 6915ca7e1c7..3a0fc8d9da1 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -86,7 +86,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/cherries seed = "/obj/item/seeds/cherryseed" @@ -100,7 +100,7 @@ if(reagents) 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) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/poppy seed = "/obj/item/seeds/poppyseed" @@ -114,7 +114,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) reagents.add_reagent("bicaridine", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 3, 1) + bitesize = 1+round(reagents.total_volume / 3, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/harebell seed = "obj/item/seeds/harebellseed" @@ -127,7 +127,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 3, 1) + bitesize = 1+round(reagents.total_volume / 3, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/potato seed = "/obj/item/seeds/potatoseed" @@ -138,8 +138,8 @@ New(var/loc, var/potency = 25) ..() if(reagents) - reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = reagents.total_volume + reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) + bitesize = reagents.total_volume /obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() @@ -165,7 +165,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) reagents.add_reagent("sugar", 1+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes seed = "/obj/item/seeds/greengrapeseed" @@ -178,7 +178,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) reagents.add_reagent("kelotane", 3+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage seed = "/obj/item/seeds/cabbageseed" @@ -190,7 +190,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = reagents.total_volume + bitesize = reagents.total_volume /obj/item/weapon/reagent_containers/food/snacks/grown/berries seed = "/obj/item/seeds/berryseed" @@ -202,7 +202,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries seed = "/obj/item/seeds/glowberryseed" @@ -217,7 +217,7 @@ if(reagents) reagents.add_reagent("nutriment", round((potency / 10), 1)) reagents.add_reagent("uranium", 3+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/Destroy() if(istype(loc,/mob)) @@ -243,7 +243,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) reagents.add_reagent("coco", 4+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane seed = "/obj/item/seeds/sugarcaneseed" @@ -254,7 +254,7 @@ New(var/loc, var/potency = 50) ..() if(reagents) - reagents.add_reagent("sugar", 4+round((potency / 5), 1)) + reagents.add_reagent("sugar", 4+round((potency / 5), 1)) /obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries seed = "/obj/item/seeds/poisonberryseed" @@ -268,7 +268,7 @@ if(reagents) reagents.add_reagent("nutriment", 1) reagents.add_reagent("toxin", 3+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/deathberries seed = "/obj/item/seeds/deathberryseed" @@ -283,7 +283,7 @@ reagents.add_reagent("nutriment", 1) reagents.add_reagent("toxin", 3+round(potency / 3, 1)) reagents.add_reagent("lexorin", 1+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris seed = "/obj/item/seeds/ambrosiavulgaris" @@ -300,7 +300,7 @@ reagents.add_reagent("kelotane", 1+round(potency / 8, 1)) reagents.add_reagent("bicaridine", 1+round(potency / 10, 1)) reagents.add_reagent("toxin", 1+round(potency / 10, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus seed = "/obj/item/seeds/ambrosiadeus" @@ -317,7 +317,7 @@ reagents.add_reagent("synaptizine", 1+round(potency / 8, 1)) reagents.add_reagent("hyperzine", 1+round(potency / 10, 1)) reagents.add_reagent("space_drugs", 1+round(potency / 10, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/apple seed = "/obj/item/seeds/appleseed" @@ -330,7 +330,7 @@ if(reagents) reagents.maximum_volume = 20 reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = reagents.maximum_volume // Always eat the apple in one + bitesize = reagents.maximum_volume // Always eat the apple in one /obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned seed = "/obj/item/seeds/poisonedappleseed" @@ -343,7 +343,7 @@ if(reagents) reagents.maximum_volume = 20 reagents.add_reagent("cyanide", 1+round((potency / 5), 1)) - bitesize = reagents.maximum_volume // Always eat the apple in one + bitesize = reagents.maximum_volume // Always eat the apple in one /obj/item/weapon/reagent_containers/food/snacks/grown/goldapple seed = "/obj/item/seeds/goldappleseed" @@ -356,7 +356,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) reagents.add_reagent("gold", 1+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/goldapple/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -375,7 +375,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 6), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin seed = "/obj/item/seeds/pumpkinseed" @@ -387,7 +387,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 6), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -408,7 +408,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/lemon seed = "/obj/item/seeds/lemonseed" @@ -420,7 +420,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/orange seed = "/obj/item/seeds/orangeseed" @@ -432,7 +432,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet seed = "/obj/item/seeds/whitebeetseed" @@ -445,7 +445,7 @@ if(reagents) reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("sugar", 1+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/banana seed = "/obj/item/seeds/bananaseed" @@ -461,7 +461,7 @@ ..() if(reagents) reagents.add_reagent("banana", 1+round((potency / 10), 1)) - bitesize = 5 + bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/grown/chili seed = "/obj/item/seeds/chiliseed" @@ -474,7 +474,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 25), 1)) reagents.add_reagent("capsaicin", 3+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -494,7 +494,7 @@ reagents.add_reagent("nutriment", 1+round((potency / 25), 1)) reagents.add_reagent("capsaicin", 8+round(potency / 2, 1)) reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1)) - bitesize = 1+round(reagents.total_volume / 4, 1) + bitesize = 1+round(reagents.total_volume / 4, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -529,7 +529,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans seed = "/obj/item/seeds/soyaseed" @@ -542,7 +542,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans seed = "/obj/item/seeds/koiseed" @@ -555,7 +555,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 30), 1)) reagents.add_reagent("carpotoxin", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower seed = "/obj/item/seeds/moonflowerseed" @@ -568,7 +568,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) reagents.add_reagent("moonshine", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/tomato seed = "/obj/item/seeds/tomatoseed" @@ -580,7 +580,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) throw_impact(atom/hit_atom) ..() @@ -598,7 +598,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/killertomato/attack_self(mob/user as mob) if(istype(user.loc,/turf/space)) @@ -619,7 +619,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) reagents.add_reagent("blood", 1+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato/throw_impact(atom/hit_atom) ..() @@ -642,7 +642,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) reagents.add_reagent("lube", 1+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato/throw_impact(atom/hit_atom) ..() @@ -677,7 +677,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 25), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/grass seed = "/obj/item/seeds/grassseed" @@ -688,7 +688,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/grass/attack_self(mob/user as mob) user << "You prepare the astroturf." @@ -706,12 +706,15 @@ name = "kudzu pod" desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact." icon_state = "kudzupod" + var/list/mutations = list() + var/mutating = 0 + New(var/loc, var/potency = 10) ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) reagents.add_reagent("anti_toxin", 1+round((potency / 25), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper seed = "/obj/item/seeds/icepepperseed" @@ -724,7 +727,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) reagents.add_reagent("frostoil", 3+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -742,7 +745,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) reagents.add_reagent("imidazoline", 3+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi seed = "/obj/item/seeds/reishimycelium" @@ -756,7 +759,7 @@ reagents.add_reagent("nutriment", 1) reagents.add_reagent("anti_toxin", 3+round(potency / 3, 1)) reagents.add_reagent("stoxin", 3+round(potency / 3, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -776,7 +779,7 @@ reagents.add_reagent("nutriment", 1) reagents.add_reagent("amatoxin", 3+round(potency / 3, 1)) reagents.add_reagent("mushroomhallucinogen", 1+round(potency / 25, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -795,7 +798,7 @@ reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) reagents.add_reagent("amatoxin", 13+round(potency / 3, 1)) reagents.add_reagent("mushroomhallucinogen", 1+round(potency / 25, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -814,7 +817,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 50), 1)) reagents.add_reagent("mushroomhallucinogen", 3+round(potency / 5, 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() @@ -831,7 +834,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 2+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom seed = "/obj/item/seeds/walkingmushroom" @@ -842,7 +845,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 2+round((potency / 10), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user as mob) if(istype(user.loc,/turf/space)) @@ -867,7 +870,7 @@ ..() if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 25), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom seed = "/obj/item/seeds/glowshroom" @@ -887,7 +890,7 @@ potency = 30 plant_type = 2 if(reagents) - reagents.add_reagent("radium", 1+round((potency / 20), 1)) + reagents.add_reagent("radium", 1+round((potency / 20), 1)) if(istype(src.loc,/mob)) pickup(src.loc)//adjusts the lighting on the mob else @@ -959,7 +962,7 @@ if(reagents) reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) reagents.add_reagent("singulo", 1+round((potency / 5), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit seed = "/obj/item/seeds/gatfruit" @@ -975,7 +978,7 @@ reagents.add_reagent("carbon", 1+round((potency / 10), 1)) reagents.add_reagent("nitrogen", 1+round((potency / 15), 1)) reagents.add_reagent("potassium", 1+round((potency / 20), 1)) - bitesize = 1+round(reagents.total_volume / 2, 1) + bitesize = 1+round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/coffee_arabica @@ -987,7 +990,7 @@ New(var/loc, var/potency = 20) ..() if(reagents) - reagents.add_reagent("coffeepowder", 1+round((potency / 10), 2)) + reagents.add_reagent("coffeepowder", 1+round((potency / 10), 2)) /obj/item/weapon/reagent_containers/food/snacks/grown/coffee_robusta seed = "/obj/item/seeds/coffee_robusta_seed" @@ -999,7 +1002,7 @@ ..() if(reagents) reagents.add_reagent("coffeepowder", 1+round((potency / 10), 2)) - reagents.add_reagent("hyperzine", 1+round((potency / 20), 1)) + reagents.add_reagent("hyperzine", 1+round((potency / 20), 1)) /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco seed = "/obj/item/seeds/tobacco_seed" @@ -1020,7 +1023,7 @@ New(var/loc, var/potency = 20) ..() if(reagents) - reagents.add_reagent("dexalin", 1+round((potency / 20), 1)) + reagents.add_reagent("dexalin", 1+round((potency / 20), 1)) /obj/item/weapon/reagent_containers/food/snacks/grown/tea_aspera @@ -1032,7 +1035,7 @@ New(var/loc, var/potency = 20) ..() if(reagents) - reagents.add_reagent("teapowder", 1+round((potency / 10), 2)) + reagents.add_reagent("teapowder", 1+round((potency / 10), 2)) /obj/item/weapon/reagent_containers/food/snacks/grown/tea_astra @@ -1045,4 +1048,4 @@ ..() if(reagents) reagents.add_reagent("teapowder", 1+round((potency / 10), 2)) - reagents.add_reagent("kelotane", 1+round((potency / 20), 1)) + reagents.add_reagent("kelotane", 1+round((potency / 20), 1)) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 95178e74be7..80642e3957b 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -768,9 +768,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/item/seeds/proc/harvest(mob/user = usr) var/obj/machinery/hydroponics/parent = loc //for ease of access var/t_amount = 0 + var/list/result = list() while(t_amount < getYield()) - var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new product(user.loc, potency) // User gets a consumable + var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new product(user.loc, potency) + result.Add(t_prod) // User gets a consumable if(!t_prod) return t_prod.seed = type t_prod.lifespan = lifespan @@ -783,6 +785,8 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) t_amount++ parent.update_tray() + + return result /* /obj/item/seeds/grassseed/harvest(mob/user = usr) var/obj/machinery/hydroponics/parent = loc //for ease of access diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 758bd4c27af..090746089dd 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -6,7 +6,7 @@ if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/)) var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O while(t_amount < t_max) - var/obj/item/seeds/t_prod = new F.seed(O.loc) + var/obj/item/seeds/t_prod = new F.seed(O.loc, O) t_prod.lifespan = F.lifespan t_prod.endurance = F.endurance t_prod.maturation = F.maturation @@ -21,7 +21,7 @@ var/obj/item/weapon/grown/F = O if(F.seed) while(t_amount < t_max) - var/obj/item/seeds/t_prod = new F.seed(O.loc) + var/obj/item/seeds/t_prod = new F.seed(O.loc, O) t_prod.lifespan = F.lifespan t_prod.endurance = F.endurance t_prod.maturation = F.maturation @@ -55,7 +55,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob) if(isrobot(user)) return - + if (istype(O,/obj/item/weapon/storage/bag/plants)) var/obj/item/weapon/storage/P = O var/loaded = 0 @@ -112,9 +112,9 @@ datum/seed_pile/New(var/name, var/life, var/endur, var/matur, var/prod, var/yie, obj/machinery/seed_extractor/interact(mob/user as mob) if (stat) return 0 - + var/dat = "Stored seeds:
" - + if (contents.len == 0) dat += "No seeds" else diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index d3c26f73806..c0a4eda32d0 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -22,7 +22,7 @@ var/rarity = 0 //How rare the plant is. Used for giving points to cargo when shipping off to Centcom. var/list/mutatelist = list() //The type of plants that this plant can mutate into. -/obj/item/seeds/New() +/obj/item/seeds/New(loc, parent) ..() pixel_x = rand(-8, 8) pixel_y = rand(-8, 8) @@ -1034,12 +1034,25 @@ plant_type = 1 rarity = 30 var/list/mutations = list() + var/mutating + +/obj/item/seeds/kudzuseed/New(loc, obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/parent) + ..() + if(parent) + mutations = parent.mutations + mutating = parent.mutating + +/obj/item/seeds/kudzuseed/harvest() + var/list/prod = ..() + for(var/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/K in prod) + K.mutations = mutations + K.mutating = prob(15) /obj/item/seeds/kudzuseed/attack_self(mob/user as mob) if(istype(user.loc,/turf/space)) return user << "You plant the kudzu. You monster." - new /obj/effect/spacevine_controller(user.loc, mutations, 1) + new /obj/effect/spacevine_controller(user.loc, mutations) qdel(src) /obj/item/seeds/chillighost