From 4f665930ccbb9834e5e612f77b7dbeaf2d359b5f Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 15 Jan 2020 19:32:38 -0700
Subject: [PATCH] a a

---
 .../network_builder/_network_builder.dm       |  14 ++--
 .../network_builder/atmos_pipe.dm             |  18 +++--
 .../network_builder/power_cables.dm           |  72 ++++++++++--------
 icons/effects/mapping_helpers.dmi             | Bin 6544 -> 6878 bytes
 tgstation.dme                                 |  11 +--
 5 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm b/code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm
index b5cd470a32..585e05bd57 100644
--- a/code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm
+++ b/code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm
@@ -1,13 +1,15 @@
 //Builds networks like power cables/atmos lines/etc
 //Just a holder parent type for now..
-/obj/effect/network_builder
+/obj/effect/mapping_helpers/network_builder
 	/// set var to true to not del on lateload
 	var/custom_spawned = FALSE
 
+	icon = 'icons/effects/mapping_helpers.dmi'
+
 	/// what directions we know connections are in
 	var/list/network_directions
 
-/obj/effect/network_builder/Initialize(mapload)
+/obj/effect/mapping_helpers/network_builder/Initialize(mapload)
 	. = ..()
 	var/conflict = check_duplicates()
 	if(conflict)
@@ -22,17 +24,17 @@
 	return INITIALIZE_HINT_LATELOAD
 
 /// How this works: On LateInitialize, detect all directions that this should be applicable to, and do what it needs to do, and then inform all network builders in said directions that it's been around since it won't be around afterwards.
-/obj/effect/network_builder/LateInitialize()
+/obj/effect/mapping_helpers/network_builder/LateInitialize()
 	scan_directions()
 	build_network()
 	if(!custom_spawned)
 		qdel(src)
 
-/obj/effect/network_builder/proc/check_duplicates()
+/obj/effect/mapping_helpers/network_builder/proc/check_duplicates()
 	CRASH("Base abstract network builder tried to check duplicates.")
 
-/obj/effect/network_builder/proc/scan_directions()
+/obj/effect/mapping_helpers/network_builder/proc/scan_directions()
 	CRASH("Base abstract network builder tried to scan directions.")
 
-/obj/effect/network_builder/proc/build_network()
+/obj/effect/mapping_helpers/network_builder/proc/build_network()
 	CRASH("Base abstract network builder tried to build network.")
diff --git a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm b/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm
index 3c7bcc3bb0..0c39e517b3 100644
--- a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm
+++ b/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm
@@ -5,7 +5,7 @@
 /* Automatically places pipes on init based on any pipes connecting to it and adjacent helpers. Only supports cardinals.
  * Conflicts with ANY PIPE ON ITS LAYER, as well as atmos network build helpers on the same layer, as well as any pipe on all layers. Do those manually.
 */
-/obj/effect/network_builder/atmos_pipe
+/obj/effect/mapping_helpers/network_builder/atmos_pipe
 	name = "atmos pipe autobuilder"
 	icon_state = "atmospipebuilder"
 
@@ -20,8 +20,10 @@
 
 	color = null
 
-/obj/effect/network_builder/atmos_pipe/check_duplicates()
-	for(var/obj/effect/network_builder/atmos_pipe/other in loc)
+/obj/effect/mapping_helpers/network_builder/atmos_pipe/check_duplicates()
+	for(var/obj/effect/mapping_helpers/network_builder/atmos_pipe/other in loc)
+		if(other == src)
+			continue
 		if(other.pipe_layer == pipe_layer)
 			return other
 	for(var/obj/machinery/atmospherics/A in loc)
@@ -32,7 +34,7 @@
 	return FALSE
 
 /// Scans directions, sets network_directions to have every direction that we can link to. If there's another power cable builder detected, make sure they know we're here by adding us to their cable directions list before we're deleted.
-/obj/effect/network_builder/atmos_pipe/scan_directions()
+/obj/effect/mapping_helpers/network_builder/atmos_pipe/scan_directions()
 	var/turf/T
 	for(var/i in GLOB.cardinals)
 		if(i in network_directions)
@@ -41,7 +43,7 @@
 		if(!T)
 			continue
 		var/found = FALSE
