From 6736064ab6935b8e9f71527414e716966e9fd43a Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Wed, 13 Sep 2023 22:40:33 +0100
Subject: [PATCH] the first commit

---
 .../shuttles/shiptest/independent_bubble.dmm  |  46 +++++-
 .../shiptest/independent_halftrack.dmm        |  75 ++++++++-
 .../shuttles/shiptest/independent_lagoon.dmm  |  93 ++++++++++-
 .../shiptest/independent_masinyane.dmm        |  65 ++++++--
 _maps/shuttles/shiptest/independent_meta.dmm  | 150 ++++++++++++++++--
 .../shiptest/independent_rube_goldberg.dmm    |  72 ++++++++-
 _maps/shuttles/shiptest/pirate_libertatia.dmm |  65 +++++++-
 7 files changed, 511 insertions(+), 55 deletions(-)

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 b2a10b35c53e..6054d8257c76 100644
--- a/_maps/shuttles/shiptest/independent_halftrack.dmm
+++ b/_maps/shuttles/shiptest/independent_halftrack.dmm
@@ -115,6 +115,19 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"dY" = (
+/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)
 "ed" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/turf_decal/trimline/opaque/red/warning{
@@ -133,6 +146,12 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
+"es" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/hallway/aft)
 "eG" = (
 /obj/machinery/light/directional/south,
 /obj/effect/turf_decal/trimline/opaque/red/warning{
@@ -250,11 +269,17 @@
 /turf/closed/wall/r_wall,
 /area/ship/hallway/aft)
 "gO" = (
-/obj/structure/fans/tiny,
 /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)
 "hq" = (
@@ -614,6 +639,13 @@
 	},
 /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)
 "oS" = (
@@ -992,6 +1024,21 @@
 	},
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/hallway/aft)
+"xm" = (
+/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)
 "yi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/power/apc/auto_name/directional/west,
@@ -1373,6 +1420,20 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
+"Kf" = (
+/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)
 "Kh" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -2495,11 +2556,11 @@ RW
 dH
 uq
 ur
