diff --git a/_maps/shuttles/shiptest/independent_bubble.dmm b/_maps/shuttles/shiptest/independent_bubble.dmm
index 6e37d1b244e8..5e856da48200 100644
--- a/_maps/shuttles/shiptest/independent_bubble.dmm
+++ b/_maps/shuttles/shiptest/independent_bubble.dmm
@@ -81,12 +81,17 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/aft)
 "ec" = (
-/obj/structure/fans/tiny,
 /obj/effect/turf_decal/siding/thinplating,
 /obj/machinery/door/poddoor{
 	id = "bubbledoors";
 	name = "Cargo Bay Blast Door"
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "ep" = (
@@ -175,6 +180,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "gM" = (
@@ -378,6 +386,9 @@
 /turf/closed/wall,
 /area/ship/science)
 "nS" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "nV" = (
@@ -418,6 +429,9 @@
 	},
 /obj/machinery/light/directional/south,
 /obj/item/storage/toolbox/mechanical,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "qq" = (
@@ -545,10 +559,19 @@
 /obj/machinery/button/door{
 	id = "bubbledoors";
 	name = "Blast Door Control";
-	pixel_x = 25
+	pixel_x = 25;
+	dir = 8;
+	pixel_y = -5
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/machinery/suit_storage_unit/independent/mining,
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 25;
+	dir = 8;
+	pixel_y = 4;
+	name = "Holofield Control";
+	id = "bubble_holofield"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "wH" = (
@@ -561,7 +584,6 @@
 /turf/open/floor/plating,
 /area/ship/external)
 "wO" = (
-/obj/structure/fans/tiny,
 /obj/effect/turf_decal/siding/thinplating,
 /obj/machinery/door/poddoor{
 	id = "bubbledoors";
@@ -570,6 +592,13 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 1
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "bubble_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "xm" = (
@@ -806,6 +835,9 @@
 /area/ship/engineering)
 "Je" = (
 /obj/effect/landmark/start/shaft_miner,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Js" = (
@@ -817,7 +849,6 @@
 /turf/open/floor/plating,
 /area/ship/bridge)
 "JG" = (
-/obj/structure/fans/tiny,
 /obj/effect/turf_decal/siding/thinplating,
 /obj/machinery/door/poddoor{
 	id = "bubbledoors";
@@ -826,6 +857,13 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "bubble_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "JU" = (
diff --git a/_maps/shuttles/shiptest/independent_halftrack.dmm b/_maps/shuttles/shiptest/independent_halftrack.dmm
index f82d26ffd66d..d078de6bc8b1 100644
--- a/_maps/shuttles/shiptest/independent_halftrack.dmm
+++ b/_maps/shuttles/shiptest/independent_halftrack.dmm
@@ -177,13 +177,6 @@
 /obj/item/clothing/suit/armor/vest/alt,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
-"fa" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/carpet/nanoweave,
-/area/ship/crew)
 "fe" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
@@ -249,14 +242,6 @@
 "gL" = (
 /turf/closed/wall/r_wall,
 /area/ship/hallway/aft)
-"gO" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor/shutters{
-	id = "traumalobby";
-	name = "Lobby"
-	},
-/turf/open/floor/carpet/nanoweave/beige,
-/area/ship/hallway/aft)
 "hq" = (
 /obj/item/target/clown,
 /obj/effect/turf_decal/box/red,
@@ -463,6 +448,27 @@
 	},
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/aft)
+"lN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/hallway/aft)
+"lQ" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/hallway/aft)
 "lY" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -594,28 +600,6 @@
 	},
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/aft)
-"oQ" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/southleft,
-/obj/machinery/button/door{
-	id = "lobbydoors";
-	name = "Lobby Door Control";
-	normaldoorcontrol = 1;
-	pixel_x = -13;
-	pixel_y = 7;
-	dir = 1
-	},
-/obj/machinery/button/door{
-	id = "traumalobby";
-	name = "Lobby Shutter Control";
-	pixel_x = -13;
-	pixel_y = -1;
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/industrial/hatch/red,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/hallway/aft)
 "oS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
@@ -640,6 +624,20 @@
 /obj/structure/sign/poster/contraband/peacemaker,
 /turf/closed/wall/r_wall,
 /area/ship/hallway/aft)
+"po" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "traumalobby";
+	name = "Lobby"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "traumashield"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/hallway/aft)
 "pK" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/blue,
@@ -1003,6 +1001,27 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
+"yq" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/carpet/nanoweave,
+/area/ship/crew)
+"yR" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "traumalobby";
+	name = "Lobby"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "traumashield"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/hallway/aft)
 "zg" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/firealarm/directional/east,
@@ -1639,6 +1658,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security/range)
+"Pb" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "traumalobby";
+	name = "Lobby"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/hallway/aft)
 "Po" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "traumawindows";
@@ -2186,6 +2218,35 @@
 "YM" = (
 /turf/closed/wall/r_wall,
 /area/ship/security)
