From c6c691bfd9d0f5f4d497e897fd1df9ec518a33c7 Mon Sep 17 00:00:00 2001
From: Mloc <colmohici@gmail.com>
Date: Mon, 13 Oct 2014 20:35:56 +0100
Subject: [PATCH] fixes #6299

Signed-off-by: Mloc <colmohici@gmail.com>
---
 code/ATMOSPHERICS/pipes.dm |  74 ++++++++++++++++++++++++++++---------
 icons/atmos/pipes.dmi      | Bin 1433 -> 1517 bytes
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index 898f1965517..d4b30e60a0c 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -786,8 +786,8 @@
 /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
 
@@ -800,15 +800,7 @@
 
 /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))
@@ -839,11 +831,19 @@
 
 	..()
 
-/obj/machinery/atmospherics/pipe/cap/update_icon()
-	overlays = new()
+/obj/machinery/atmospherics/pipe/cap/change_color(var/new_color)
+	..()
+	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))
@@ -856,13 +856,53 @@
 	update_icon()
 
 /obj/machinery/atmospherics/pipe/cap/visible
-	level = 2
 	icon_state = "cap"
+	level = 2
+
+/obj/machinery/atmospherics/pipe/cap/visible/scrubbers
+	name = "Scrubbers pipe"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/cap/visible/supply
+	name = "Air supply pipe"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/cap/visible/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/cap/visible/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/cap/visible/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/cap/visible/purple
+	color = PIPE_COLOR_PURPLE
 
 /obj/machinery/atmospherics/pipe/cap/hidden
+	icon_state = "cap"
 	level = 1
-	icon_state = "cap-f"
+	alpha = 128
 
+/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers
+	name = "Scrubbers pipe"
+	color = PIPE_COLOR_RED
+
+/obj/machinery/atmospherics/pipe/cap/hidden/supply
+	name = "Air supply pipe"
+	color = PIPE_COLOR_BLUE
+
+/obj/machinery/atmospherics/pipe/cap/hidden/yellow
+	color = PIPE_COLOR_YELLOW
+
+/obj/machinery/atmospherics/pipe/cap/hidden/cyan
+	color = PIPE_COLOR_CYAN
+
+/obj/machinery/atmospherics/pipe/cap/hidden/green
+	color = PIPE_COLOR_GREEN
+
+/obj/machinery/atmospherics/pipe/cap/hidden/purple
+	color = PIPE_COLOR_PURPLE
 
 /obj/machinery/atmospherics/pipe/tank
 	icon = 'icons/atmos/tank.dmi'
