Merge pull request #1083 from DragonTrance/various-misc-2

ghosts can read contents of an air canister + examine meters by clicking

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

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

@@ -377,6 +377,17 @@
 		air_update_turf() // Update the environment if needed.
 	update_icon()
 
+/obj/machinery/portable_atmospherics/canister/attack_ghost(mob/user)
+	if(user.client)
+		if(IsAdminGhost(user))
+			attack_ai(user)
+			return FALSE
+		else if(user.client.prefs.inquisitive_ghost)
+			user.examinate(src)
+			return FALSE
+	atmosanalyzer_scan(air_contents, user, src, FALSE)
+	return FALSE
+
 /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)