diff --git a/_maps/_mod_celadon/shuttles/elysim/elysim_aldaama.dmm b/_maps/_mod_celadon/shuttles/elysim/elysim_aldaama.dmm
index 35c1c40f3dc0..ecdf68b6edc4 100644
--- a/_maps/_mod_celadon/shuttles/elysim/elysim_aldaama.dmm
+++ b/_maps/_mod_celadon/shuttles/elysim/elysim_aldaama.dmm
@@ -154,7 +154,9 @@
 	},
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/closet/secure_closet/engineering_personal{
+	req_access = null
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "bu" = (
@@ -2661,7 +2663,9 @@
 /obj/effect/turf_decal/industrial/warning,
 /obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/glitter,
-/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/closet/secure_closet/engineering_personal{
+	req_access = null
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "At" = (
@@ -2908,7 +2912,9 @@
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/cobweb,
-/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/closet/secure_closet/engineering_personal{
+	req_access = null
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "CR" = (
@@ -4951,7 +4957,9 @@
 /obj/structure/sign/poster/contraband/missing_gloves{
 	pixel_y = 32
 	},
-/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/closet/secure_closet/engineering_personal{
+	req_access = null
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 
diff --git a/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm b/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
index 05c8a0b8fb7e..dcd9143c5381 100644
--- a/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
+++ b/_maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
@@ -313,6 +313,7 @@
 	pixel_y = 6;
 	pixel_x = 2
 	},
+/obj/item/radio/intercom/wideband/directional/east,
 /turf/open/floor/carpet/green,
 /area/ship/bridge)
 "je" = (
@@ -783,13 +784,13 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
 /obj/machinery/light/directional/west,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "vY" = (
@@ -1079,10 +1080,10 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
 /turf/open/floor/plating,
@@ -1198,10 +1199,10 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
 /turf/open/floor/plating/rust,
@@ -1721,7 +1722,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer2{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
 /turf/open/floor/plating,
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
index 1eb7d644ff0a..50d299be204a 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_junker.dmm
@@ -67,6 +67,9 @@
 	dir = 1;
 	id = "junk_driver"
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/central)
 "bl" = (
@@ -122,6 +125,12 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/crew/canteen)
+"cb" = (
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/closed/wall/mineral/wood,
+/area/ship/maintenance/central)
 "cg" = (
 /turf/closed/wall/mineral/titanium/survival/nodiagonal,
 /area/ship/maintenance/starboard)
@@ -168,6 +177,12 @@
 "cY" = (
 /obj/structure/girder/reinforced,
 /obj/structure/barricade/wooden/crude,
+/obj/structure/sign/warning/fire{
+	pixel_y = 22
+	},
+/obj/structure/sign/warning/fire{
+	pixel_y = -22
+	},
 /turf/open/floor/plating/rust/conf_haz,
 /area/ship/engineering/electrical)
 "dd" = (
@@ -336,6 +351,14 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/pod/dark,
 /area/ship/crew/canteen)
+"hm" = (
+/obj/structure/girder/reinforced,
+/obj/structure/barricade/wooden/crude,
+/obj/structure/sign/warning/fire{
+	pixel_y = 22
+	},
+/turf/open/floor/plating/rust/conf_haz,
+/area/ship/engineering/electrical)
 "hn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -448,6 +471,9 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/storage/eva)
 "jm" = (
@@ -711,6 +737,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/structure/disposalpipe/trunk,
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
@@ -1015,12 +1042,10 @@
 	dir = 1
 	},
 /obj/machinery/button/door{
-	dir = 1;
 	id = "tankr";
-	normaldoorcontrol = 1;
-	pixel_x = -27;
+	pixel_x = -24;
 	pixel_y = -23;
-	specialfunctions = 4
+	dir = 1
 	},
 /turf/open/floor/engine/hull,
 /area/ship/maintenance/fore)
@@ -1306,6 +1331,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
+/obj/structure/disposalpipe/broken{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/central)
 "zY" = (
@@ -1342,6 +1370,11 @@
 /obj/machinery/atmospherics/pipe/simple/general/hidden{
 	dir = 5
 	},
+/obj/item/reagent_containers/food/snacks/burger/roburger{
+	pixel_x = 17;
+	name = "burger";
+	icon_state = "hburger"
+	},
 /turf/open/floor/plating/rust/conf_haz,
 /area/ship/maintenance/fore)
 "AW" = (
@@ -1370,6 +1403,12 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ship/crew/canteen)
+"BI" = (
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/closed/wall/mineral/titanium/survival,
+/area/ship/maintenance/central)
 "BN" = (
 /obj/structure/cable{
 	icon_state = "5-8"
@@ -1417,7 +1456,7 @@
 /turf/closed/wall/rust,
 /area/ship/construction)
 "CA" = (
-/turf/closed/wall/mineral/titanium/survival,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
 /area/ship/storage)
 "Da" = (
 /obj/structure/girder/reinforced,
@@ -1547,14 +1586,13 @@
 /turf/open/floor/pod/dark,
 /area/ship/cargo)
 "En" = (
-/obj/machinery/door/poddoor{
-	dir = 1;
-	id = "tankr"
-	},
 /obj/machinery/atmospherics/components/unary/portables_connector/layer2{
 	dir = 1
 	},
 /obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/door/poddoor{
+	id = "tankr"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/fore)
 "EA" = (
@@ -1583,6 +1621,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/open/floor/plating/rust/conf_haz,
 /area/ship/maintenance/central)
 "Fl" = (
@@ -1845,7 +1886,7 @@
 /area/ship/maintenance/fore)
 "Lh" = (
 /obj/structure/sign/poster/contraband/tools,
-/turf/closed/wall/mineral/titanium/survival,
+/turf/closed/wall/mineral/titanium/survival/nodiagonal,
 /area/ship/storage)
 "Lu" = (
 /turf/closed/wall/rust,
@@ -1934,6 +1975,10 @@
 "MA" = (
 /turf/closed/wall/mineral/titanium/survival,
 /area/ship/storage/eva)
+"MI" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/r_wall/rust,
+/area/ship/cargo)
 "MJ" = (
 /obj/machinery/power/ship_gravity/unanchored,
 /obj/structure/cable{
@@ -1942,6 +1987,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 10
+	},
 /turf/open/floor/wood/walnut{
 	icon_state = "wood-broken3"
 	},
@@ -2006,6 +2054,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust/conf_haz,
 /area/ship/maintenance/starboard)
+"NF" = (
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/turf/closed/wall/mineral/wood,
+/area/ship/maintenance/central)
 "NH" = (
 /obj/effect/decal/cleanable/insectguts,
 /obj/structure/cable{
@@ -2203,6 +2257,9 @@
 	pixel_y = -7;
 	pixel_x = -11
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 5
+	},
 /turf/open/floor/pod/dark,
 /area/ship/storage/eva)
 "RK" = (
@@ -2722,7 +2779,7 @@ VG
 VG
 "}
 (6,1,1) = {"
-kF
+La
 kF
 VG
 vF
@@ -2733,14 +2790,14 @@ yf
 Ej
 Je
 mq
-NM
+MI
 RJ
 uk
 QB
 MA
 VG
 kF
-kF
+La
 "}
 (7,1,1) = {"
 La
@@ -2806,7 +2863,7 @@ VG
 kT
 "}
 (10,1,1) = {"
-kF
+La
 kF
 VG
 vF
@@ -2872,7 +2929,7 @@ VG
 VG
 VG
 VG
-Ry
+BI
 Fd
 WC
 Ry
@@ -2892,8 +2949,8 @@ VG
 (14,1,1) = {"
 VG
 VG
-me
-me
+cb
+NF
 MJ
 zT
 uK
@@ -2924,7 +2981,7 @@ xW
 Mz
 Gf
 xW
-cY
+hm
 fp
 rg
 dx
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm b/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
index 46e39902e8c3..26f860c11b73 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_ramo.dmm
@@ -2377,7 +2377,9 @@
 /turf/open/floor/plating,
 /area/ship/external)
 "dR" = (
-/obj/docking_port,
+/obj/docking_port{
+	dir = 8
+	},
 /turf/template_noop,
 /area/template_noop)
 "dS" = (
@@ -2425,8 +2427,8 @@
 /obj/docking_port/mobile{
 	dir = 2;
 	launch_status = 0;
-	port_direction = 1;
-	preferred_direction = 1
+	port_direction = 8;
+	preferred_direction = 4
 	},
 /turf/open/floor/plating,
 /area/ship/external)
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
index 681e8a99a38b..fb5e26280039 100644
--- a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
+++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
@@ -467,7 +467,8 @@
 /obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/robot_debris,
 /obj/machinery/porta_turret{
-	faction = list("turret","InteQ")
+	faction = list("turret","InteQ");
+	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -1573,7 +1574,8 @@
 /area/ship/engineering/atmospherics)
 "ji" = (
 /obj/machinery/porta_turret{
-	faction = list("turret","InteQ")
+	faction = list("turret","InteQ");
+	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -2349,7 +2351,8 @@
 "oN" = (
 /obj/effect/decal/cleanable/squid_ink,
 /obj/machinery/porta_turret{
-	faction = list("turret","InteQ")
+	faction = list("turret","InteQ");
+	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -7006,7 +7009,8 @@
 "SU" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/porta_turret{
-	faction = list("turret","InteQ")
+	faction = list("turret","InteQ");
+	density = null
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)