diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index fec637892ce..6733005760f 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -31,7 +31,7 @@ if(!holder) return switch(subject) - if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "kudzu") //general one-round-only stuff + if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "botany") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index 9a586ba8ca6..d5cf0f0b97c 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -29,9 +29,15 @@ /obj/item/seeds/kudzu/proc/plant(mob/user) if(isspaceturf(user.loc)) return - var/turf/T = get_turf(src) - message_admins("Kudzu planted by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - (JMP))",0,1) - investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu") + if(!isturf(user.loc)) + to_chat(user, "You need more space to plant [src].") + return FALSE + if(locate(/obj/structure/spacevine) in user.loc) + to_chat(user, "There is too much kudzu here to plant [src].") + return FALSE + to_chat(user, "You plant [src].") + message_admins("Kudzu planted by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(user)]",0,1) + investigate_log("was planted by [key_name(user)] at [COORD(user)]","botany") new /obj/effect/spacevine_controller(user.loc, mutations, potency, production) qdel(src) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 513f301f316..915c5792af6 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -234,10 +234,10 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(isspaceturf(user.loc)) - return + return FALSE if(!isturf(user.loc)) to_chat(user, "You need more space to plant [src].") - return + return FALSE var/count = 0 var/maxcount = 1 for(var/tempdir in cardinal) @@ -248,10 +248,11 @@ count++ if(count >= maxcount) to_chat(user, "There are too many shrooms here to plant [src].") - return + return FALSE new effect_path(user.loc, seed) to_chat(user, "You plant [src].") qdel(src) + return TRUE // Glowcap @@ -302,3 +303,9 @@ effect_path = /obj/structure/glowshroom/shadowshroom origin_tech = "biotech=4;plasmatech=4;magnets=4" +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom/attack_self(mob/user) + . = ..() + if(.) + message_admins("Shadowshroom planted by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(user)]",0,1) + investigate_log("was planted by [key_name(user)] at [COORD(user)]", "botany") + diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index a59093c420e..866818e1b83 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -282,12 +282,12 @@ /datum/plant_gene/trait/glow/shadow //makes plant emit slightly purple shadows - //adds -potency*(rate*0.2) light power to products + //adds -potency*(rate*0.05) light power to products name = "Shadow Emission" rate = 0.04 /datum/plant_gene/trait/glow/shadow/glow_power(obj/item/seeds/S) - return -max(S.potency*(rate*0.2), 0.2) + return -max(S.potency*(rate*0.05), 0.075) /datum/plant_gene/trait/glow/red name = "Red Electrical Glow"