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
2018-05-27 01:32:02 -05:00
parent 2a56a5d0c1 218a196d73
commit 69af2087aa
18 changed files with 102 additions and 94 deletions
@@ -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)
@@ -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
@@ -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

@@ -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)