-		for(var/obj/effect/network_builder/atmos_pipe/other in T)
+		for(var/obj/effect/mapping_helpers/network_builder/atmos_pipe/other in T)
 			if(other.pipe_layer == pipe_layer)
 				network_directions += i
 				LAZYADD(other.network_directions, turn(i, 180))
@@ -56,7 +58,7 @@
 	return network_directions
 
 /// Directions should only ever have cardinals.
-/obj/effect/network_builder/atmos_pipe/build_network(list/directions = network_directions)
+/obj/effect/mapping_helpers/network_builder/atmos_pipe/build_network(list/directions = network_directions)
 	if(!length(directions) <= 1)
 		return
 	var/obj/machinery/atmospherics/pipe/built
@@ -74,7 +76,7 @@
 	built.SetInitDirections()
 	built.on_construction(pipe_color, pipe_layer)
 
-/obj/effect/network_builder/atmos_pipe/distro
+/obj/effect/mapping_helpers/network_builder/atmos_pipe/distro
 	name = "distro line autobuilder"
 	pipe_layer = PIPING_LAYER_MIN
 	pixel_x = -PIPING_LAYER_P_X
@@ -82,7 +84,7 @@
 	pipe_color = rgb(130,43,255)
 	color = rgb(130,43,255)
 
-/obj/effect/network_builder/atmos_pipe/scrubbers
+/obj/effect/mapping_helpers/network_builder/atmos_pipe/scrubbers
 	name = "scrubbers line autobuilder"
 	pipe_layer = PIPING_LAYER_MAX
 	pixel_x = PIPING_LAYER_P_X
diff --git a/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm b/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm
index f6da49c255..419004468a 100644
--- a/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm
+++ b/code/modules/mapping/mapping_helpers/network_builder/power_cables.dm
@@ -3,7 +3,7 @@
 #define KNOT_FORCED 2
 
 /// Automatically links on init to power cables and other cable builder helpers. Only supports cardinals.
-/obj/effect/network_builder/power_cable
+/obj/effect/mapping_helpers/network_builder/power_cable
 	name = "power line autobuilder"
 	icon_state = "powerlinebuilder"
 
@@ -16,11 +16,17 @@
 	var/cable_color = "red"
 
 
-/obj/effect/network_builder/power_cable/check_duplicates()
-	return (locate(/obj/structure/cable) in loc) || (locate(/obj/effect/network_builder/power_cable) in loc)
+/obj/effect/mapping_helpers/network_builder/power_cable/check_duplicates()
+	var/obj/structure/cable/C = locate() in loc
+	if(C)
+		return C
+	for(var/obj/effect/mapping_helpers/network_builder/power_cable/other in loc)
+		if(other == src)
+			continue
+		return other
 
 /// Scans directions, sets network_directions to have every direction that we can link to. If there's another power cable builder detected, make sure they know we're here by adding us to their cable directions list before we're deleted.
-/obj/effect/network_builder/power_cable/scan_directions()
+/obj/effect/mapping_helpers/network_builder/power_cable/scan_directions()
 	var/turf/T
 	for(var/i in GLOB.cardinals)
 		if(i in network_directions)
@@ -28,7 +34,7 @@
 		T = get_step(loc, i)
 		if(!T)
 			continue
-		var/obj/effect/network_builder/power_cable/other = locate() in T
+		var/obj/effect/mapping_helpers/network_builder/power_cable/other = locate() in T
 		if(other)
 			network_directions += i
 			LAZYADD(other.network_directions, turn(i, 180))
@@ -40,7 +46,7 @@
 	return network_directions
 
 /// Directions should only ever have cardinals.
-/obj/effect/network_builder/power_cable/build_network(list/directions = network_directions)
+/obj/effect/mapping_helpers/network_builder/power_cable/build_network(list/directions = network_directions)
 	if(!length(directions))
 		return
 	else if(length(directions) == 1)
@@ -63,117 +69,117 @@
 					new /obj/structure/cable(loc, cable_color, NONE, directions[i])
 					do_knot = FALSE
 