+"Za" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/window/southleft,
+/obj/machinery/button/door{
+	id = "lobbydoors";
+	name = "Lobby Door Control";
+	normaldoorcontrol = 1;
+	pixel_x = -13;
+	pixel_y = 7;
+	dir = 1
+	},
+/obj/machinery/button/door{
+	id = "traumalobby";
+	name = "Lobby Shutter Control";
+	pixel_x = -13;
+	pixel_y = -1;
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/hatch/red,
+/obj/machinery/button/shieldwallgen{
+	dir = 1;
+	id = "traumashield";
+	name = "Lobby Holoshield";
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/hallway/aft)
 "ZN" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -2463,13 +2524,13 @@ zt
 YM
 EA
 Tq
-oQ
+Za
 ur
 nw
 xa
 ur
 ur
-gO
+po
 UG
 "}
 (10,1,1) = {"
@@ -2495,11 +2556,11 @@ RW
 dH
 uq
 ur
-go
-ur
-ur
-ur
-gO
+lN
+lQ
+lQ
+lQ
+Pb
 BN
 "}
 (11,1,1) = {"
@@ -2529,7 +2590,7 @@ lH
 IG
 ur
 ur
-gO
+yR
 UG
 "}
 (12,1,1) = {"
@@ -2633,7 +2694,7 @@ Ev
 TI
 su
 Sc
-fa
+yq
 Ev
 Qq
 Qq
diff --git a/_maps/shuttles/shiptest/independent_lagoon.dmm b/_maps/shuttles/shiptest/independent_lagoon.dmm
index c015f0c262a1..a45be92a151a 100644
--- a/_maps/shuttles/shiptest/independent_lagoon.dmm
+++ b/_maps/shuttles/shiptest/independent_lagoon.dmm
@@ -15,10 +15,16 @@
 /turf/open/floor/wood,
 /area/ship/bridge)
 "ae" = (
-/obj/structure/fans/tiny,
 /obj/machinery/door/poddoor{
 	id = "cruise_entrance1"
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "lagoon_holofield1"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/pod/light,
 /area/ship/hallway/port)
 "af" = (
@@ -77,14 +83,22 @@
 	port_direction = 8;
 	preferred_direction = 4
 	},
-/obj/structure/fans/tiny,
 /obj/machinery/door/poddoor{
 	id = "cruise_entrance1"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/pod/light,
 /area/ship/hallway/port)
 "au" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/pod/light,
 /area/ship/hallway/port)
 "az" = (
@@ -173,6 +187,13 @@
 	},
 /obj/effect/turf_decal/industrial/stand_clear,
 /obj/effect/turf_decal/corner/opaque/white/bordercorner,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "lagoon_holofield2"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/pod/dark,
 /area/ship/hallway/port)
 "bc" = (
@@ -206,6 +227,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/pod/light,
 /area/ship/hallway/port)
 "bi" = (
@@ -478,6 +502,13 @@
 /obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 8
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "lagoon_holofield2"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/pod/dark,
 /area/ship/hallway/port)
 "cP" = (
@@ -563,6 +594,9 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/pod/light,
 /area/ship/hallway/port)
 "dG" = (
@@ -588,6 +622,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/pod/dark,
 /area/ship/hallway/port)
 "dM" = (
@@ -1111,6 +1154,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "hs" = (
@@ -1744,6 +1790,18 @@
 	pixel_y = -12;
 	dir = 8
 	},
+/obj/machinery/button/shieldwallgen{
+	pixel_y = 23;
+	pixel_x = 6;
+	id = "lagoon_holofield2";
+	name = "Holofield 2"
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_y = 34;
+	pixel_x = 6;
+	name = "Holofield 1";
+	id = "lagoon_holofield1"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "lx" = (
@@ -3448,6 +3506,19 @@
 /obj/item/bedsheet/black,
 /turf/open/floor/carpet/black,
 /area/ship/crew)
+"wS" = (
+/obj/machinery/door/poddoor{
+	id = "cruise_entrance1"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "lagoon_holofield1"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/pod/light,
+/area/ship/hallway/port)
 "wT" = (
 /obj/structure/window/plasma/reinforced/spawner/north,
 /obj/structure/window/plasma/reinforced/spawner/east,
@@ -5349,6 +5420,13 @@
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
+"JE" = (
+/obj/machinery/scanner_gate,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod/light,
+/area/ship/hallway/port)
 "JF" = (
 /obj/structure/table/wood,
 /obj/item/modular_computer/laptop/preset/civilian,
@@ -5750,13 +5828,13 @@
 "Ny" = (
 /obj/machinery/button/door{
 	id = "cruise_entrance1";
-	name = "blastdoor one";
+	name = "Door 1";
 	pixel_x = 28;
 	pixel_y = 36
 	},
 /obj/machinery/button/door{
 	id = "cruise_entrance2";
-	name = "blastdoor two";
+	name = "Door 2";
 	pixel_x = 28;
 	pixel_y = 25
 	},
@@ -6221,6 +6299,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "QI" = (
@@ -7955,7 +8036,7 @@ sH
 (8,1,1) = {"
 wi
 at
-Fn
+JE
 au
 bh
 dF
@@ -7995,7 +8076,7 @@ sH
 "}
 (9,1,1) = {"
 ZK
-ae
+wS
 Fn
 aN
 zI
diff --git a/_maps/shuttles/shiptest/independent_masinyane.dmm b/_maps/shuttles/shiptest/independent_masinyane.dmm
index 08e5a614a51a..d8ddbd3c1208 100644
--- a/_maps/shuttles/shiptest/independent_masinyane.dmm
+++ b/_maps/shuttles/shiptest/independent_masinyane.dmm
@@ -119,6 +119,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/effect/landmark/observer_start,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ix" = (
@@ -180,22 +183,21 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "kO" = (
-/obj/structure/fans/tiny{
-	pixel_y = -10
-	},
 /obj/effect/turf_decal/industrial/stand_clear{
 	dir = 1;
 	layer = 2.09
 	},
-/obj/machinery/button/door{
-	dir = 8;
-	id = "masinyane_blastdoors";
-	pixel_x = 23
-	},
 /obj/machinery/door/poddoor{
 	id = "masinyane_blastdoors";
 	name = "Masinyane Entrance Doors"
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "masinyane_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "kS" = (
@@ -244,6 +246,12 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"nG" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "qu" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -326,6 +334,9 @@
 /obj/machinery/door/airlock/external/glass{
 	name = "Internal Airlock"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "zg" = (
@@ -474,21 +485,23 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Iu" = (
-/obj/structure/fans/tiny{
-	pixel_y = -10
-	},
 /obj/effect/turf_decal/industrial/stand_clear{
 	layer = 2.09
 	},
-/obj/machinery/button/door{
-	dir = 4;
-	id = "masinyane_blastdoors";
-	pixel_x = -23
-	},
 /obj/machinery/door/poddoor{
 	id = "masinyane_blastdoors";
 	name = "Masinyane Entrance Doors"
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "masinyane_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Iw" = (
@@ -496,6 +509,18 @@
 	dir = 1
 	},
 /obj/structure/tank_dispenser/oxygen,
+/obj/machinery/button/door{
+	id = "masinyane_blastdoors";
+	pixel_x = -4;
+	pixel_y = 28;
+	name = "Blast Door Control"
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 5;
+	pixel_y = 27;
+	name = "Holofield Control";
+	id = "masinyane_holofield"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "IQ" = (
@@ -710,6 +735,9 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/west,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Wn" = (
@@ -718,6 +746,9 @@
 "Xc" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/item/radio/intercom/directional/west,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Xe" = (
@@ -898,7 +929,7 @@ Wn
 Xq
 Iu
 Wi
-sn
+nG
 yn
 Xc
 ip
diff --git a/_maps/shuttles/shiptest/independent_meta.dmm b/_maps/shuttles/shiptest/independent_meta.dmm
index 8adc2aeb86a5..8f452c3b13b0 100644
--- a/_maps/shuttles/shiptest/independent_meta.dmm
+++ b/_maps/shuttles/shiptest/independent_meta.dmm
@@ -11,21 +11,6 @@
 "ad" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo)
-"ae" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/door/poddoor{
-	id = "whiteship_port"
-	},
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"af" = (
-/obj/machinery/door/poddoor{
-	id = "whiteship_port"
-	},
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/ship/cargo)
 "ag" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew)
@@ -65,54 +50,10 @@
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"ao" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/button/door{
-	id = "whiteship_port";
-	name = "Port Blast Door Control";
-	pixel_x = -25;
-	pixel_y = 5;
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "ap" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"aq" = (
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -2
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/structure/closet/crate{
-	name = "food crate"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/ntspaceworks_big/seven{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "ar" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -133,21 +74,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"as" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/button/door{
-	id = "whiteship_port";
-	name = "Port Blast Door Control";
-	pixel_x = 25;
-	pixel_y = 5;
-	dir = 8
-	},
-/obj/effect/turf_decal/ntspaceworks_big/five{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "at" = (
 /obj/structure/sign/warning/vacuum/external{
 	pixel_x = -32;
@@ -378,6 +304,18 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"bg" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 1;
+	piping_layer = 2
+	},
+/obj/machinery/light/small/built/directional/south,
+/turf/open/floor/plating,
+/area/ship/engineering)
 "bh" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/industrial/outline/yellow,
@@ -392,6 +330,15 @@
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
+"bi" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plating,
+/area/ship/engineering)
 "bj" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -559,21 +506,49 @@
 /obj/machinery/light/small/built/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
-"bM" = (
+"bN" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
-/obj/machinery/microwave,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/trash/plate{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/trash/plate{
+	pixel_x = -6
+	},
+/obj/item/trash/plate{
+	pixel_x = -6;
+	pixel_y = 2
+	},
+/obj/item/trash/plate{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/trash/plate{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/kitchen/fork{
+	pixel_x = 12;
+	pixel_y = 3
+	},
+/obj/item/kitchen/fork{
+	pixel_x = 6;
+	pixel_y = 3
+	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/sign/poster/contraband/random{
-	pixel_y = 32
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/obj/effect/spawner/lootdrop/ration,
 /obj/effect/turf_decal/corner/transparent/bar,
 /obj/effect/turf_decal/corner/transparent/bar{
 	dir = 1
 	},
-/obj/machinery/light/small/built/directional/west,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = -13;
+	pixel_y = 22
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "bO" = (
@@ -955,6 +930,42 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"cD" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/paper_bin{
+	pixel_x = -4
+	},
+/obj/item/pen{
+	pixel_x = -4
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/item/camera{
+	pixel_x = 12;
+	pixel_y = 6
+	},
+/obj/item/storage/photo_album{
+	pixel_x = 14
+	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = 7
+	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = 7
+	},
+/obj/item/spacecash/bundle/c1000{
+	pixel_x = 7
+	},
+/obj/machinery/light/small/built/directional/west,
+/obj/machinery/light_switch{
+	pixel_x = -13;
+	pixel_y = 22
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
 "cE" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1050,6 +1061,19 @@
 /obj/machinery/computer/helm/viewscreen/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
+"cJ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = 10;
+	pixel_x = -20
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "cK" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1397,6 +1421,29 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"dJ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 10
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 11;
+	pixel_y = -16
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "dK" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1480,17 +1527,6 @@
 /obj/machinery/light/small/built/directional/south,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"dY" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/button/door{
-	id = "whiteship_starboard";
-	name = "Starboard Blast Door Control";
-	pixel_x = -25;
-	pixel_y = -5;
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "dZ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/crate/medical,
@@ -1499,18 +1535,6 @@
 /obj/item/reagent_containers/syringe,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"ea" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/button/door{
-	id = "whiteship_starboard";
-	name = "Starboard Blast Door Control";
-	pixel_x = 25;
-	pixel_y = -5;
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "eb" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor{
@@ -1570,21 +1594,6 @@
 /obj/machinery/light/small/built/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"eh" = (
-/obj/machinery/door/poddoor{
-	id = "whiteship_starboard"
-	},
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"ei" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/door/poddoor{
-	id = "whiteship_starboard"
-	},
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/ship/cargo)
 "ej" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -1629,6 +1638,24 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
+"eM" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "whiteship_starboard";
+	name = "Starboard Blast Door Control";
+	pixel_x = -25;
+	pixel_y = -5;
+	dir = 4
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = -25;
+	dir = 4;
+	pixel_y = 4;
+	name = "Starboard Holofield Control";
+	id = "whiteship_starboard_holofield"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "eV" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1707,21 +1734,78 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"hq" = (
+"gr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/ntspaceworks_big/one{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"hv" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/turf_decal/box/corners{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/white/diagonal,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -12;
+	pixel_y = -16
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"gx" = (
+/obj/machinery/door/poddoor{
+	id = "whiteship_port"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "whiteship_port_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"gM" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "whiteship_port";
+	name = "Port Blast Door Control";
+	pixel_x = 25;
+	pixel_y = 5;
+	dir = 8
+	},
+/obj/effect/turf_decal/ntspaceworks_big/five{
+	dir = 1
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 25;
+	dir = 8;
+	pixel_y = -4;
+	name = "Port Holofield Control";
+	id = "whiteship_port_holofield"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"hq" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/ntspaceworks_big/one{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"hv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "hU" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -1733,6 +1817,18 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"ip" = (
+/obj/machinery/door/poddoor{
+	id = "whiteship_port"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "iM" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -1767,6 +1863,16 @@
 /obj/machinery/porta_turret/ship/weak,
 /turf/closed/wall/mineral/titanium,
 /area/ship/bridge)
+"kd" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/poddoor{
+	id = "whiteship_starboard"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "km" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -1825,13 +1931,6 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"mb" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/ntspaceworks_big/three{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "mc" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/door/airlock{
@@ -1852,29 +1951,31 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"mk" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/twenty,
-/obj/item/stack/sheet/glass{
-	amount = 10
-	},
-/obj/item/stack/sheet/mineral/plasma{
-	amount = 10
-	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+"mL" = (
+/obj/machinery/porta_turret/ship/weak{
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = 11;
-	pixel_y = -16
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
+"mV" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "whiteship_port";
+	name = "Port Blast Door Control";
+	pixel_x = -25;
+	pixel_y = 5;
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/button/shieldwallgen{
+	pixel_x = -25;
+	dir = 4;
+	pixel_y = -4;
+	name = "Port Holofield Control";
+	id = "whiteship_port_holofield"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "nK" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -1929,6 +2030,25 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"oQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	id = "whiteship_starboard";
+	name = "Starboard Blast Door Control";
+	pixel_x = 25;
+	pixel_y = -5;
+	dir = 8
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 25;
+	dir = 8;
+	pixel_y = 4;
+	name = "Starboard Holofield Control";
+	id = "whiteship_starboard_holofield"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "pn" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/sign/poster/contraband/random{
@@ -1970,6 +2090,13 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
+"qf" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "qt" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
@@ -2024,6 +2151,20 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
+"sa" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/poddoor{
+	id = "whiteship_port"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	id = "whiteship_port_holofield";
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "sP" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
@@ -2076,11 +2217,6 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"tZ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/mineral/ore_redemption,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "uk" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/washing_machine,
@@ -2112,25 +2248,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
-"uB" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
 "ve" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/ntspaceworks_big/eight{
@@ -2164,6 +2281,16 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"vR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/ntspaceworks_big/three{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "xm" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/vending/coffee,
@@ -2176,20 +2303,6 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
-"xV" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "yS" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2231,28 +2344,6 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
-"zw" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -12;
-	pixel_y = -16
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew)
 "zC" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/ntspaceworks_big/four{
@@ -2260,42 +2351,18 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"Ac" = (
-/obj/structure/table,
+"zJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/paper_bin{
-	pixel_x = -4
-	},
-/obj/item/pen{
-	pixel_x = -4
-	},
 /obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/item/camera{
-	pixel_x = 12;
-	pixel_y = 6
-	},
-/obj/item/storage/photo_album{
-	pixel_x = 14
-	},
-/obj/item/spacecash/bundle/c1000{
-	pixel_x = 7
-	},
-/obj/item/spacecash/bundle/c1000{
-	pixel_x = 7
-	},
-/obj/item/spacecash/bundle/c1000{
-	pixel_x = 7
-	},
-/obj/machinery/light/small/built/directional/west,
-/obj/machinery/light_switch{
-	pixel_x = -13;
-	pixel_y = 22
+	icon_state = "1-2"
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light/small/built/directional/east,
+/turf/open/floor/plating,
+/area/ship/engineering)
 "Ag" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/corner/transparent/neutral/full,
@@ -2316,6 +2383,16 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
+"Ay" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/poddoor{
+	id = "whiteship_port"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "AT" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/arrows{
@@ -2337,15 +2414,15 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
-"AY" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/blood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+"Bn" = (
+/obj/machinery/door/poddoor{
+	id = "whiteship_starboard"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/cargo)
 "By" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood,
@@ -2356,6 +2433,33 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"BZ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/poddoor{
+	id = "whiteship_starboard"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"CK" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/poddoor{
+	id = "whiteship_starboard"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "whiteship_starboard_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "DJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2375,51 +2479,6 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"EX" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/item/trash/plate{
-	pixel_x = -6;
-	pixel_y = -2
-	},
-/obj/item/trash/plate{
-	pixel_x = -6
-	},
-/obj/item/trash/plate{
-	pixel_x = -6;
-	pixel_y = 2
-	},
-/obj/item/trash/plate{
-	pixel_x = -6;
-	pixel_y = 4
-	},
-/obj/item/trash/plate{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/obj/item/kitchen/fork{
-	pixel_x = 12;
-	pixel_y = 3
-	},
-/obj/item/kitchen/fork{
-	pixel_x = 6;
-	pixel_y = 3
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/corner/transparent/bar,
-/obj/effect/turf_decal/corner/transparent/bar{
-	dir = 1
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/light_switch{
-	pixel_x = -13;
-	pixel_y = 22
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
 "Fb" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2448,14 +2507,21 @@
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/bridge)
-"FV" = (
+"Gp" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
 /obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Gr" = (
@@ -2507,6 +2573,49 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"IP" = (
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = -2
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = 5
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = 1;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/structure/closet/crate{
+	name = "food crate"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/ntspaceworks_big/seven{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"Jl" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/mineral/ore_redemption,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "Ju" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/vending/cigarette,
@@ -2542,12 +2651,6 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"Lo" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 1
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ship/bridge)
 "Lq" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2562,12 +2665,6 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"LF" = (
-/obj/machinery/porta_turret/ship/weak{
-	dir = 4
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ship/bridge)
 "LK" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/north,
@@ -2586,19 +2683,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
-"Mf" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_y = 10;
-	pixel_x = -20
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "MC" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2724,6 +2808,19 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"PS" = (
+/obj/machinery/door/poddoor{
+	id = "whiteship_starboard"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "whiteship_starboard_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "PV" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/tank_dispenser/oxygen,
@@ -2731,6 +2828,23 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"PW" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table,
+/obj/machinery/microwave,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = 32
+	},
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/turf_decal/corner/transparent/bar,
+/obj/effect/turf_decal/corner/transparent/bar{
+	dir = 1
+	},
+/obj/machinery/light/small/built/directional/west,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
 "QJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/hydroponics/constructable,
@@ -2858,6 +2972,25 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"UT" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "Vi" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/arrows,
@@ -2880,18 +3013,25 @@
 /obj/machinery/light/small/built/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
-"Ws" = (
+"VR" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/light/small/built/directional/east,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"VT" = (
+/obj/machinery/porta_turret/ship/weak{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/bridge)
 "Xs" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/ntspaceworks_big/two{
@@ -2925,18 +3065,6 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
-"ZB" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 2
-	},
-/obj/machinery/light/small/built/directional/south,
-/turf/open/floor/plating,
-/area/ship/engineering)
 "ZR" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2998,7 +3126,7 @@ ac
 ak
 az
 aM
-ZB
+bg
 ac
 aa
 ab
@@ -3036,11 +3164,11 @@ aa
 "}
 (5,1,1) = {"
 aa
-Lo
+mL
 ac
 aB
 aO
-AY
+bi
 ac
 bH
 ac
@@ -3050,7 +3178,7 @@ cH
 ac
 cZ
 JR
-mk
+dJ
 ac
 jJ
 aa
@@ -3060,8 +3188,8 @@ aa
 aa
 am
 aC
-uB
-Ws
+UT
+zJ
 by
 dR
 rF
@@ -3120,8 +3248,8 @@ aa
 "}
 (9,1,1) = {"
 aa
-ae
-ao
+sa
+mV
 aE
 yS
 fa
@@ -3130,18 +3258,18 @@ tU
 Fb
 Ag
 cy
-Mf
+cJ
 cP
 db
 On
 bA
-dY
-eh
+eM
+PS
 aa
 "}
 (10,1,1) = {"
 aa
-ae
+Ay
 ve
 zC
 TQ
@@ -3157,15 +3285,15 @@ dc
 Lq
 em
 bA
-ei
+kd
 aa
 "}
 (11,1,1) = {"
 qx
-af
-aq
-mb
-xV
+ip
+IP
+vR
+Gp
 km
 Vi
 Oq
@@ -3175,15 +3303,15 @@ mg
 Ov
 AT
 HH
-FV
-tZ
-ap
-ei
+VR
+Jl
+qf
+BZ
 bf
 "}
 (12,1,1) = {"
 aa
-ae
+Ay
 ar
 Xs
 Lq
@@ -3199,13 +3327,13 @@ bm
 eX
 ap
 dZ
-eh
+Bn
 aa
 "}
 (13,1,1) = {"
 aa
-af
-as
+gx
+gM
 hq
 Lq
 bo
@@ -3219,8 +3347,8 @@ cS
 aF
 Lq
 dM
-ea
-ei
+oQ
+CK
 aa
 "}
 (14,1,1) = {"
@@ -3252,7 +3380,7 @@ YW
 RQ
 YW
 YW
-bM
+PW
 bZ
 cn
 cz
@@ -3273,7 +3401,7 @@ aH
 Zf
 bq
 bD
-EX
+bN
 ca
 co
 cA
@@ -3288,7 +3416,7 @@ aa
 "}
 (17,1,1) = {"
 aa
-Lo
+mL
 ai
 ai
 rU
@@ -3358,7 +3486,7 @@ uw
 ai
 bF
 bQ
-Ac
+cD
 yZ
 cO
 bQ
@@ -3418,7 +3546,7 @@ aj
 OX
 ku
 MM
-zw
+gr
 ai
 bQ
 cg
@@ -3478,10 +3606,10 @@ aa
 (26,1,1) = {"
 aa
 aa
-LF
+VT
 ai
 ai
-LF
+VT
 aa
 aa
 aa
@@ -3489,10 +3617,10 @@ aa
 aa
 aa
 aa
-LF
+VT
 bD
 bD
-LF
+VT
 aa
 aa
 "}
diff --git a/_maps/shuttles/shiptest/independent_rube_goldberg.dmm b/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
index 50febf2f2550..fe07c83136da 100644
--- a/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
+++ b/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
@@ -452,10 +452,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
-"ek" = (
-/obj/structure/closet/radiation,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
 "em" = (
 /obj/structure/window/reinforced/spawner,
 /obj/structure/window/reinforced/spawner{
@@ -988,6 +984,21 @@
 	},
 /turf/open/floor/engine/airless,
 /area/ship/engineering/atmospherics)
+"ja" = (
+/obj/structure/closet/crate/freezer,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/item/pizzabox/meat,
+/obj/item/pizzabox/vegetable,
+/obj/machinery/camera/autoname{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/open/floor/wood/mahogany,
+/area/ship/crew/canteen)
 "jd" = (
 /obj/machinery/atmospherics/pipe/simple,
 /obj/machinery/computer/atmos_control/incinerator{
@@ -1252,6 +1263,13 @@
 /obj/effect/turf_decal/trimline/transparent/bar,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/dorm)
+"lB" = (
+/obj/structure/closet/radiation,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
 "lX" = (
 /turf/closed/wall/mineral/titanium/survival/nodiagonal,
 /area/ship/engineering/atmospherics)
@@ -1626,6 +1644,16 @@
 /obj/effect/turf_decal/trimline/transparent/bar/filled,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/dorm)
+"ql" = (
+/obj/machinery/door/poddoor{
+	id = "Storage Bay Blast";
+	name = "Storage Bay Doors"
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/storage)
 "qs" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/figure/ce,
@@ -2120,6 +2148,21 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
+"uZ" = (
+/obj/machinery/door/poddoor{
+	id = "Storage Bay Blast";
+	name = "Storage Bay Doors"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "storage_holofield"
+	},
+/obj/structure/cable/green,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ship/storage)
 "vb" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible/layer2{
 	dir = 4
@@ -2614,14 +2657,6 @@
 /obj/structure/particle_accelerator/fuel_chamber,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
-"zy" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor{
-	id = "Storage Bay Blast";
-	name = "Storage Bay Doors"
-	},
-/turf/open/floor/plating,
-/area/ship/storage)
 "zB" = (
 /obj/structure/sink/kitchen{
 	dir = 8;
@@ -2850,21 +2885,6 @@
 /obj/machinery/atmospherics/pipe/simple/general/visible/layer2,
 /turf/open/floor/engine/airless,
 /area/ship/engineering/atmospherics)
-"Ck" = (
-/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/item/pizzabox/meat,
-/obj/item/pizzabox/vegetable,
-/obj/machinery/camera/autoname{
-	dir = 4
-	},
-/obj/effect/turf_decal/spline/fancy/wood{
-	dir = 8
-	},
-/turf/open/floor/wood/mahogany,
-/area/ship/crew/canteen)
 "Cw" = (
 /obj/structure/closet/secure_closet/atmospherics{
 	anchored = 1;
@@ -3036,6 +3056,20 @@
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating/airless,
 /area/ship/hallway)
+"DP" = (
+/obj/machinery/door/poddoor{
+	id = "Storage Bay Blast";
+	name = "Storage Bay Doors"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "storage_holofield"
+	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/storage)
 "DQ" = (
 /obj/machinery/atmospherics/pipe/simple/general/visible/layer2{
 	dir = 10
@@ -3298,14 +3332,6 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/bridge)
-"Gs" = (
-/obj/structure/closet/crate/radiation,
-/obj/item/circuitboard/machine/rad_collector,
-/obj/item/circuitboard/machine/rad_collector,
-/obj/item/circuitboard/machine/rad_collector,
-/obj/item/circuitboard/machine/rad_collector,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
 "Gv" = (
 /obj/machinery/vending/engivend,
 /turf/open/floor/plasteel/tech/techmaint,
@@ -3854,6 +3880,21 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/dorm)
+"Lh" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/industrial/radiation{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/radiation{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/open/floor/mineral/titanium,
+/area/ship/storage)
 "Lk" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -3930,28 +3971,6 @@
 /obj/machinery/particle_accelerator/control_box,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
-"LZ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/button/door{
-	dir = 4;
-	id = "Storage Bay Blast";
-	name = "Storage Bay Doors Control";
-	pixel_x = -25
-	},
-/obj/effect/turf_decal/industrial/radiation{
-	dir = 10
-	},
-/obj/effect/turf_decal/industrial/radiation/corner{
-	dir = 4
-	},
-/turf/open/floor/mineral/titanium,
-/area/ship/storage)
 "Mb" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/space_heater,
@@ -4162,6 +4181,36 @@
 /obj/machinery/suit_storage_unit/atmos,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
+"On" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/button/door{
+	dir = 4;
+	id = "Storage Bay Blast";
+	name = "Storage Bay Doors Control";
+	pixel_x = -25;
+	pixel_y = -3
+	},
+/obj/effect/turf_decal/industrial/radiation{
+	dir = 10
+	},
+/obj/effect/turf_decal/industrial/radiation/corner{
+	dir = 4
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = -25;
+	dir = 4;
+	pixel_y = 6;
+	name = "Storage Bay Holofield Control";
+	id = "storage_holofield"
+	},
+/turf/open/floor/mineral/titanium,
+/area/ship/storage)
 "Ot" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
@@ -4184,6 +4233,17 @@
 /obj/structure/closet/cabinet,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/dorm)
+"OR" = (
+/obj/structure/closet/crate/radiation,
+/obj/item/circuitboard/machine/rad_collector,
+/obj/item/circuitboard/machine/rad_collector,
+/obj/item/circuitboard/machine/rad_collector,
+/obj/item/circuitboard/machine/rad_collector,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
 "OV" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5536,7 +5596,7 @@ tM
 qz
 wP
 sb
-Ck
+ja
 tj
 tt
 tt
@@ -6770,7 +6830,7 @@ Yy
 QY
 IL
 mP
-LZ
+On
 ei
 IR
 Zg
@@ -6951,7 +7011,7 @@ ZD
 Dv
 Fj
 gM
-zy
+DP
 wg
 Zg
 Zg
@@ -7009,7 +7069,7 @@ eE
 eE
 Ss
 RF
-zy
+ql
 tZ
 Zg
 Zg
@@ -7065,9 +7125,9 @@ bB
 SY
 SY
 SY
-SY
+Lh
 bb
-zy
+ql
 wg
 Zg
 Zg
@@ -7123,9 +7183,9 @@ Ge
 fs
 fs
 fs
-Gs
-ek
-zy
+OR
+lB
+uZ
 wg
 Zg
 Zg
diff --git a/_maps/shuttles/shiptest/pirate_libertatia.dmm b/_maps/shuttles/shiptest/pirate_libertatia.dmm
index e0c0905371ad..51fc68da6dc4 100644
--- a/_maps/shuttles/shiptest/pirate_libertatia.dmm
+++ b/_maps/shuttles/shiptest/pirate_libertatia.dmm
@@ -64,10 +64,41 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
+"bs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	id = "piratecargo";
+	name = "Blast Door Control";
+	pixel_x = -25;
+	pixel_y = -10
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/shieldwallgen{
+	dir = 4;
+	pixel_x = -25;
+	id = "piratecargo_holofield";
+	name = "Holofield Control"
+	},
+/turf/open/floor/plasteel/stairs/right,
+/area/ship/cargo)
 "bz" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/stairs,
 /area/ship/bridge)
+"bF" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/cargo)
 "bG" = (
 /obj/structure/table/reinforced,
 /obj/item/areaeditor/shuttle{
@@ -102,8 +133,23 @@
 "cF" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/external)
-"dD" = (
-/obj/effect/turf_decal/industrial/warning,
+"eg" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
+/obj/effect/decal/cleanable/oil,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "eV" = (
@@ -113,18 +159,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/starboard)
-"fd" = (
-/obj/structure/fans/tiny,
-/obj/docking_port/mobile{
-	launch_status = 0;
-	port_direction = 2
-	},
-/obj/machinery/door/poddoor/shutters{
-	id = "piratecargo";
-	name = "Cargo Bay"
-	},
-/turf/open/floor/engine/hull/interior,
-/area/ship/cargo)
 "fi" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/airalarm/directional/west,
@@ -166,6 +200,17 @@
 "fq" = (
 /turf/open/floor/engine/hull,
 /area/ship/external)
+"fF" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "4-5"
+	},
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/cargo)
 "fG" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/security)
@@ -180,6 +225,16 @@
 "hb" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security)
+"io" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/cargo)
 "iA" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -479,11 +534,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/security)
-"rc" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/cargo)
 "rd" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
@@ -718,6 +768,19 @@
 /obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/bridge)
+"vV" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/cargo)
 "vW" = (
 /obj/structure/table,
 /obj/machinery/microwave{
@@ -791,6 +854,17 @@
 /obj/effect/decal/cleanable/vomit/old,
 /turf/open/floor/pod/light,
 /area/ship/crew)
+"yX" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/radio/intercom/directional/north,
+/obj/item/lighter{
+	pixel_x = 14
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "za" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
@@ -852,17 +926,13 @@
 	},
 /turf/open/floor/plating,
 /area/ship/crew)
-"AL" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/item/radio/intercom/directional/north,
-/obj/item/lighter{
-	pixel_x = 14
+"Ay" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "piratecargo";
+	name = "Cargo Bay"
 	},
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo)
 "Bb" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
@@ -913,6 +983,52 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/pod/light,
 /area/ship/crew)
+"BR" = (
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = -2
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 5
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 1;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/structure/closet/crate{
+	name = "food crate"
+	},
+/obj/item/storage/cans/sixbeer,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/cargo)
 "Cd" = (
 /obj/structure/cable,
 /obj/machinery/power/shuttle/engine/electric{
@@ -985,6 +1101,20 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/hallway/starboard)
+"CW" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/cargo)
 "Df" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/item/radio/intercom/directional/west,
@@ -1219,24 +1349,6 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plating,
 /area/ship/hallway/port)
-"Jr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/button/door{
-	dir = 4;
-	id = "piratecargo";
-	name = "Blast Door Control";
-	pixel_x = -25;
-	pixel_y = -10
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/stairs/right,
-/area/ship/cargo)
 "Jx" = (
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
@@ -1257,22 +1369,22 @@
 /obj/machinery/selling_pad,
 /turf/open/floor/pod/light,
 /area/ship/cargo)
-"KS" = (
-/obj/machinery/button/door{
-	dir = 8;
-	id = "piratecargo";
-	name = "Blast Door Control";
-	pixel_x = 25;
-	pixel_y = -10
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/stairs/left,
-/area/ship/cargo)
 "KV" = (
 /obj/effect/decal/cleanable/glass,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
+"KX" = (
+/obj/docking_port/mobile{
+	launch_status = 0;
+	port_direction = 2
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "piratecargo";
+	name = "Cargo Bay"
+	},
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo)
 "Le" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/hallway/starboard)
@@ -1418,13 +1530,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/port)
-"OO" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/cargo)
 "Pf" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
@@ -1565,68 +1670,6 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
-"Sw" = (
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -2
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/structure/closet/crate{
-	name = "food crate"
-	},
-/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "5-8"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/mineral/plastitanium,
-/area/ship/cargo)
-"SA" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-9"
-	},
-/obj/effect/decal/cleanable/oil,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/cargo)
 "SR" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1663,14 +1706,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/pod/dark,
 /area/ship/cargo)
-"TP" = (
-/obj/machinery/door/poddoor/shutters{
-	id = "piratecargo";
-	name = "Cargo Bay"
-	},
-/obj/structure/fans/tiny,
-/turf/open/floor/engine/hull/interior,
-/area/ship/cargo)
 "TT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1690,6 +1725,23 @@
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/starboard)
+"TX" = (
+/obj/machinery/button/door{
+	dir = 8;
+	id = "piratecargo";
+	name = "Blast Door Control";
+	pixel_x = 25;
+	pixel_y = -10
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/shieldwallgen{
+	dir = 8;
+	pixel_x = 25;
+	id = "piratecargo_holofield";
+	name = "Holofield Control"
+	},
+/turf/open/floor/plasteel/stairs/left,
+/area/ship/cargo)
 "Ut" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	dir = 4;
@@ -1823,15 +1875,19 @@
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/starboard)
-"WZ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+"WS" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "piratecargo";
+	name = "Cargo Bay"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "piratecargo_holofield"
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/structure/cable{
+	icon_state = "0-5"
+	},
+/turf/open/floor/engine/hull/interior,
 /area/ship/cargo)
 "Xx" = (
 /obj/structure/rack,
@@ -1861,6 +1917,18 @@
 "XJ" = (
 /turf/template_noop,
 /area/template_noop)
+"Yk" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "piratecargo";
+	name = "Cargo Bay"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "piratecargo_holofield"
+	},
+/obj/structure/cable,
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo)
 "YQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -1914,17 +1982,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/hallway/port)
-"ZB" = (
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 6
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ship/cargo)
 
 (1,1,1) = {"
 XJ
@@ -2107,7 +2164,7 @@ By
 Ec
 FF
 He
-Jr
+bs
 MC
 RX
 VO
@@ -2140,7 +2197,7 @@ Sc
 Wa
 HY
 rL
-TP
+WS
 "}
 (9,1,1) = {"
 XB
@@ -2166,8 +2223,8 @@ Nz
 Sj
 WC
 br
-dD
-fd
+bF
+KX
 "}
 (10,1,1) = {"
 XB
@@ -2183,18 +2240,18 @@ sx
 tT
 vW
 yf
-AL
+yX
 Cj
 Ey
 FF
 HU
 Ks
 NN
-Sw
+BR
 WK
 KV
-rc
-TP
+fF
+Ay
 "}
 (11,1,1) = {"
 vN
@@ -2217,11 +2274,11 @@ FF
 Id
 KD
 NS
-SA
-WZ
-OO
-ZB
-TP
+eg
+vV
+io
+CW
+Yk
 "}
 (12,1,1) = {"
 XJ
@@ -2242,7 +2299,7 @@ DG
 EH
 FF
 Ie
-KS
+TX
 Og
 SR
 Xx