From 3023fd874c23d2d44355325af290059e10912aed Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 24 Feb 2018 06:07:07 -0600 Subject: [PATCH] [MIRROR] Fixes gas meter layering (#5686) * Merge pull request #35877 from ShizCalev/GAS-METER-LAYER-FIX Fixes gas meter layering * Fixes gas meter layering --- code/modules/atmospherics/machinery/other/meter.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index fd3b82dfa5..f0ce98d4a5 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -3,16 +3,17 @@ desc = "It measures something." icon = 'icons/obj/atmospherics/pipes/meter.dmi' icon_state = "meterX" - var/atom/target = null + layer = GAS_PUMP_LAYER anchored = TRUE power_channel = ENVIRON - var/frequency = 0 - var/id_tag use_power = IDLE_POWER_USE idle_power_usage = 2 active_power_usage = 4 max_integrity = 150 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 0) + var/frequency = 0 + var/atom/target = null + var/id_tag var/target_layer = PIPING_LAYER_DEFAULT /obj/machinery/meter/Destroy()