From f3d423f3d05dcb07d63b8df3f34fae56dbfdc718 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 28 Oct 2014 21:58:25 -0400 Subject: [PATCH] Fixes #6746 --- code/ATMOSPHERICS/_atmos_setup.dm | 9 +++++++-- code/ATMOSPHERICS/components/omni_devices/omni_base.dm | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/code/ATMOSPHERICS/_atmos_setup.dm b/code/ATMOSPHERICS/_atmos_setup.dm index 01a8eb003e..6f38eb6089 100644 --- a/code/ATMOSPHERICS/_atmos_setup.dm +++ b/code/ATMOSPHERICS/_atmos_setup.dm @@ -67,8 +67,8 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_ return omni_icons[state] if("underlay") return underlays[state + dir + color] - //if("underlay_intact") - // return underlays_intact[state + dir + color] + // if("underlay_intact") + // return underlays_intact[state + dir + color] // if("underlay_exposed") // return underlays_exposed[state + dir + color] // if("underlay_down") @@ -194,6 +194,11 @@ var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_ I.color = pipe_colors[pipe_color] underlays[state + "[D]" + "[pipe_colors[pipe_color]]"] = I +/* + Leaving the old icon manager code commented out for now, as we may want to rewrite the new code to cleanly + separate the newpipe icon caching (speshul supply and scrubber lines) from the rest of the pipe code. +*/ + /* /datum/pipe_icon_manager/proc/gen_underlay_icons() if(!underlays_intact) diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 7a24bf2fbb..dda2e707a7 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -190,9 +190,11 @@ if(!istype(T)) return if(T.intact && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.level == 1 ) - pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node)) + //pipe_state = icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node)) + pipe_state = icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "down") else - pipe_state = icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node)) + //pipe_state = icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node)) + pipe_state = icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "intact") return list("on_icon" = ic_on, "off_icon" = ic_off, "pipe_icon" = pipe_state)