From 0e5893825397dfa025ecaeb5102aa1f24f4779dd Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 10 Jun 2020 14:42:27 -0700 Subject: [PATCH 1/5] Update scanners.dm --- code/game/objects/items/devices/scanners.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index e8f43f316f..28e1e1294f 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -655,9 +655,10 @@ GENETICS SCANNER amount += inaccurate return DisplayTimeText(max(1,amount)) -/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src) +/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src, visible = TRUE) var/icon = target - user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].") + if(visible) + user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].") to_chat(user, "Results of analysis of [icon2html(icon, user)] [target].") var/list/airs = islist(mixture) ? mixture : list(mixture) From 41d186186bc22e58588b7c2dc2e559a88099f13b Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 10 Jun 2020 14:43:54 -0700 Subject: [PATCH 2/5] Update components_base.dm --- .../atmospherics/machinery/components/components_base.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index c229a4ba27..33fd160b1a 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -162,6 +162,9 @@ to_chat(user, "Access denied.") return UI_CLOSE +/obj/machinery/atmospherics/components/attack_ghost(mob/dead/observer/O) + . = ..() + atmosanalyzer_scan(airs, O, src, FALSE) // Tool acts From 70d1574c26d1426bce297a93cdd8d28fd9940085 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 10 Jun 2020 14:45:19 -0700 Subject: [PATCH 3/5] Update pipes.dm --- code/modules/atmospherics/machinery/pipes/pipes.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index c466a422b2..4a6170c251 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -111,3 +111,10 @@ pipe_color = paint_color update_node_icon() return TRUE + +/obj/machinery/atmospherics/pipe/attack_ghost(mob/dead/observer/O) + . = ..() + if(parent) + atmosanalyzer_scan(parent.air, O, src, FALSE) + else + to_chat(O, "[src] doesn't have a pipenet, which is probably a bug.") From 5990239cfa992e7362ba829fe44e32b6c1daac98 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 10 Jun 2020 14:46:16 -0700 Subject: [PATCH 4/5] Update portable_atmospherics.dm --- .../atmospherics/machinery/portable/portable_atmospherics.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 8bf0554070..f3b65c5724 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -154,3 +154,7 @@ investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS) add_fingerprint(user) ..() + +/obj/machinery/portable_atmospherics/attack_ghost(mob/dead/observer/O) + . = ..() + atmosanalyzer_scan(air_contents, O, src, FALSE) From 120826e1fc23bcf2c1e0108cf9393e51e72cf997 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 10 Jun 2020 14:47:58 -0700 Subject: [PATCH 5/5] Update tanks.dm --- code/game/objects/items/tanks/tanks.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 95712f386a..00fbc41516 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -153,6 +153,10 @@ return (BRUTELOSS) +/obj/item/tank/attack_ghost(mob/dead/observer/O) + . = ..() + atmosanalyzer_scan(air_contents, O, src, FALSE) + /obj/item/tank/attackby(obj/item/W, mob/user, params) add_fingerprint(user) if(istype(W, /obj/item/assembly_holder))