diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm
index f712cd48fc5a..9d13d95831d3 100644
--- a/_maps/map_files220/generic/Lavaland.dmm
+++ b/_maps/map_files220/generic/Lavaland.dmm
@@ -7916,6 +7916,13 @@
 	},
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
+"Gx" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel{
+	icon_regular_floor = "yellowsiding";
+	icon_state = "tranquillite"
+	},
+/area/mine/outpost/cafeteria)
 "Gz" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -26503,7 +26510,7 @@ aj
 aj
 te
 bq
-xo
+Gx
 ee
 xX
 FH
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
index 1afbe6bd86a1..ebed0dbe35d0 100644
--- a/_maps/map_files220/stations/boxstation.dmm
+++ b/_maps/map_files220/stations/boxstation.dmm
@@ -27264,6 +27264,7 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/access/any/supply/expedition,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
index 4739e6e2e1a1..14f9d5b9e71d 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -41960,7 +41960,7 @@
 	name = "Cargo Desk";
 	dir = 8
 	},
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mail_sorting{
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/general{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -61550,7 +61550,7 @@
 	name = "Cargo Desk"
 	},
 /obj/item/paper/crumpled,
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
 "nht" = (
@@ -61654,7 +61654,7 @@
 	pixel_y = 7;
 	anchored = 1
 	},
-/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/windoor/access/any/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
 "niC" = (
@@ -65084,7 +65084,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/airlock/mining/glass,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
 "peo" = (
@@ -69631,7 +69631,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/mining,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting,
+/obj/effect/mapping_helpers/airlock/access/any/supply/general,
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
 "rvu" = (
@@ -72142,7 +72142,9 @@
 	},
 /area/station/maintenance/starboard)
 "sLT" = (
-/obj/structure/disposalpipe/junction,
+/obj/structure/disposalpipe/sortjunction{
+	sort_type_txt = "9"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},