diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
index ac2be582662a..be3d9a994e7f 100644
--- a/_maps/shuttles/independent/independent_mudskipper.dmm
+++ b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -1096,6 +1096,9 @@
 	dir = 4;
 	id = "mudskipper_engine"
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zR" = (
@@ -1670,6 +1673,9 @@
 	dir = 4;
 	id = "mudskipper_engine"
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "MK" = (
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 256e9bc75c88..89dd45bb2262 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1492,7 +1492,7 @@
 	},
 /obj/machinery/button/door{
 	dir = 1;
-	id = "amogusthrusters";
+	id = "shetportthrusters";
 	name = "Thruster Lockdown";
 	pixel_y = -21
 	},
@@ -2297,7 +2297,7 @@
 	pixel_y = 5
 	},
 /obj/machinery/button/door{
-	id = "amogusthrusters";
+	id = "shetstarboardengine";
 	name = "Thruster Lockdown";
 	pixel_y = 24
 	},
@@ -2748,11 +2748,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetstarboardengine"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "wU" = (
@@ -4423,11 +4426,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetportthrusters"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Lx" = (
@@ -4989,11 +4995,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetportthrusters"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "PR" = (
@@ -5157,11 +5166,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetstarboardengine"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Ri" = (