-go
-ur
-ur
-ur
-gO
+xm
+es
+es
+es
+dY
 BN
 "}
 (11,1,1) = {"
@@ -2529,7 +2590,7 @@ lH
 IG
 ur
 ur
-gO
+Kf
 UG
 "}
 (12,1,1) = {"
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 52232d6b22b0..a49f1d571c04 100644
--- a/_maps/shuttles/shiptest/independent_meta.dmm
+++ b/_maps/shuttles/shiptest/independent_meta.dmm
@@ -16,14 +16,25 @@
 /obj/machinery/door/poddoor{
 	id = "whiteship_port"
 	},
-/obj/structure/fans/tiny,
+/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)
 "af" = (
 /obj/machinery/door/poddoor{
 	id = "whiteship_port"
 	},
-/obj/structure/fans/tiny,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "ag" = (
@@ -75,6 +86,13 @@
 	pixel_y = 5;
 	dir = 4
 	},
+/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)
 "ap" = (
@@ -111,6 +129,9 @@
 /obj/effect/turf_decal/ntspaceworks_big/seven{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "ar" = (
@@ -146,6 +167,13 @@
 /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)
 "at" = (
@@ -1649,6 +1677,13 @@
 	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)
 "dZ" = (
@@ -1669,6 +1704,13 @@
 	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)
 "eb" = (
@@ -1734,7 +1776,13 @@
 /obj/machinery/door/poddoor{
 	id = "whiteship_starboard"
 	},
-/obj/structure/fans/tiny,
+/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)
 "ei" = (
@@ -1742,7 +1790,9 @@
 /obj/machinery/door/poddoor{
 	id = "whiteship_starboard"
 	},
-/obj/structure/fans/tiny,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "ej" = (
@@ -1915,6 +1965,13 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"ip" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "iM" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2012,6 +2069,9 @@
 /obj/effect/turf_decal/ntspaceworks_big/three{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "mc" = (
@@ -2244,6 +2304,9 @@
 "tZ" = (
 /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)
 "uk" = (
@@ -2322,6 +2385,19 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"xu" = (
+/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)
 "xV" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2334,8 +2410,24 @@
 	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)
+"yz" = (
+/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)
 "yS" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2466,6 +2558,20 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"EC" = (
+/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)
 "Fb" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2502,6 +2608,9 @@
 /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)
 "Gr" = (
@@ -2514,6 +2623,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"GH" = (
+/obj/machinery/door/poddoor{
+	id = "whiteship_starboard"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "HH" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -2745,6 +2863,16 @@
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"PR" = (
+/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)
 "PV" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/tank_dispenser/oxygen,
@@ -3144,7 +3272,7 @@ aa
 "}
 (10,1,1) = {"
 aa
-ae
+PR
 ve
 zC
 TQ
@@ -3180,13 +3308,13 @@ AT
 HH
 FV
 tZ
-ap
-ei
+ip
+yz
 bf
 "}
 (12,1,1) = {"
 aa
-ae
+PR
 ar
 Xs
 Lq
@@ -3202,12 +3330,12 @@ bm
 eX
 ap
 dZ
-eh
+GH
 aa
 "}
 (13,1,1) = {"
 aa
-af
+xu
 as
 hq
 Lq
@@ -3223,7 +3351,7 @@ aF
 Lq
 dM
 ea
-ei
+EC
 aa
 "}
 (14,1,1) = {"
diff --git a/_maps/shuttles/shiptest/independent_rube_goldberg.dmm b/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
index 69043b560f0d..0fec1b497aa4 100644
--- a/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
+++ b/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
@@ -454,6 +454,9 @@
 /area/ship/engineering/atmospherics)
 "ek" = (
 /obj/structure/closet/radiation,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "em" = (
@@ -1252,6 +1255,16 @@
 /obj/effect/turf_decal/trimline/transparent/bar,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew/dorm)
+"lC" = (
+/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)
 "lX" = (
 /turf/closed/wall/mineral/titanium/survival/nodiagonal,
 /area/ship/engineering/atmospherics)
@@ -1566,6 +1579,21 @@
 	},
 /turf/open/floor/engine/airless,
 /area/ship/engineering/atmospherics)
+"pJ" = (
+/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)
 "pK" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /turf/open/floor/plasteel/tech/techmaint,
@@ -2615,11 +2643,17 @@
 /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"
 	},
+/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)
 "zB" = (
@@ -3304,6 +3338,9 @@
 /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)
 "Gv" = (
@@ -3486,6 +3523,21 @@
 /obj/structure/closet/wardrobe/pjs,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/dorm)
+"HP" = (
+/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)
 "HT" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/simple/general/visible/layer2{
@@ -3942,7 +3994,8 @@
 	dir = 4;
 	id = "Storage Bay Blast";
 	name = "Storage Bay Doors Control";
-	pixel_x = -25
+	pixel_x = -25;
+	pixel_y = -3
 	},
 /obj/effect/turf_decal/industrial/radiation{
 	dir = 10
@@ -3950,6 +4003,13 @@
 /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)
 "Mb" = (
@@ -7009,7 +7069,7 @@ eE
 eE
 Ss
 RF
-zy
+lC
 tZ
 Zg
 Zg
@@ -7065,9 +7125,9 @@ bB
 SY
 SY
 SY
-SY
+HP
 bb
-zy
+lC
 wg
 Zg
 Zg
@@ -7125,7 +7185,7 @@ fs
 fs
 Gs
 ek
-zy
+pJ
 wg
 Zg
 Zg
diff --git a/_maps/shuttles/shiptest/pirate_libertatia.dmm b/_maps/shuttles/shiptest/pirate_libertatia.dmm
index 2291bece301d..c6340c923081 100644
--- a/_maps/shuttles/shiptest/pirate_libertatia.dmm
+++ b/_maps/shuttles/shiptest/pirate_libertatia.dmm
@@ -104,6 +104,9 @@
 /area/ship/external)
 "dD" = (
 /obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "eV" = (
@@ -114,7 +117,6 @@
 /turf/open/floor/plating,
 /area/ship/hallway/starboard)
 "fd" = (
-/obj/structure/fans/tiny,
 /obj/docking_port/mobile{
 	launch_status = 0;
 	port_direction = 2
@@ -345,6 +347,18 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
+"nN" = (
+/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)
 "nQ" = (
 /obj/machinery/mass_driver{
 	dir = 1;
@@ -482,6 +496,12 @@
 "rc" = (
 /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)
 "rd" = (
@@ -990,6 +1010,13 @@
 /obj/item/radio/intercom/directional/west,
 /turf/open/floor/pod/light,
 /area/ship/cargo)
+"DB" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "piratecargo";
+	name = "Cargo Bay"
+	},
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo)
 "DG" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/pod/light,
@@ -1235,6 +1262,12 @@
 	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)
 "Jx" = (
@@ -1266,6 +1299,12 @@
 	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)
 "KV" = (
@@ -1423,6 +1462,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "Pf" = (
@@ -1625,6 +1667,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "SR" = (
@@ -1668,7 +1713,13 @@
 	id = "piratecargo";
 	name = "Cargo Bay"
 	},
-/obj/structure/fans/tiny,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "piratecargo_holofield"
+	},
+/obj/structure/cable{
+	icon_state = "0-5"
+	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/cargo)
 "TT" = (
@@ -1831,6 +1882,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 "Xx" = (
@@ -1923,6 +1977,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ship/cargo)
 
@@ -2194,7 +2251,7 @@ Sw
 WK
 KV
 rc
-TP
+DB
 "}
 (11,1,1) = {"
 vN
@@ -2221,7 +2278,7 @@ SA
 WZ
 OO
 ZB
-TP
+nN
 "}
 (12,1,1) = {"
 XJ