From cbfd4789d718b03f1a39003d0347d681d95fb557 Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Sun, 20 Sep 2020 12:17:40 +0100
Subject: [PATCH] Fix duplicate results from analyzing some objects (#7660)

---
 code/ATMOSPHERICS/pipes/tank.dm                             | 4 ----
 code/game/machinery/atmoalter/portable_atmospherics.dm      | 6 ------
 code/game/objects/items/weapons/flamethrower.dm             | 4 ----
 code/game/objects/items/weapons/tanks/tanks.dm              | 3 ---
 .../singularity/particle_accelerator/particle_smasher.dm    | 5 ++++-
 html/changelogs/Meghan Rossi - atmosanalyzer.yml            | 4 ++++
 6 files changed, 8 insertions(+), 18 deletions(-)
 create mode 100644 html/changelogs/Meghan Rossi - atmosanalyzer.yml

diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm
index 54f90d9521..a893facff6 100644
--- a/code/ATMOSPHERICS/pipes/tank.dm
+++ b/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"
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 915fb8fac1..dc530ecc2f 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/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
 
 
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 6cd2a65774..b2e783ba69 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/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
 
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 358e650b2d..5f587fccf2 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/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)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
index 386437db0b..01fa9932d9 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+++ b/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)
diff --git a/html/changelogs/Meghan Rossi - atmosanalyzer.yml b/html/changelogs/Meghan Rossi - atmosanalyzer.yml
new file mode 100644
index 0000000000..336b875578
--- /dev/null
+++ b/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"
\ No newline at end of file