diff --git a/icons/atmos/pipes.dmi b/icons/atmos/pipes.dmi
index 019be28ffd8a7a70de8e4cffc0ecfd4c89a1c55b..7cde38db46d8a1c39931e4c8b0ea4b0fc989fae7 100644
GIT binary patch
delta 1311
zcmah}Yfw@N6uuBj$|@V~L`kNW)okv{+FBZ!vPOtAij^%`iTK#ma@F#YrpX1=F?S{`
ztL>$RY1)?BbJ|i7G)<*8HPcn>!HVgcnJI*L;oiH~cJ}xFIOjXxcOElm&dj+$nj)<!
z+QAL9vvsru0KhJY!`g+R3N!iQMVL=Ao=(9a=hT`sR|f}&u&^+hOePQrs+Ue`F&&q_
ziyH<o#|GmtQgEv7FesL*N89lEjt*aKRNK~zJfcu+$f$3eGTNg600_lFtRHq~l}?qC
z_?6#%SwLgSt8ALDb?@cNicyqAtxZfkFg~ED+vfFVqIV@ddc!W4(Kv=<T}(-(A?uz~
z)eZe3N@wb3+#Y_1TYET{Ine*LgS&`zvYvY(n2EnrF9Y?n;IfH#52`5sIu5_1tW<3S
z2%OSV*9zH^dhSGbyZtIb*@lMz-*pea#@N66oy+t7-xO9h219H~FEz7}Vwzpjsh{x?
z_Q1`-HGKy(uxCi$;qoyK+T=|f-r^}SGU#tQq3oT5>bSFt29G<}F9u&%^QhzTHD}8P
zS8V~;pKQL5(s~fKAF=FmggSGi{KLNFM(3`PkXfT~)NLlHFc5-}={93#D%#+5{9Kn^
zw&2gVwdv1ZHfE3QZSX%+o!f_aRkO2G(6kD8g&}1$*?lukez#{PKJqm%@lCo#6F(A8
z#DZhvq(k<d43ZP-_i(8<6ARv$+`*$>w&_b5B6FLSeMK$S<>d3^)U$vNy25ul4@)5L
zd44QTe1+~@q$nW}>rpyQ=h2E5D&vceRW3{s<{Y^wyIBT=%<r&xN>?)RLzSf}6)Z9G
zw*FdvkvL736RfAnTEb7DYGWn)U~#(R8NfiEef&McE*JpkiASv{Co>$+0~5|GUJAv0
z*XRB|50pS?%x4sLOVZQ}f|wEo=jEA60(@F@stCzIfr;U~hh>IHe5S6QWf{)5=uCQx
z#blpxC<T$u{lSH@@!kWxA9)eNq4kNvM7@6Cb(Pldwl`QY6f(X4R%;!|X#%sr%a_5x
z6*ljCg`B>)bqea0{k+B;UBqVhNyO6p0)-(`^157Qf|=x{LGUN;E18v3^q&8xEur0a
z2`JfwvuT5@1TQA3;UH5Xs<?zw9hivZ2rPZ_Ee9|WHJ?CIukbj64>C}*K*>JkO)b54
zPW&%sh$BApOmU<VeT4+1EJ}uvIWsAd)&}8Z;r{ZiO6N)9z45tuNMe+*eDj&unG)&C
zD>0|(lQ|c$L|a-yZ+1XdNinc=)6cM!@t@Ty<@S^GYmXoj`0f@WWuQ}ZA1%=(w`=SZ
zoIGiS31b1~IwU}+Fv0#DAzRbb3|@unk=Dn?VYtBh7)pMQW<<3M6E=MSGr{Pvh1%2A
zBXg)r?vR8G{?!K|#l}W6NnyOA)T$QbHIl1JEo4SZl(#D2=wGaPk2)aS{(G<$=$Hgb
z*uz43uaTM%1B*A^7BMejyM@#``*`J{i(RbIB}@WHum+d2zChUd%PczpPgBdXn2&2|
z0WiC5)?k^1s$SXH#=6nGDMPf-+|{nv(mI-|=dYwj%^VC8Ze!#;eX?_)pFG&A*$y+0
z7%02(-Ga9*tsz<9Y2U)&GpfJ4&i@Wc_PlCtfN-%=262`0Tu-5G3wc25>_J3T6wB(^
qkK`%;D2?04q8r*8d)?^NoSvFQEr04<asrS2F(7C=msKASCH)7+;hC2J

delta 1227
zcmZ9MYfw{X5QYPq28@`9Xs9ShL=<c^XfM!C%Hd`KrHDdXsc29Xq;iR%LMD{Y7#PH$
z0i>uE6od*W5GN7~8Vm?l8yy13NGC!;AVkG*FkEvv=WCq)YJcqRyU)(Mv%gkHy-an>
z3l9sjTeNZ!iA1ss2@c$CspTKSW`QNkmtI6HC8f|UZ8@g;?UF@X9p4=mLGm5@E6&nn
z7B(LPq>I}RlYc-NxA$75&ulI9+8;?FkrsxB1o}m0l<G>U5yPGiISIPi5c^DrUviuD
z5RTj!s_T0Ab$z^)k*+^inO_|uVgG1udXso^d(q#A6>)ujJZ_e+fak(+*S3Z9NQ<b&
zQ$xK8u0GlBw6L;HKS8SVs#p!*M$@*Xb{V)9>rOi#)&G=yn(h7Pu%FMfQ*3Y9&kj^y
z9{26Et^BNp?OlIjM=hzCQZ2J{=N7=Vmj!Q(<j@Bc(e;~WT?bU!#OCO@0oEPnt+RE$
z21DXUn%WDr-gY_Dsc*D_$J>;q9ZS=$oSUBKV!!et#?sxC{3%IC|22;>mHzS}P_S2Z
z&s5@^Qk8o}wC$(oOGJ9Y?Bs!cL8rMg^mmiSlafO9aq9Z_#}zfpKs(r3v_c~^r2G4P
zdUONBCUu23e4%tIFC}*ls-xL`*DWF?(e|n^wbNP)c5oiqg<HhVcOrB0N25$`7Ciqk
zyW_*mYv{Xdiy0&V4dm~#fWZdMeMb$GOQ@C5p~A8T8^i<)WTkgn4ZqiBmIr=GE#<sS
z?w&ddtqP1S<}w?Dox>&YguKxd05;ytFSun2h%CQ{c94}s*SmOr0$b@)<NKN+YB`*0
z!=xJ?Jrr1LR#{Wm;cIost6P_*MU5bvW#7XBJ;YL!f_Nx`O+k@s#u+S4Yo8sp-&UI9
zHNbi($FPo(Di$|lwHJHwd`&0Lk@=BB6%;;^O!j#a_4&Cpp267D)DLFNoac30xuvCV
z5q?&RtI3b^%J!&fg3<!c!-Z_?3;0O$;7cp?b@gQ8-l-DDkz82-+#tR>fdIafy9rg(
zq+P_Wm#{mlAZJ#rCd9KsW+UjG1&zp|3cT_zti;z)b%+c{bd;zguto=upife#jGOKA
z3c9j9KPyAz@2#&mvFJ_6iGu<rDs3H?s`8aVJLkTI88WC+;|CTi`TSG3FajT$ArvaS
z(ws?YC(suF-LHdBrLkmpOc&Dy9~*-zAT}RUF6YE3pm;_+{Nh6Q1e$$h4)Jd^(OlGc
zE?q|ioH+?ys`%|5AZC-c&6X%ccTC>M3ts1+I%Tb=I5_qpX*Ck`o9eYQGmj?^Nm>ZU
z*|`J>`aK2%YUZFzuL;uM;@}J&2Tagrf?qA3%-QWMhmzQo`lbhal)^c<`V-Q)D2JT^
z2M@rg^$n~NJ?Me)t;U1J;`K(f<Tc!L9meJnVmG5Acob;IW}>6PGy6W|&h2rru)P6Y
zvgAJD?fuR;GW372G<t%@exH83wanAm5R?y^`;m-c?2lQvZ<W~W+JIF-tj?5-wm_^W
zV-z_i;NT!07XW-<o=~*SZy}C_en8c#3TztgbF^4Cdm7QAe-G+@K&%Ng8HIG+IL*IN
jg4+BCB!^$at=0>R=a;9)_gdZ$DP&t%;KBy~nA86N)@_M8