Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631

[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision

code/modules/assembly/bomb.dm

@@ -29,13 +29,6 @@
 		copy_overlays(bombassembly)
 		add_overlay("bomb_assembly")
 
-/obj/item/onetankbomb/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/analyzer))
-		bombtank.attackby(W, user)
-		return
-	add_fingerprint(user)
-	..()
-
 /obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I)
 	to_chat(user, "<span class='notice'>You disassemble [src]!</span>")
 	if(bombassembly)
@@ -65,6 +58,9 @@
 		return TRUE
 
 
+/obj/item/onetankbomb/analyzer_act(mob/living/user, obj/item/I)
+	bombtank.analyzer_act(user, I)
+
 /obj/item/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
 	bombassembly.attack_self(user, TRUE)
 	add_fingerprint(user)

code/modules/atmospherics/machinery/components/components_base.dm

@@ -152,3 +152,10 @@ UI Stuff
 		return ..()
 	to_chat(user, "<span class='danger'>Access denied.</span>")
 	return UI_CLOSE
+
+/*
+Tool acts
+*/
+
+/obj/machinery/atmospherics/components/analyzer_act(mob/living/user, obj/item/I)
+	atmosanalyzer_scan(airs, user, src)

code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm

@@ -19,12 +19,6 @@
 	update_icon()
 	..(intact)
 
-/obj/machinery/atmospherics/components/unary/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/analyzer))
-		atmosanalyzer_scan(airs[1], user)
-	else
-		return ..()
-
 /obj/machinery/atmospherics/components/unary/proc/assign_uid_vents()
 	uid = num2text(gl_uid++)
 	return uid

code/modules/atmospherics/machinery/pipes/pipes.dm

@@ -63,8 +63,6 @@
 	return parent.air.remove(amount)
 
 /obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/analyzer))
-		atmosanalyzer_scan(parent.air, user)
 	if(istype(W, /obj/item/pipe_meter))
 		var/obj/item/pipe_meter/meter = W
 		user.dropItemToGround(meter)
@@ -72,6 +70,9 @@
 	else
 		return ..()
 
+/obj/machinery/atmospherics/pipe/analyzer_act(mob/living/user, obj/item/I)
+	atmosanalyzer_scan(parent.air, user, src)
+
 /obj/machinery/atmospherics/pipe/returnPipenet()
 	return parent
 

code/modules/atmospherics/machinery/portable/portable_atmospherics.dm

@@ -138,11 +138,12 @@
 					"<span class='notice'>You fasten [src] to the port.</span>", \
 					"<span class='italics'>You hear a ratchet.</span>")
 				update_icon()
-	else if(istype(W, /obj/item/analyzer) && Adjacent(user))
-		atmosanalyzer_scan(air_contents, user)
 	else
 		return ..()
 
+/obj/machinery/portable_atmospherics/analyzer_act(mob/living/user, obj/item/I)
+	atmosanalyzer_scan(air_contents, user, src)
+
 /obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user)
 	if(I.force < 10 && !(stat & BROKEN))
 		take_damage(0)

code/modules/power/singularity/collector.dm

@@ -104,9 +104,7 @@
 			disconnect_from_network()
 
 /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/analyzer) && loaded_tank)
-		atmosanalyzer_scan(loaded_tank.air_contents, user)
-	else if(istype(W, /obj/item/tank/internals/plasma))
+	if(istype(W, /obj/item/tank/internals/plasma))
 		if(!anchored)
 			to_chat(user, "<span class='warning'>[src] needs to be secured to the floor first!</span>")
 			return TRUE
@@ -170,6 +168,10 @@
 	to_chat(user, "<span class='warning'>You [bitcoinmining ? "enable":"disable"] the research point production feature of [src].</span>")
 	return TRUE
 
+/obj/machinery/power/rad_collector/analyzer_act(mob/living/user, obj/item/I)
+	if(loaded_tank)
+		loaded_tank.analyzer_act(user, I)
+
 /obj/machinery/power/rad_collector/examine(mob/user)
 	. = ..()
 	if(active)

code/modules/vending/engivend.dm

@@ -4,14 +4,14 @@
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson/engine = 2, 
+	products = list(/obj/item/clothing/glasses/meson/engine = 2,
 					/obj/item/clothing/glasses/welding = 3,
-					/obj/item/multitool = 4, 
-					/obj/item/construction/rcd/loaded = 3, 
+					/obj/item/multitool = 4,
+					/obj/item/construction/rcd/loaded = 3,
 					/obj/item/grenade/chem_grenade/smart_metal_foam = 10,
-					/obj/item/geiger_counter = 5, 
+					/obj/item/geiger_counter = 5,
 					/obj/item/stock_parts/cell/high = 10,
-					/obj/item/electronics/airlock = 10, 
+          /obj/item/electronics/airlock = 10, 
 					/obj/item/electronics/apc = 10, 
 					/obj/item/electronics/airalarm = 10,
 					/obj/item/electronics/firealarm = 10,