diff --git a/_maps/map_files/DreamStation/dreamstation04.dmm b/_maps/map_files/DreamStation/dreamstation04.dmm index 1d3caf0e275..a9e08d65afb 100644 --- a/_maps/map_files/DreamStation/dreamstation04.dmm +++ b/_maps/map_files/DreamStation/dreamstation04.dmm @@ -27174,7 +27174,7 @@ /area/hallway/secondary/entry) "bcf" = ( /obj/structure/table, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/item/weapon/stock_parts/cell/high/plus, /turf/open/floor/plating, /area/storage/tech) @@ -39032,7 +39032,7 @@ "byo" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/coffee/robusta, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /turf/open/floor/plasteel{ icon_state = "floorgrime" }, diff --git a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm index efc973a42cb..5c3b999dc7f 100644 --- a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm +++ b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm @@ -441,7 +441,7 @@ name = "dust" }, /obj/item/weapon/wirecutters, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/item/weapon/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/shuttle{ @@ -57796,7 +57796,7 @@ /area/security/prison) "ccf" = ( /obj/structure/table, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /turf/open/floor/plasteel, /area/security/prison) "ccg" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 41bf55e5d95..94f4fd4513c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -434,7 +434,7 @@ /area/security/prison) "aaV" = ( /obj/machinery/hydroponics/constructable, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/machinery/airalarm{ dir = 8; icon_state = "alarm0"; @@ -23135,7 +23135,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/item/weapon/reagent_containers/glass/bucket, /turf/open/floor/plasteel{ icon_state = "warning" @@ -27868,7 +27868,7 @@ /obj/item/weapon/cultivator, /obj/item/weapon/crowbar, /obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /turf/open/floor/plasteel{ dir = 1; icon_state = "warning" @@ -27912,7 +27912,7 @@ /obj/item/weapon/storage/bag/plants/portaseeder, /obj/structure/table, /obj/machinery/light, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /turf/open/floor/plasteel{ dir = 1; icon_state = "warning" @@ -35559,7 +35559,7 @@ /area/storage/tech) "bfG" = ( /obj/structure/table, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -65262,7 +65262,7 @@ "cbE" = ( /obj/item/weapon/cultivator, /obj/item/weapon/crowbar, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/item/weapon/reagent_containers/glass/bucket, /obj/structure/table/glass, /turf/open/floor/plasteel{ @@ -91385,7 +91385,7 @@ "cPw" = ( /obj/item/weapon/storage/bag/plants/portaseeder, /obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/item/weapon/cultivator, /obj/item/weapon/reagent_containers/glass/bucket, /obj/structure/rack{ @@ -91437,7 +91437,7 @@ /obj/machinery/hydroponics/soil{ pixel_y = 8 }, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /turf/open/floor/plating{ icon_state = "warnplate" }, @@ -98728,7 +98728,7 @@ name = "dust" }, /obj/item/weapon/wirecutters, -/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/plant_analyzer, /obj/item/weapon/reagent_containers/glass/bucket, /turf/open/floor/plasteel/shuttle{ icon_state = "shuttlefloor3" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c7f01c94071..1ffb79c9700 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -829,7 +829,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "nutri" icon_deny = "nutri-deny" products = list(/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez = 30,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z = 20,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh = 10,/obj/item/weapon/reagent_containers/spray/pestspray = 20, - /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/analyzer/plant_analyzer = 4) + /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/plant_analyzer = 4) contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) /obj/machinery/vending/hydroseeds diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index c44786f735b..d607fcb7a27 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -6,7 +6,7 @@ /obj/structure/closet/secure_closet/hydroponics/New() ..() new /obj/item/weapon/storage/bag/plants/portaseeder(src) - new /obj/item/device/analyzer/plant_analyzer(src) + new /obj/item/device/plant_analyzer(src) new /obj/item/device/radio/headset/headset_srv(src) new /obj/item/weapon/cultivator(src) new /obj/item/weapon/hatchet(src) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 4105dddf982..421fca230ba 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -949,7 +949,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/ammonia, /obj/item/weapon/hatchet, /obj/item/weapon/cultivator, - /obj/item/device/analyzer/plant_analyzer, + /obj/item/device/plant_analyzer, /obj/item/clothing/gloves/botanic_leather, /obj/item/clothing/suit/apron) crate_name = "hydroponics crate" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index f22c28e2e28..a1746d9a328 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -10,7 +10,7 @@ item_state = "apron" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN - allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) + allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) //Captain /obj/item/clothing/suit/captunic diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 9f9c1e4e489..955d2563efd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -491,7 +491,7 @@ /obj/item/clothing/suit/hooded/wintercoat/hydro name = "hydroponics winter coat" icon_state = "coathydro" - allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) + allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) hoodtype = /obj/item/clothing/head/winterhood/hydro /obj/item/clothing/head/winterhood/hydro diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index c0eaf24d4e6..9c34f22ad3f 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -57,7 +57,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params) ..() - if (istype(O, /obj/item/device/analyzer/plant_analyzer)) + if (istype(O, /obj/item/device/plant_analyzer)) var/msg = "*---------*\n This is \a [src].\n" if(seed) msg += seed.get_analyzer_text() diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 17de41308f2..6cd064ac23d 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -34,7 +34,7 @@ /obj/item/weapon/grown/attackby(obj/item/O, mob/user, params) ..() - if (istype(O, /obj/item/device/analyzer/plant_analyzer)) + if (istype(O, /obj/item/device/plant_analyzer)) var/msg = "*---------*\n This is \a [src]\n" if(seed) msg += seed.get_analyzer_text() diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 3fbd9cee816..635301f3493 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -1,5 +1,5 @@ // Plant analyzer -/obj/item/device/analyzer/plant_analyzer +/obj/item/device/plant_analyzer name = "plant analyzer" desc = "A scanner used to evaluate a plant's various areas of growth." icon = 'icons/obj/device.dmi' @@ -7,9 +7,6 @@ item_state = "analyzer" origin_tech = "magnets=2;biotech=2" -/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user) - return 0 - // ************************************* // Hydroponics Tools // ************************************* diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 2393b7601d1..2b3aa6b83b1 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -734,7 +734,7 @@ else user << "[src] already has seeds in it!" - else if(istype(O, /obj/item/device/analyzer/plant_analyzer)) + else if(istype(O, /obj/item/device/plant_analyzer)) if(myseed) user << "*** [myseed.plantname] ***" //Carn: now reports the plants growing, not the seeds. user << "- Plant Age: [age]" diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 5eba54312e5..029e2d5f1a0 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -227,7 +227,7 @@ return /obj/item/seeds/attackby(obj/item/O, mob/user, params) - if (istype(O, /obj/item/device/analyzer/plant_analyzer)) + if (istype(O, /obj/item/device/plant_analyzer)) user << "*---------*\n This is \a [src]." var/text = get_analyzer_text() if(text) diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index a2923999388..c2305ee366e 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -196,7 +196,7 @@ Botanist uniform = /obj/item/clothing/under/rank/hydroponics suit = /obj/item/clothing/suit/apron gloves =/obj/item/clothing/gloves/botanic_leather - suit_store = /obj/item/device/analyzer/plant_analyzer + suit_store = /obj/item/device/plant_analyzer backpack = /obj/item/weapon/storage/backpack/botany satchel = /obj/item/weapon/storage/backpack/satchel_hyd diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index f88731759f8..0fe0205b916 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -292,7 +292,7 @@ id = "plant_analyzer" build_type = AUTOLATHE materials = list(MAT_METAL = 30, MAT_GLASS = 20) - build_path = /obj/item/device/analyzer/plant_analyzer + build_path = /obj/item/device/plant_analyzer category = list("initial","Misc") /datum/design/shovel