Fix duplicate results from analyzing some objects (#7660)

code/ATMOSPHERICS/pipes/tank.dm

@@ -70,10 +70,6 @@
 	if(istype(W, /obj/item/device/pipe_painter))
 		return
 
-	if(istype(W, /obj/item/device/analyzer) && in_range(user, src))
-		var/obj/item/device/analyzer/A = W
-		A.analyze_gases(src, user)
-
 /obj/machinery/atmospherics/pipe/tank/air
 	name = "Pressure Tank (Air)"
 	icon_state = "air_map"

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -136,12 +136,6 @@
 			else
 				to_chat(user, "<span class='notice'>Nothing happens.</span>")
 				return
-
-	else if ((istype(W, /obj/item/device/analyzer)) && Adjacent(user))
-		var/obj/item/device/analyzer/A = W
-		A.analyze_gases(src, user)
-		return
-
 	return
 
 

code/game/objects/items/weapons/flamethrower.dm

@@ -110,10 +110,6 @@
 		update_icon()
 		return
 
-	if(istype(W, /obj/item/device/analyzer))
-		var/obj/item/device/analyzer/A = W
-		A.analyze_gases(src, user)
-		return
 	..()
 	return
 

code/game/objects/items/weapons/tanks/tanks.dm

@@ -120,9 +120,6 @@ var/list/global/tank_gauge_cache = list()
 	if (istype(src.loc, /obj/item/assembly))
 		icon = src.loc
 
-	if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
-		var/obj/item/device/analyzer/A = W
-		A.analyze_gases(src, user)
 	else if (istype(W,/obj/item/latexballon))
 		var/obj/item/latexballon/LB = W
 		LB.blow(src)

code/modules/power/singularity/particle_accelerator/particle_smasher.dm

@@ -43,9 +43,12 @@
 		for(var/obj/item/I in contents)
 			. += "<span class='notice'>\the [I]</span>"
 
+/obj/machinery/particle_smasher/atmosanalyze(var/mob/user)
+	return list("<span class='notice'>\The [src] reads an energy level of [energy].</span>")
+
 /obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob)
 	if(W.type == /obj/item/device/analyzer)
-		to_chat(user, "<span class='notice'>\The [src] reads an energy level of [energy].</span>")
+		return
 	else if(istype(W, /obj/item/stack/material))
 		var/obj/item/stack/material/M = W
 		if(M.uses_charge)

html/changelogs/Meghan Rossi - atmosanalyzer.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Fixed some objects giving duplicate results when an analyzer was used on them"