diff --git a/_maps/shuttles/subshuttles/nanotrasen_malp.dmm b/_maps/shuttles/subshuttles/nanotrasen_malp.dmm
index 8a096908ca6c..0f5aaed70a9d 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_malp.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_malp.dmm
@@ -17,6 +17,12 @@
 /obj/effect/turf_decal/siding/blue{
 	dir = 10
 	},
+/obj/machinery/power/apc/auto_name/directional/south{
+	locked = 0
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "bB" = (
@@ -92,11 +98,6 @@
 /obj/effect/turf_decal/siding/red{
 	dir = 5
 	},
-/obj/item/radio/intercom/wideband/table{
-	dir = 4;
-	pixel_x = 6;
-	pixel_y = 1
-	},
 /obj/machinery/button/door{
 	pixel_x = -9;
 	dir = 8;
@@ -112,6 +113,17 @@
 	id = "malp_holo"
 	},
 /obj/machinery/light/directional/east,
+/obj/machinery/turretid{
+	pixel_y = 25;
+	name = "MALP Turret Control Panel";
+	locked = 0;
+	lethal = 1
+	},
+/obj/item/radio/intercom/wideband/table{
+	dir = 4;
+	pixel_x = 6;
+	pixel_y = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "fh" = (
@@ -150,6 +162,9 @@
 /obj/effect/turf_decal/siding/blue{
 	dir = 1
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "gC" = (
@@ -296,13 +311,15 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
-	},
 /obj/effect/turf_decal/siding/red{
 	dir = 9
 	},
+/obj/machinery/turretid{
+	pixel_y = 25;
+	name = "MALP Turret Control Panel";
+	locked = 0;
+	lethal = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "wA" = (
@@ -323,12 +340,12 @@
 /turf/open/floor/plating,
 /area/ship/bridge)
 "wX" = (
-/obj/machinery/computer/security{
-	dir = 8
-	},
 /obj/effect/turf_decal/siding/red{
 	dir = 4
 	},
+/obj/machinery/computer/crew{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "xb" = (
@@ -336,9 +353,6 @@
 /obj/effect/turf_decal/siding/thinplating/light{
 	dir = 5
 	},
-/obj/machinery/turretid{
-	pixel_y = 25
-	},
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ship/bridge)
 "xg" = (
@@ -706,6 +720,9 @@
 	dir = 1;
 	pixel_y = -18
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "Zk" = (
diff --git a/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm b/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm
index 8d9ea634d341..9de395c67fed 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_sierra.dmm
@@ -3,7 +3,9 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
+/obj/machinery/power/apc/auto_name/directional/east{
+	locked = 0
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "b" = (