From 2e2e8d2bdf720e493565ce8c1bb6537dfb7fc38a Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 21 Apr 2021 14:01:32 -0700 Subject: [PATCH] ghosts can read contents of an air canister + examine meters by clicking --- code/modules/atmospherics/machinery/other/meter.dm | 4 ++++ code/modules/atmospherics/machinery/portable/canister.dm | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 9870a895..37081453 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -134,6 +134,9 @@ else to_chat(user, status()) +/obj/machinery/meter/attack_ghost(mob/user) + to_chat(user, status()) + /obj/machinery/meter/singularity_pull(S, current_size) ..() if(current_size >= STAGE_FIVE) @@ -141,6 +144,7 @@ // TURF METER - REPORTS A TILE'S AIR CONTENTS // why are you yelling? +// i hope they aren't mad /obj/machinery/meter/turf /obj/machinery/meter/turf/reattach_to_layer() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index a0e3dd38..a489b1cd 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -377,6 +377,11 @@ air_update_turf() // Update the environment if needed. update_icon() +/obj/machinery/portable_atmospherics/canister/attack_ghost(mob/user) + atmosanalyzer_scan(air_contents, user, src, FALSE) + if(user.client.keys_held["Ctrl"]) + . = ..() //Look at the UI + /obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)