diff --git a/_maps/shuttles/shiptest/independent_litieguai.dmm b/_maps/shuttles/shiptest/independent_litieguai.dmm
index b2317cebc331..cf8ac312b338 100644
--- a/_maps/shuttles/shiptest/independent_litieguai.dmm
+++ b/_maps/shuttles/shiptest/independent_litieguai.dmm
@@ -22,10 +22,10 @@
 /area/ship/storage)
 "bl" = (
 /obj/docking_port/stationary{
-	width = 30;
-	height = 15;
+	dir = 2;
 	dwidth = 15;
-	dir = 2
+	height = 15;
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -1123,8 +1123,8 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 10;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 10
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -1287,6 +1287,11 @@
 /obj/effect/turf_decal/trimline/opaque/red/filled/line{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 10
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/fore)
 "CX" = (
@@ -1671,10 +1676,10 @@
 /area/ship/storage)
 "Ml" = (
 /obj/docking_port/stationary{
+	dir = 8;
 	dwidth = 8;
-	width = 30;
 	height = 15;
-	dir = 8
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -1960,8 +1965,8 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 10;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 10
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
@@ -2072,8 +2077,8 @@
 /obj/machinery/stasis,
 /obj/effect/turf_decal/industrial/outline/red,
 /obj/machinery/smartfridge/organ{
-	pixel_y = 32;
-	density = 0
+	density = 0;
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/medical)
@@ -2563,8 +2568,8 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 10;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 10
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
diff --git a/_maps/shuttles/shiptest/independent_schmiedeberg.dmm b/_maps/shuttles/shiptest/independent_schmiedeberg.dmm
index 5aa7e7a2ea36..78836ac3bde9 100644
--- a/_maps/shuttles/shiptest/independent_schmiedeberg.dmm
+++ b/_maps/shuttles/shiptest/independent_schmiedeberg.dmm
@@ -88,8 +88,8 @@
 /obj/structure/table/glass,
 /obj/machinery/smartfridge/disks,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -223,8 +223,8 @@
 /area/ship/medical)
 "ca" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood/corner{
 	color = "#543C30";
@@ -443,8 +443,8 @@
 /obj/effect/spawner/lootdrop/maintenance/two,
 /obj/effect/decal/cleanable/greenglow/filled,
 /obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 8
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -471,6 +471,9 @@
 	dir = 1;
 	pixel_y = -32
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "fO" = (
@@ -494,6 +497,9 @@
 	dir = 8
 	},
 /obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "fY" = (
@@ -597,8 +603,8 @@
 /obj/machinery/hydroponics/constructable,
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -652,15 +658,15 @@
 /obj/machinery/plumbing/input,
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 12;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 12
 	},
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/medical)
 "il" = (
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/cargo)
@@ -693,8 +699,8 @@
 /obj/item/shovel/spade,
 /obj/item/cultivator,
 /obj/effect/turf_decal/siding/wood{
-	dir = 6;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 6
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -750,8 +756,8 @@
 "jQ" = (
 /obj/machinery/light/small/directional/south,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -777,8 +783,8 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 12;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 12
 	},
 /turf/open/floor/concrete/slab_4,
 /area/ship/crew/canteen)
@@ -823,8 +829,8 @@
 "kF" = (
 /obj/effect/decal/cleanable/glass,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/cargo)
@@ -832,8 +838,8 @@
 /obj/structure/table,
 /obj/machinery/microwave,
 /obj/effect/turf_decal/siding/wood{
-	dir = 6;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 6
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -995,8 +1001,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/light_switch{
-	pixel_x = 20;
 	dir = 8;
+	pixel_x = 20;
 	pixel_y = 12
 	},
 /turf/open/floor/wood/walnut,
@@ -1079,8 +1085,8 @@
 /obj/item/paper/crumpled,
 /obj/item/seeds/cannabis,
 /obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 4
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -1224,16 +1230,16 @@
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance/two,
 /obj/effect/turf_decal/siding/wood{
-	dir = 9;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 9
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
 "qV" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/sign/departments/chemistry{
-	pixel_y = 29;
-	pixel_x = -27
+	pixel_x = -27;
+	pixel_y = 29
 	},
 /obj/effect/decal/cleanable/oil,
 /obj/structure/cable{
@@ -1430,8 +1436,8 @@
 /obj/item/reagent_containers/glass/rag,
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 8
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -1567,10 +1573,10 @@
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
 /obj/machinery/button/door{
+	dir = 1;
 	id = "pharmwindows";
 	name = "window shutters";
-	pixel_y = -23;
-	dir = 1
+	pixel_y = -23
 	},
 /obj/machinery/light_switch{
 	dir = 4;
@@ -1616,6 +1622,9 @@
 "xc" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/directional/south,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "xg" = (
@@ -1637,8 +1646,8 @@
 /obj/item/chair/stool/bar,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/turf_decal/siding/wood{
-	dir = 9;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 9
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/cargo)
@@ -1760,8 +1769,8 @@
 /obj/machinery/hydroponics/constructable,
 /obj/structure/extinguisher_cabinet/directional/east,
 /obj/effect/turf_decal/siding/wood{
-	dir = 6;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 6
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -1785,8 +1794,8 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 12;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 12
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/cargo)
@@ -1835,8 +1844,8 @@
 "Ab" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/cargo)
@@ -1866,12 +1875,12 @@
 	pixel_y = 32
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 5;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 5
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -1892,8 +1901,8 @@
 /obj/item/radio/intercom/directional/west,
 /obj/item/storage/pill_bottle/floorpill/full,
 /obj/effect/turf_decal/siding/wood{
-	dir = 5;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 5
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -1915,8 +1924,8 @@
 	},
 /obj/effect/decal/cleanable/food/tomato_smudge,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -2254,6 +2263,9 @@
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
 "HB" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "HE" = (
@@ -2280,9 +2292,9 @@
 /area/ship/bridge)
 "Iz" = (
 /obj/docking_port/stationary{
-	width = 30;
+	dwidth = 15;
 	height = 15;
-	dwidth = 15
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -2492,6 +2504,7 @@
 /obj/effect/turf_decal/siding/wood/corner,
 /obj/structure/table/wood,
 /obj/structure/bedsheetbin,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "Mf" = (
@@ -2508,8 +2521,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/siding/wood{
-	dir = 4;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 4
 	},
 /turf/open/floor/concrete/slab_3,
 /area/ship/crew/hydroponics)
@@ -2698,6 +2711,7 @@
 /obj/item/clothing/shoes/sneakers/orange,
 /obj/item/clothing/shoes/sneakers/orange,
 /obj/structure/extinguisher_cabinet/directional/north,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "Or" = (
@@ -2707,8 +2721,8 @@
 /obj/item/cultivator/rake,
 /obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -2757,6 +2771,12 @@
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 1
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "Pj" = (
@@ -2824,8 +2844,8 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/siding/wood{
-	dir = 5;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 5
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/hydroponics)
@@ -2869,8 +2889,8 @@
 /obj/structure/window/reinforced/fulltile/shuttle,
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters/preopen{
-	id = "pharmairlock";
-	dir = 4
+	dir = 4;
+	id = "pharmairlock"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -2912,15 +2932,15 @@
 	pixel_x = -25
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 8
 	},
 /turf/open/floor/concrete/slab_1,
 /area/ship/crew/canteen)
 "Sy" = (
 /obj/machinery/door/airlock{
-	id_tag = "pharmdoorlock";
-	dir = 4
+	dir = 4;
+	id_tag = "pharmdoorlock"
 	},
 /obj/effect/turf_decal/siding/white,
 /obj/effect/turf_decal/siding/white{
@@ -2979,6 +2999,9 @@
 	dir = 1
 	},
 /obj/machinery/firealarm/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/carpet/blue,
 /area/ship/crew)
 "Ug" = (
@@ -3045,8 +3068,8 @@
 /obj/item/storage/pill_bottle/floorpill,
 /obj/effect/spawner/lootdrop/maintenance/two,
 /obj/effect/turf_decal/siding/wood{
-	dir = 1;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 1
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -3077,8 +3100,8 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_y = 12;
-	pixel_x = -20
+	pixel_x = -20;
+	pixel_y = 12
 	},
 /turf/open/floor/concrete/tiles,
 /area/ship/crew/hydroponics)
@@ -3151,8 +3174,8 @@
 	dir = 10
 	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 8;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 8
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/canteen)
@@ -3330,8 +3353,8 @@
 "YD" = (
 /obj/structure/chair/stool/bar,
 /obj/effect/turf_decal/siding/wood{
-	dir = 5;
-	color = "#543C30"
+	color = "#543C30";
+	dir = 5
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/cargo)
diff --git a/_maps/shuttles/shiptest/independent_shetland.dmm b/_maps/shuttles/shiptest/independent_shetland.dmm
index f361632c2ccb..173322da6bd4 100644
--- a/_maps/shuttles/shiptest/independent_shetland.dmm
+++ b/_maps/shuttles/shiptest/independent_shetland.dmm
@@ -927,8 +927,8 @@
 	dir = 4
 	},
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/electrical)
@@ -1025,6 +1025,7 @@
 	pixel_y = 17
 	},
 /obj/structure/dresser,
+/obj/machinery/light/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "lo" = (
@@ -1991,8 +1992,8 @@
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/effect/turf_decal/corner/opaque/neutral/half,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/atmospherics)
@@ -2396,6 +2397,13 @@
 "xQ" = (
 /turf/closed/wall/r_wall,
 /area/ship/bridge)
+"xV" = (
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
 "ya" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/plating,
@@ -2985,8 +2993,8 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/toilet)
@@ -3039,10 +3047,10 @@
 /area/ship/hallway/port)
 "Fs" = (
 /obj/docking_port/stationary{
-	width = 30;
-	height = 15;
+	dir = 2;
 	dwidth = 15;
-	dir = 2
+	height = 15;
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -3344,8 +3352,8 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -3463,8 +3471,8 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/turf_decal/corner/opaque/bottlegreen/full,
 /obj/machinery/light_switch{
-	pixel_x = 20;
 	dir = 8;
+	pixel_x = 20;
 	pixel_y = 11
 	},
 /turf/open/floor/plasteel,
@@ -3542,8 +3550,8 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/grille,
 /obj/machinery/door/poddoor{
-	id = "amoguswindows";
-	dir = 8
+	dir = 8;
+	id = "amoguswindows"
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/fore)
@@ -3615,8 +3623,8 @@
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/closet/secure_closet/true_lieutenant,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
@@ -3972,8 +3980,8 @@
 	height = 26;
 	launch_status = 0;
 	port_direction = 8;
-	width = 48;
-	preferred_direction = 4
+	preferred_direction = 4;
+	width = 48
 	},
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /turf/open/floor/plasteel/patterned/ridged,
@@ -4477,8 +4485,8 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -4519,6 +4527,11 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 11;
+	pixel_y = -16
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/fore)
 "SX" = (
@@ -4725,8 +4738,8 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/starboard)
@@ -5295,8 +5308,8 @@
 	},
 /obj/effect/turf_decal/box,
 /obj/machinery/light_switch{
-	pixel_y = 23;
-	pixel_x = 11
+	pixel_x = 11;
+	pixel_y = 23
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
@@ -6433,7 +6446,7 @@ Ue
 St
 WK
 iV
-Du
+xV
 ks
 OM
 VC
@@ -6483,7 +6496,7 @@ kl
 NB
 Tp
 iW
-fv
+iV
 tn
 BV
 Bm