-/obj/effect/network_builder/power_cable/proc/should_auto_knot()
+/obj/effect/mapping_helpers/network_builder/power_cable/proc/should_auto_knot()
 	return (locate(/obj/machinery/power/terminal) in loc)
 
-/obj/effect/network_builder/power_cable/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Red
-/obj/effect/network_builder/power_cable/red
+/obj/effect/mapping_helpers/network_builder/power_cable/red
 	color = "#ff0000"
 	cable_color = "red"
 
-/obj/effect/network_builder/power_cable/red/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/red/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/red/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/red/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // White
-/obj/effect/network_builder/power_cable/white
+/obj/effect/mapping_helpers/network_builder/power_cable/white
 	color = "#ffffff"
 	cable_color = "white"
 
-/obj/effect/network_builder/power_cable/white/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/white/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/white/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/white/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Cyan
-/obj/effect/network_builder/power_cable/cyan
+/obj/effect/mapping_helpers/network_builder/power_cable/cyan
 	color = "#00ffff"
 	cable_color = "cyan"
 
-/obj/effect/network_builder/power_cable/cyan/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/cyan/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/cyan/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/cyan/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Orange
-/obj/effect/network_builder/power_cable/orange
+/obj/effect/mapping_helpers/network_builder/power_cable/orange
 	color = "#ff8000"
 	cable_color = "orange"
 
-/obj/effect/network_builder/power_cable/orange/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/orange/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/orange/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/orange/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Pink
-/obj/effect/network_builder/power_cable/pink
+/obj/effect/mapping_helpers/network_builder/power_cable/pink
 	color = "#ff3cc8"
 	cable_color = "pink"
 
-/obj/effect/network_builder/power_cable/pink/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/pink/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/pink/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/pink/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Blue
-/obj/effect/network_builder/power_cable/blue
+/obj/effect/mapping_helpers/network_builder/power_cable/blue
 	color = "#1919c8"
 	cable_color = "blue"
 
-/obj/effect/network_builder/power_cable/blue/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/blue/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/blue/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/blue/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Green
-/obj/effect/network_builder/power_cable/green
+/obj/effect/mapping_helpers/network_builder/power_cable/green
 	color = "#00aa00"
 	cable_color = "green"
 
-/obj/effect/network_builder/power_cable/green/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/green/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/green/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/green/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
 
 // Yellow
-/obj/effect/network_builder/power_cable/yellow
+/obj/effect/mapping_helpers/network_builder/power_cable/yellow
 	color = "#ffff00"
 	cable_color = "yellow"
 
-/obj/effect/network_builder/power_cable/yellow/knot
+/obj/effect/mapping_helpers/network_builder/power_cable/yellow/knot
 	icon_state = "powerlinebuilderknot"
 	knot = KNOT_FORCED
 
-/obj/effect/network_builder/power_cable/yellow/auto
+/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto
 	icon_state = "powerlinebuilderauto"
 	knot = KNOT_AUTO
