From fc6f3ea685c91d5506aa7d588574502c2c3d9d8f Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 5 Nov 2014 00:03:39 -0500 Subject: [PATCH] Fixes #6299 --- code/ATMOSPHERICS/pipes.dm | 36 ++++++++++++----------- code/game/machinery/pipe/construction.dm | 2 +- icons/atmos/pipes.dmi | Bin 3578 -> 3657 bytes 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 77249a4e7e..98306e9dd5 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -911,29 +911,21 @@ /obj/machinery/atmospherics/pipe/cap name = "pipe endcap" desc = "An endcap for pipes" - icon = 'icons/obj/pipes.dmi' - icon_state = "cap" + icon = 'icons/atmos/pipes.dmi' + icon_state = "" level = 2 layer = 2.4 //under wires with their 2.44 volume = 35 dir = SOUTH - initialize_directions = NORTH + initialize_directions = SOUTH var/obj/machinery/atmospherics/node /obj/machinery/atmospherics/pipe/cap/New() ..() - switch(dir) - if(SOUTH) - initialize_directions = NORTH - if(NORTH) - initialize_directions = SOUTH - if(WEST) - initialize_directions = EAST - if(EAST) - initialize_directions = WEST + initialize_directions = dir /obj/machinery/atmospherics/pipe/cap/hide(var/i) if(level == 1 && istype(loc, /turf/simulated)) @@ -964,11 +956,20 @@ ..() -/obj/machinery/atmospherics/pipe/cap/update_icon() - overlays = new() +/obj/machinery/atmospherics/pipe/cap/change_color(var/new_color) + ..() + //for updating connected atmos device pipes (i.e. vents, manifolds, etc) + if(node) + node.update_underlays() - icon_state = "cap[invisibility ? "-f" : ""]" - return +/obj/machinery/atmospherics/pipe/cap/update_icon(var/safety = 0) + if(!check_icon_cache()) + return + + alpha = 255 + + overlays.Cut() + overlays += icon_manager.get_atmos_icon("pipe", , pipe_color, "cap") /obj/machinery/atmospherics/pipe/cap/initialize() for(var/obj/machinery/atmospherics/target in get_step(src, dir)) @@ -1008,7 +1009,8 @@ /obj/machinery/atmospherics/pipe/cap/hidden level = 1 - icon_state = "cap-f" + icon_state = "cap" + alpha = 128 /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers name = "scrubbers pipe endcap" diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index a1a56bb976..205cc1cede 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -376,7 +376,7 @@ Buildable meters if(PIPE_GAS_MIXER_T) return dir|cw|acw if(PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP) - return flip + return dir ///// Z-Level stuff if(PIPE_UP,PIPE_DOWN,PIPE_SUPPLY_UP,PIPE_SUPPLY_DOWN,PIPE_SCRUBBERS_UP,PIPE_SCRUBBERS_DOWN) return dir diff --git a/icons/atmos/pipes.dmi b/icons/atmos/pipes.dmi index 08b267c6d0feba53eacb74763134fbcb4093f99d..6bd0b15f618d614aee81dd2187f761c3b8db011f 100644 GIT binary patch delta 3412 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 E3)rZ`QUCw|