diff --git a/code/datums/spells/mimic.dm b/code/datums/spells/mimic.dm index 4d807f4baaf..b7fe668761d 100644 --- a/code/datums/spells/mimic.dm +++ b/code/datums/spells/mimic.dm @@ -188,7 +188,6 @@ examine_text = form.examine(user) name = form.name - /obj/effect/proc_holder/spell/mimic/morph action_background_icon_state = "bg_morph" diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm index 01a5aa3fa2d..b166eac6a91 100644 --- a/code/modules/hydroponics/hydroponics_tray.dm +++ b/code/modules/hydroponics/hydroponics_tray.dm @@ -79,14 +79,9 @@ return ..() /obj/machinery/hydroponics/constructable/attackby(obj/item/I, mob/user, params) - if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I)) + if(default_deconstruction_screwdriver(user, "hydrotray3", "hydrotray3", I) || exchange_parts(user, I)) return - - if(exchange_parts(user, I)) - return - - else - return ..() + return ..() /obj/machinery/hydroponics/constructable/crowbar_act(mob/user, obj/item/I) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 16387e4818a..bffc2a6eab4 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -277,7 +277,7 @@ /obj/item/seeds/proc/get_analyzer_text() // In case seeds have something special to tell to the analyzer - var/text = "" + var/list/text = list() if(!get_gene(/datum/plant_gene/trait/plant_type/weed_hardy) && !get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism) && !get_gene(/datum/plant_gene/trait/plant_type/alien_properties)) text += "- Plant type: Normal plant\n" if(get_gene(/datum/plant_gene/trait/plant_type/weed_hardy)) @@ -306,7 +306,7 @@ all_traits += " [traits.get_name()]" text += "- Plant Traits:[all_traits]\n" - return text + return text.Join("") /obj/item/seeds/proc/on_chem_reaction(datum/reagents/S) // In case seeds have some special interaction with special chems return diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 7f2d6106a40..57cb5c5bddb 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -59,10 +59,11 @@ if(!selection) return - var/obj/item/photo/P = new/obj/item/photo() + var/obj/item/photo/P = new /obj/item/photo() P.construct(selection) P.show(usr) - to_chat(usr, P.desc) + if(P.desc) + to_chat(usr, P.desc, MESSAGE_TYPE_INFO) // TG uses a special garbage collector.. qdel(P) qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.