\ No newline at end of file
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index 037c1aa66090af6a10b89c422b3e00be0c0da471..e3cc3865b27fcc3771a19dabe0f40c2bba6a0e17 100644
GIT binary patch
delta 6652
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
O4<kKO-D+*e=l=t>HUMG(

delta 6316
zcmX9?cRX9)`;SdkWA8nxs#a@{NJ)!YT~^u}rN&2XEh^m9Dm7}=CN^DGwYJ!lqQt08
zY>LE82)^<A-9PT@-q$(j8Sm#j@8>yZRw@2gg#ZP>{mcM%`>}u4)-%B9u|@OwQ(7mN
zzV_>~wgOJ0Oz$gAr_E5G?CdH!s2^QxES?;rMNAamIJNr<d4_ozJJtNsDE6l-z?|uh
z%{VAhaw&o;nn~wAn!3A1HGW<D_0W}4=$%V_^{T4VN8QstYCfy8M6cC>Q-v(kn|9lE
ztFwb@z!734aDbTOgZ4BwHnz2uzhrQi3u)&a$`IdrU!DTaE}Oa;l-k$X@U-kGR@U&w
ze7*oxaQ%NALK`F?N4>N2p>PC_8D`Ose#18{R7?dme)I^#NXuo&k<U6`^2Hnv@C(uT
z2QXcclw4HGaT1LYgW*3OQS#H_G;77Ikaz9?rS*)0CMH*o3yBDLO6+aH(SpA6{H8Bd
z(<SN7I~y%)yI(-}-F#a|pg%wuL~|}U6ru_liOCv6fJ%S4^mpU)91Efgc{e0QG=)e*
zAev84{MU~{Mr1UJJ<E)*vL6OB78F<8Q-MZWJPy|E`)+>(E!W$~h)AZaBxt=~><s}%
zWDt8jf+hwI3j<FW+EmMF+r+6u=)b9+Q9ZsSKRZ*-TN&1eqQ_E+C&m9%z%4hCtugb9
zsh73PI}!Lfp(vd;g8ju1X;QGqMq!9il+LQuFE!8~aZgjJ{j=3GEsqcHTgGm#2!XV&
zh<B3_j?nUZo*v$wQCwWiwKQBf4y4br7=L|Q&1tmt%8_ogboj2aFaMf%o&Q;-we9Ph
zwHZ7ho|1dRg)d^@NY-H+WhJE`KHa)@ollvg$Gj1Lp~3WSbtRRyvxp%z+0?tyfA(El
ztC6DV`to=ls+$^vWP}K@3YTSEsi^yIBwcOWr=%9;5@ADm<vOiq7g#790EjEl`h|H#
zmK0`TX6rB`L`1>yF!qsiEvc^do>=Nt0jjPW(A2(zKFb{zsbpABhts7IO@tT6y-De}
z40*qbXoQOm=yL~QuuDbmmSBAPE6)GSEQ=Y7MI;pkWNegd4yfcSkA(#{J5cu{4UlhM
zqaE93JoGvw<eMA0{LlglK)rrS_<t0v`1P4n$^}Ugue-**b#>&(Lj$*Ys{LLGFHb*h
z$!~ZNbJvLTk27BB!@q_61GcV9lXI{3yXDxO{4OVuV;Y<056V*!>RFDWTQlgEp4*|O
z_6s%hE8u48Gtz0RgZr|JXswr0WQKK68`8@^)J9p0IwUb~G4F{3;<J%szrKdjPl&^G
zOId|^&Ut=Z%6~EI+<H}HvTc8=^7o~ml=)26L7C31x0waltYabrWYXS>aB{m-FrGP`
zQuqVb3@3BvmvfnrdIV65%=Jx~^&kCc4PV3B?#t;<2IGm_>=3mupW4crn`7!7A?GJp
z#z)(;dGEM~(eNv3z-2DsM(uK#&#n9Sp|CZEK;xG^4D+yZJ5fSs!G{c@+0cfjpr;QT
zwjfT4Ef*gQCF_a_p}fy2KkJ<2dGlJ!5qLhq4g@_AYd^F9X4eRc624kL=ie^2;1I9Z
zZ{dQh;j)}uI6pDV(0*pfy4Wz^q9DY)K#-%HZtM8_0dWMhXwxQp_dY*AzG+<F^I7*t
zG5>0KNW}yv*Ghr<iEi$m8pz92ExncUjkwSw+?I_^7kC1ZmXW}|FLGbKSX);a<)|~p
z*Rd`rho@MnKt3$3d_6R6;oij$5^WB!I?VN<8V|bGZ%6|gsXKLT+4nmB+JY0`tNORL
zad4q?7WkaP?6vQg(Mma+h*%n+ds}N;I44%C%r69LNry;Wi;a{!YEu6F^rSuw;<L5c
z6I9Mr6!3|=R*=8cVB7j~aN2ETUT(P3NJsuK)-_0h?nK4CYu`%Q2=$`<EH-oK__>Kb
z%gvtl7|P48*)jF2zkie$9CY$mepv>2f`*+Y?gOiWw>P8JC{hwcG=B@XMApN2y`Q;9
zx~n=uo}b>lG#1gH`Jf`js`Z*JEd`wNVV|<+3>S{!W9n_5s_(WxDrfhh*9^x=4Z1b#
zW8q5eWbstn{iTyND#AhMUHwM>*O|qk_!pZSPoPIyo=jGwvZ;*2iffG=Qp2*!ziGqM
z5`YI4oMtD;%y)j&g%(>=d=I$#nIl0I!z^)=gVtB*Z;B;x`oR>+7z5mHJm;_7W@NRv
z+X{DJ|9XdPGzd9;L}{@fsej}#&A-IuKp!?jX%3cgZ70N5g75~I>VLuZEa{y5XlKM@
zyt-&J-5!eBsTLLqLo8{q*a3TX)0&L{7318g3A;!Wyp5TDJ?T^W8weel7&>d3mxiyl
zYgFi-F6I-;8msAFZL^T4Q=Rs|>(nHFdnr+;G23JZQd?NV!^nc6qs>j+8$v4imr|fe
z&^nhpuPhK}7;Q@NIN8tuJ`FvU)Ym=d6PJOsXj9Y$_`h3Y6c>iHWWEFZBH38rVV8U9
zH~1py4JW1XxK1+=$7ZZav`^jV)YqUXVmC#oHQ~&y?<k+J)aB)HYH^&6R4pkd+k|!_
zLdstJxalw>@6Gt<4La-=f|t9m`3u)G%R)v&ce9g2?8<_`nSziKgNQv$86SDYahl2g
z63PEKDOV952A%(>0wfcbwmawPGIOMC$q}oX+36kr_!sT<{pH!mB5A5&eU%%js8;aR
z7G`o(xyYN@vcfl<p!USiyc&6dg_RfCan&b&%EEG9i}Ke(U$u%rHIf-3A7#`&75&91
z&sa)*6-sk?0^u(<{`PZFARg{&+M+f&M+YjxF)9?;0y5UF&-mhZVxQ7Qyo4AXR7OSd
z8_BeI5&Y6?pUNI*zpwQOD^-8om*7SuZ|%D-vvIlq2Y-0MfL6%EfAnynGM^8T*zefa
z2rXMU#qJTZ{M?K34(XJ;Qvd|LnneiPTdQITiDZT%G3m5TZF$Mv^mr>N&qOO4%e|Vp
zT;SLPO(7gP2nOfc^FyTJGNO<Lv)=zw`)F=O|4F8FNGKV38|mTl?%dyn&eN{B?hd)8
zMTKwZMNkBClK;=;7{1wg*0Hxzr`cAVPQmD7%ZEwbjuBD~woP`s*UW};BjOw-)RZNz
z1|fUFaudzws!BIV#*AKd<^fk_w7(+(kh^bevxsq^vvsfQz18a8g2Shx_*;zrzYbrO
z(s7%@hLKSNgExd}hJ{;T1%F%=3u8HDQPWNK3m&BT{<oW4o8!OXPrZF_4|N?Ktc-s?
zGeWXXZ|`Z*g24TTF1a6Ej0UTf!s=5Z_96Gi@3zlP5Dxvu<;KeAZJL<2!I*IX)S^4+
zfr+*0JHAD69lC8deE+ypFA(Ki-r&3cZ6=2i^@3dVp;O$1U29Lhsxib~!Z+;(&qvcl
zhU(AgZF}f<n58fQm$;>hRILAU|Bds~_|z&s1+&iceXIMpp{X<7<b(xE%rhmMp<gfV
z6~QfaZex8s`hIBH!mEEO79e*r)yp|u{3kC9vofQd=Ct;V8;L*4&}DJXqRn~{Z#B`Y
z{ndhRq>7y;d5<+`y^G#~34Fzai!$Kx{?0ZqsQX<;0wx38otPM^_KisHjV?D4$jjX+
zlgl2}pZ1X)J>w%t2N&x9#F~m>)bKc$_`C7S9b1q&`^0o70A5XslaQb@)KG4zEL^fR
zH4LH&`bvi$I~d1MnmYk&=Q?+u)P&I_2NEtk0<k-(hqe>0KP#X)ZyU}0$%e<5&(g9i
zTzqe~n&z6F9<U2Dyf&7L&upc<uCtwrTCWzvxaa{jHEF9}Uk4XCFh!9+G?Ew5uMe}I
zX~`S_9Q)#hB}L8H$qB#L>#gOlPG7MJ2h^RmA<io&x{>#0Oi<m7yMNTKbcRSEAL^EJ
zyk!MS8h$?aC7O}D1LTP!+txDy?q|Uq+1rzsv@Sd^OJWvnD<3veqK)CciQcu(a_GD6
z66wF2WT5}rdIF@yFcggnu{@XVo|}Dz?FaNcNXtbwGqv8Nt!IhV9I0{5Kb~yo)SpoF
zH%~nNH5$KOO{eJI_41_BO9)6rl+Y~>HwFoM1QcTg6F4q)?^r(cuBd*YdxtE#Wmi%~
z2sFs`F}O}7H7Bei$>!6UBz(h%*!|}1#IO1P93O+A7w~@kxgdGu<!Y|^WBGazV6zfg
z3>~C(c~As#Zr6S%*@koc{ZnYM`xFfHvd`sLDohzfX^844@1NQ)*wntk9ER9<^huDU
z$35!n5L+opPgyNS=C-)>HHjZLP}vqM^So8VQ{JX*tN!8k2ET5XiF^sU*H?S%p9VVD
zxxioUrw9jk%HBp2-gqNaSu=hG0E%v6T(ncx_q9n<j}XztMtB)fBGK!t&@<=tZ^1{R
z9I7X5;Q%oy6C5wn`v1Koo70-_<U#a-t8*}!+x7z*=T+IY;~g~)2knFe^}h>H3B!}g
zcKd<m`D$jqOX$X!|JoCd{Q&u3!Cxq;eqPre_+EYH$2uZFPF)Wuf4)KFAF?ng=_jXg
z@`@d0A%EpVdi$K`ySNk0Sq(DQ3aK3&37U(L>XYrfSVQc4auz(V=c7fQxd*V&XYoX}
z%@LQK>QXsTI_=AYon{$1DaV)8WB*O(5hu9gL!MfUtl~v6E^?f_i@~<}54yWvN+!MJ
z_ZPh5Elo-70AwpppJ_<%X{03cBWhom(ahU?6N&RmOv$zwLt{V5tb?p?jlRC|-OWVU
z@Ikss!x|kMFGY}`Tp2$Q$i*{Nn=@s;->(<QPu_mM<Q#mqlxOG^L(cgG=NerpJX^ei
z;NS@wb0i-EENmFZk6pZ{xXNa$vvG6Vdo=h=Adj(ZU{TUs?>8@yp-H;1y?KLfzk0-i
z8J}Q}m5hETXR@915O0+*cbW1lOV%*6^7S;Gu$mLZhlH&=52sIGQ<HJ*$vxSwIji9J
z2Iu^Qz;T!X+qh6w%t!dOFSyLx$Wdl<JrMM7h3$I@^}4&BH>A|kyxnCd8`S^g1Ol|=
z{LxoaQL$CI^meif+$rbga1%575b<W0yi$qzke-t5oOiYsOC9P?UBxF+q9mjTkaV)}
z27U$CtOhNKF7)=dCS)F%FQ|lqzJ$jzknLO3V&N%vdgmSZ*Vzzis$)$IE?ILI-bA%@
z$l17iWIO12BE?i$gLy-i6WjpA7aSjiv8!Y11j*podXJemZvkd_dI5sx2>=&Shlksb
z`%H1hH{!8$q|It?L$`&W9hnKJCN85UF8+-m`j7&T+TaTY(Ds_9+t%kK6ZP~Kk?Y|=
ze`m&cMlf%jY1buT-e7NV-M)Ug5*wQ5My}Lt!K(c{^;Af(Ft9v5&Ez(V!HUEF@{S7i
z2aW8q!H%uVCWz@E31M)|@kd(H<lgxv8s8uE6o}K%Ui^mI>L8ymI=*&F=+Vdl@h|Sz
ze}JFqm;GSX-V8B|SaH^_+o4gv`IguHR#=yO2FeOb6Xu#lbBAwE4iWrB9l6i<tl;ww
zTi+}AvO*#Xu!1h*UOE`1vS7Wx?Ha+)95{tcS)|lg(yK|oT9)EWy9rEjV8Xu!CrgB8
zmq(mI<VWlxPe1A!o*1(N&Y*cB0?8R7MX{p>orCYF#8@p}3_4#7uI2<C#S~!|rEsR3
zJBL?HumnW?sEzAcq`=U<N}WRd0_gmN8V>CA(6?%TLr-axik-(U>h=qZ40*$Mr8icD
zkZ~jm`P{RNUAo^PAF=I2DkTZ)$#dYVSxKi#um(P{%jeaQ59r-Dc+3e!5wLFjDGCmJ
zBZ^JN{}(~<ANG54%W<lNf_o%$u9Sdq{DdAOi8R<25j-hxE6kksHYMwXU`w~I0Btz%
z@Cpit0e>dfw6P2uS%{FI_!n&RW4@KIh=9OGVr&_C>3hyUU-5WxQfQmpgRh$1d9`Q_
zVI8D9p141+Qhx^D>w`mEM=K~>n1-9;E5XdTl?Hb_z9;%mqJrcCxS|WcL`T9C?`bF#
z7WeA*Fu%lM;NYTT8;z3zz{a%J6_fYJaiHkKPOyK!^b@g#MA!2b?WT!I%tL@G-VGQX
z)YeC4$9e#(bvP?pn;^!uX1X#FSJ5%PkLI{dw>sL6ZpKI-oxQ%LSVn+c2W$*y_=bz{
z#Hzhs+WmQp&*uz&ZuJ=i#KTfIAie7D<8!2JEk0C*j?95P2p~X?-00Je$8#_*L>9hS
z{mAqOzd#_<Z{ZI3I{Q4zEgbGwILL;%Lfus&rjxphIbtD{+@_QvtbRoh=f=@K#jh^7
z8FWTK43hBsIp>x&MS2&`Igv$?PaMwLfmShmG99aIm<xTeLXB#|x=g}94@-8~j8BuG
zKvRm}>GRW!yccfVXoag0$Ss#o<?+QbfcGAS02aeUE=HzF9VMBZb_h)@H`5#XsNQmA
zh>%XrdH3}xZR|0fWs6m`VVsE;Ds*7z%k#CUe~ncXE|V7=@B7|Vg#gWP%V0*i^MZy}
z*+Wo|t+PHE(+2;*6P<gi&+Ex^fe!^Q&r3H@)c^4~Ui5HIGO}tJn2Zk*eW*q9Jw!e|
z)o?TEM(Q;59l<wrY2oM&r;tZ{J?H7nE?8uUFxs`MOE|Pi&9*r7V&4)nI}QD5ueDE7
zzUb1>9naD!2u_;PIg?eVHe$`sBxF8fZ={h6h;NLk%3r<C5-O0CHo&aOlTV<#m3>%o
zGWYd2xq>R=Dgw>anV%sbQb6P(+Hg`^qx>cG%W<E3cdzVp7>B7FLnL_hjr-IgWH77-
zjh+(Xg6$A|#|N7C#>kN_GeR_nGFo^{njjwFv65)VA_C$re$a||lf0kPaUMI-@(>h1
zP<qHkIJfw64CwLm-5o$X!4UN(ep~9-AvT$c5FsKMg2%qY;V6)+_?YUm7;W{l_!EkC
z8xdoj@-XJr(&>j;@!BZ_UnbnSX+o&xhrlKNsKIW5UvREf0^&A_|DBV*U|hSfRs8su
zv#2g1Zy8IIu$!Ar;*hN8$%Xg%7YH;-O;<p3b6Wy{?+vMmkKXR?;fjiP8?k!^#G-&6
zqjFP63;M<JYY^LFBWKySPg4oLpflKYAp->DjnCIHl497gX;O|oDPd2qQ4H?x1$P-M
zC`5!4e5HnPdR0PlIi$p6IxR$(kO0u3k>AgX8i3)6A%e|<2d0W=6&m@=whjn&PLy0F
z0pO6ywOYhf5)e_HLgLWx-6i&TB5U+qRi2t9qPb(<;$O%Cy$M^HXI|OGKqxBkaOTzx
zh~T11jExzxS2D*x1pR80Gs{F$QxNR<JMFD0gc!yM6#caP`H}}6c;wE`$+<C*eT^iW
zYS_+t2W)m;x^i~116DOLHXbdMzYHXSKU1qhAZ4%AxUWh*W{6)6_}14dZ;*EnshnxN
z=`C;cu#`1-a1~R}e>sUgWh*3A=1JH1*x38I*!k3x0cL^UxE;8?&g<7dhwj)$QhcUP
zOUysCF?Eg}7%(Y_ZebRC%;4$!IAGln{AWfEG%_}}G0DW+kJ7&{0d3Hdr=9|u0*~0e
zyST!`!?W5K<Q+IdZu5~9wlC1D=G=0M<9rcC-*NnB#>2^}#NE8d`3x3%o#JqRKTI=@
zYpttfT$_=RQB4a5-Se2)0RPZC+mO*|`~GUvTv1sWZcg}Rs(tDU3$K~l@>Jzt+t|=C
zF)?YW3)ox9tEx)$Q{{gU<pnr6i02z$Ub5?p`jA^u5%2o)<&vwb>jQK1E~*yd-m21i
z4hMlM=ZPkfjfdZ(;!$~Boz>3-XG0xY(mia!(BHp3Y~w~&R_SSi-?)<r-@kvS+Lop_
zA(`xU^p=O^<Oo98fol8b1%B<G-<<}{C7>U=#oW8S)w4e{dM@{Jbov1MmeP|ldWBCC
zFGYwjfBN((0`Af-Ge3~6@d8uS_Q18(d9#RS&3kLMiLa$Y^}f1V6kYYo`RNYe@fGAW
zki~Pr?K#^R;Mp*fPxHI4PuJ8G+{686^FUNWg2vw79$T-_?Nu@H5=TVLt6niMFsSue
zjl*)s3tD2pT3O5=!%Bd$kb6Xf0xC8pxl~SRKzuoI@k2^CPS&zNZmqZX-r3|2*L;w`
z6}l?|>g+W(iPairtRh>&aSn~#jM`dv#TybAJLTxqf|ZUG;K&pl6(=XB_rg<|>gbLI
zPfxgVGrxAF`hG;DKfdpFuZNjsFIXQY>`D9YF2izu6rFbZIxB$66(kK;F$WjS8Vpf>
zrd~VfT15@PLfYDN;$Ca%4@#&5`Q!`Eq$II87j~{c=J(xQjO2nTn}}=-DF`V87YT<d
zoFwaw2C<Bm%VXWn!P4!+auSssS2o+L<Rn;Zavyw$PICRKw>hXlaQ(J*vpg#jr**xU
vqhKjS77!&a;+6aBUQbU?<kfJyGz0;VmtgOUPr_XVkspIQCa^Lc+mQbO8McIU

diff --git a/tgstation.dme b/tgstation.dme
index bcdf92e752..318e06c2e4 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -14,6 +14,7 @@
 
 // BEGIN_INCLUDE
 #include "_maps\_basemap.dm"
+#include "_maps\boxstation.dm"
 #include "code\_compile_options.dm"
 #include "code\world.dm"
 #include "code\__DEFINES\__513_compatibility.dm"
@@ -800,11 +801,11 @@
 #include "code\game\objects\effects\decals\decal.dm"
 #include "code\game\objects\effects\decals\misc.dm"
 #include "code\game\objects\effects\decals\remains.dm"
-#include "code\game\objects\effects\decals\Cleanable\aliens.dm"
-#include "code\game\objects\effects\decals\Cleanable\gibs.dm"
-#include "code\game\objects\effects\decals\Cleanable\humans.dm"
-#include "code\game\objects\effects\decals\Cleanable\misc.dm"
-#include "code\game\objects\effects\decals\Cleanable\robots.dm"
+#include "code\game\objects\effects\decals\cleanable\aliens.dm"
+#include "code\game\objects\effects\decals\cleanable\gibs.dm"
+#include "code\game\objects\effects\decals\cleanable\humans.dm"
+#include "code\game\objects\effects\decals\cleanable\misc.dm"
+#include "code\game\objects\effects\decals\cleanable\robots.dm"
 #include "code\game\objects\effects\decals\turfdecal\dirt.dm"
 #include "code\game\objects\effects\decals\turfdecal\markings.dm"
 #include "code\game\objects\effects\decals\turfdecal\tilecoloring.dm"