diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 1f1fa7ece6a90..5b671df80b562 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -8065,6 +8065,9 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/corner,
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
 /turf/open/floor/iron,
 /area/science/mixing)
 "bHv" = (
@@ -11697,9 +11700,6 @@
 /turf/open/floor/engine/co2,
 /area/engine/atmos)
 "ccE" = (
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
@@ -12032,9 +12032,6 @@
 /turf/open/floor/iron/dark,
 /area/hallway/secondary/command)
 "ceI" = (
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
@@ -12677,7 +12674,6 @@
 /turf/open/floor/iron,
 /area/hallway/primary/central)
 "cjA" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/iron/white,
@@ -23606,11 +23602,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 8
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
 	},
 /obj/structure/disposalpipe/segment{
-	dir = 6
+	dir = 4
 	},
 /turf/open/floor/iron,
 /area/crew_quarters/fitness)
@@ -25236,11 +25232,7 @@
 	dir = 4;
 	pixel_x = -24
 	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12;
-	pixel_y = 2
-	},
+/obj/effect/turf_decal/loading_area,
 /turf/open/floor/iron/white,
 /area/medical/virology)
 "gCm" = (
@@ -25371,6 +25363,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
 /turf/open/floor/iron,
 /area/science/mixing)
 "gEs" = (
@@ -26089,6 +26084,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/open/floor/iron,
 /area/science/mixing)
 "gZG" = (
@@ -31624,9 +31622,6 @@
 	pixel_x = -5;
 	pixel_y = 30
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 10
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
@@ -31872,12 +31867,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
-/obj/structure/disposalpipe/sorting/mail{
-	sortType = 24
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/disposalpipe/junction,
 /turf/open/floor/iron/white/side{
 	dir = 4
 	},
@@ -35504,12 +35497,7 @@
 /turf/open/floor/iron/white,
 /area/medical/genetics)
 "kWa" = (
-/obj/structure/disposaloutlet,
 /obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
@@ -36618,6 +36606,10 @@
 	pixel_x = 24;
 	req_access_txt = "39"
 	},
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
 /turf/open/floor/iron/white,
 /area/medical/virology)
 "lvx" = (
@@ -40677,7 +40669,6 @@
 	pixel_x = -22;
 	pixel_y = 1
 	},
-/obj/effect/turf_decal/loading_area,
 /obj/machinery/airalarm/directional/west{
 	pixel_x = -32
 	},
@@ -46908,6 +46899,9 @@
 /obj/effect/turf_decal/stripes/closeup{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/crew_quarters/dorms)
 "pWy" = (
@@ -47650,9 +47644,6 @@
 	id = "quarantineshutters";
 	name = "isolation shutters"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /turf/open/floor/iron/white,
 /area/medical/virology)
 "qqM" = (
@@ -48847,9 +48838,6 @@
 /turf/open/floor/iron,
 /area/security/brig)
 "qSx" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
@@ -49355,9 +49343,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
 /turf/open/floor/iron,
 /area/crew_quarters/fitness)
 "rcC" = (
@@ -51571,6 +51556,8 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
 /turf/open/floor/iron,
 /area/science/mixing)
 "rUj" = (
@@ -55569,7 +55556,12 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/turf/open/floor/iron,
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/delivery,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/turf/open/floor/iron/dark,
 /area/crew_quarters/dorms)
 "tAf" = (
 /obj/machinery/light/small,
@@ -56953,12 +56945,10 @@
 /turf/open/floor/wood,
 /area/security/detectives_office)
 "ucv" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 8
 	},
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron,
 /area/crew_quarters/fitness)
 "ucP" = (
 /obj/effect/turf_decal/tile/blue{
@@ -59576,6 +59566,9 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
 /turf/open/floor/iron,
 /area/science/mixing)
 "vmB" = (
@@ -60892,11 +60885,13 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/disposalpipe/sorting/mail/flip{
+	sortType = 24
+	},
 /turf/open/floor/iron,
 /area/science/mixing)
 "vTj" = (
@@ -61222,7 +61217,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
 /turf/open/floor/iron,
@@ -61976,6 +61971,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
 /turf/open/floor/iron,
 /area/crew_quarters/dorms)
 "wph" = (
@@ -65714,9 +65712,6 @@
 /turf/open/floor/iron/freezer,
 /area/security/prison)
 "xWg" = (
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
 /obj/machinery/light{
 	dir = 8
 	},
@@ -65726,6 +65721,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/structure/disposaloutlet,
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron/white,
 /area/medical/virology)
 "xWV" = (