diff --git a/_maps/~RUTGMC/predship/huntership.dmm b/_maps/predator/huntership.dmm
similarity index 100%
rename from _maps/~RUTGMC/predship/huntership.dmm
rename to _maps/predator/huntership.dmm
diff --git a/_maps/shuttles/alamo.dmm b/_maps/shuttles/alamo.dmm
index 65f4cf7e6ec..b6b90327e55 100644
--- a/_maps/shuttles/alamo.dmm
+++ b/_maps/shuttles/alamo.dmm
@@ -1,823 +1,451 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/obj/structure/dropship_piece/one/front/left,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ab" = (
-/obj/structure/dropship_piece/one/front,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ac" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 8
-	},
-/obj/machinery/door/airlock/dropship_hatch/left,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"ad" = (
-/obj/structure/dropship_piece/one/front/right,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ae" = (
-/obj/structure/dropship_piece/one/cockpit/left,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"af" = (
-/turf/closed/shuttle/dropship1/window,
-/area/shuttle/dropship/alamo)
-"ag" = (
-/turf/closed/shuttle/dropship1/window{
+"aD" = (
+/obj/structure/dropship_piece/two/corner/rearleft{
 	dir = 1
 	},
-/area/shuttle/dropship/alamo)
-"ah" = (
-/turf/closed/shuttle/dropship1/window{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"ai" = (
-/obj/structure/dropship_piece/one/cockpit/right,
+/obj/structure/dropship_piece/one/corner/middleleft,
 /turf/template_noop,
 /area/shuttle/dropship/alamo)
-"aj" = (
-/turf/closed/shuttle/dropship1/cornersalt{
+"bS" = (
+/turf/closed/shuttle/dropship1/enginefour,
+/area/shuttle/dropship/alamo)
+"cM" = (
+/turf/closed/shuttle/dropship1/enginefour{
 	dir = 4
 	},
 /area/shuttle/dropship/alamo)
-"ak" = (
-/obj/machinery/computer/security/dropship/one,
-/turf/closed/shuttle/dropship1/panel,
-/area/shuttle/dropship/alamo)
-"al" = (
+"dT" = (
+/obj/machinery/door/poddoor/shutters/transit,
+/obj/machinery/door/airlock/dropship_hatch/right,
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"am" = (
-/obj/machinery/computer/dropship_weapons/dropship1,
-/turf/closed/shuttle/dropship1/panel{
+"eN" = (
+/turf/closed/shuttle/dropship1/enginethree{
 	dir = 4
 	},
 /area/shuttle/dropship/alamo)
-"an" = (
-/turf/closed/shuttle/dropship1/cornersalt{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"ao" = (
-/turf/template_noop,
-/area/template_noop)
-"ap" = (
-/obj/effect/attach_point/weapon/dropship1{
-	dir = 1
-	},
-/obj/structure/dropship_piece/one/weapon/leftleft,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"aq" = (
-/obj/effect/attach_point/electronics/dropship1{
-	dir = 1
-	},
-/obj/structure/dropship_piece/one/weapon/leftright,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ar" = (
-/turf/closed/shuttle/dropship1/interiorwindow,
-/area/shuttle/dropship/alamo)
-"as" = (
+"gb" = (
 /obj/structure/bed/chair/dropship/pilot{
 	dir = 1
 	},
-/obj/machinery/light,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"at" = (
-/obj/item/radio/intercom/dropship{
-	pixel_x = 21;
-	pixel_y = 16
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"au" = (
-/obj/structure/bed/chair/dropship/pilot{
-	dir = 1
+/obj/machinery/light{
+	dir = 8
 	},
 /obj/machinery/camera/autoname/mainship/dropship_one{
-	pixel_x = -6;
-	pixel_y = -16
+	dir = 4;
+	pixel_x = -16
 	},
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"av" = (
-/turf/closed/shuttle/dropship1/interiorwindow{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"aw" = (
-/obj/effect/attach_point/electronics/dropship1{
-	dir = 1
-	},
-/obj/structure/dropship_piece/one/weapon/rightleft,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ax" = (
-/obj/effect/attach_point/weapon/dropship1{
-	dir = 1
-	},
-/obj/structure/dropship_piece/one/weapon/rightright,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ay" = (
-/turf/closed/shuttle/dropship1/cornersalt2,
-/area/shuttle/dropship/alamo)
-"aB" = (
-/turf/closed/shuttle/dropship1/interiormisc{
-	dir = 4
+"gj" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8
 	},
-/area/shuttle/dropship/alamo)
-"aC" = (
-/obj/machinery/door/airlock/hatch/cockpit,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"aD" = (
-/turf/closed/shuttle/dropship1/interiormisc{
+/obj/machinery/vending/nanomed{
 	dir = 8
 	},
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"aE" = (
-/turf/closed/shuttle/dropship1/edge,
-/area/shuttle/dropship/alamo)
-"aF" = (
-/turf/closed/shuttle/dropship1/cornersalt2{
+"gt" = (
+/turf/closed/shuttle/dropship1/enginethree{
 	dir = 1
 	},
 /area/shuttle/dropship/alamo)
-"aG" = (
-/obj/structure/dropship_piece/one/wing/left/top,
+"gO" = (
+/obj/structure/dropship_piece/one/front/left,
 /turf/template_noop,
 /area/shuttle/dropship/alamo)
-"aH" = (
-/turf/closed/shuttle/dropship1/finleft{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"aI" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"aJ" = (
-/obj/item/radio/intercom/dropship,
-/turf/open/shuttle/dropship/six,
-/area/shuttle/dropship/alamo)
-"aK" = (
-/turf/open/shuttle/dropship/five,
-/area/shuttle/dropship/alamo)
-"aM" = (
-/obj/item/radio/intercom/dropship,
-/turf/open/shuttle/dropship/seven,
-/area/shuttle/dropship/alamo)
-"aN" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
+"hm" = (
+/turf/closed/shuttle/dropship1/edge/alt,
 /area/shuttle/dropship/alamo)
-"aO" = (
-/turf/closed/shuttle/dropship1/finright{
-	dir = 4
+"iS" = (
+/turf/closed/shuttle/dropship1/edge/alt{
+	dir = 1
 	},
 /area/shuttle/dropship/alamo)
-"aP" = (
-/obj/structure/dropship_piece/one/wing/right/top,
+"jb" = (
+/obj/structure/dropship_piece/one/cockpit/right,
 /turf/template_noop,
 /area/shuttle/dropship/alamo)
-"aQ" = (
-/turf/closed/shuttle/dropship1/finleft{
+"jJ" = (
+/turf/closed/shuttle/dropship1/enginethree{
 	dir = 8
 	},
 /area/shuttle/dropship/alamo)
-"aR" = (
-/turf/closed/shuttle/dropship1/finleft{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"aS" = (
+"jM" = (
 /turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"aT" = (
-/turf/closed/shuttle/dropship1/aisle,
+"lG" = (
+/turf/open/shuttle/dropship/five,
 /area/shuttle/dropship/alamo)
-"aU" = (
+"mS" = (
 /obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/camera/autoname/mainship/dropship_one{
-	dir = 8;
-	pixel_x = 16
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"aV" = (
-/turf/closed/shuttle/dropship1/finright{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"aW" = (
-/turf/closed/shuttle/dropship1/finright{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"aX" = (
-/obj/effect/attach_point/weapon/dropship1{
-	dir = 8;
-	},
-/obj/structure/dropship_piece/one/wing/left/bottom,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"aY" = (
-/turf/closed/shuttle/dropship1/finleft,
-/area/shuttle/dropship/alamo)
-"aZ" = (
-/turf/closed/shuttle/dropship1/aisle{
 	dir = 4
 	},
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"ba" = (
-/turf/closed/shuttle/dropship1/finright,
+"nu" = (
+/obj/machinery/door/airlock/hatch/cockpit,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"bb" = (
-/obj/effect/attach_point/weapon/dropship1{
-	dir = 4;
-	},
-/obj/structure/dropship_piece/one/wing/right/bottom,
+"pe" = (
+/obj/structure/dropship_piece/one/engine/lefttop,
 /turf/template_noop,
 /area/shuttle/dropship/alamo)
-"bc" = (
-/obj/machinery/door/poddoor/shutters/transit,
-/obj/machinery/door/airlock/dropship_hatch/right,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"bd" = (
-/obj/structure/bed/chair/dropship/passenger{
+"ql" = (
+/turf/closed/shuttle/dropship1/cornersalt{
 	dir = 8
 	},
-/obj/machinery/vending/nanomed{
+/area/shuttle/dropship/alamo)
+"qr" = (
+/turf/closed/shuttle/dropship1/enginetwo{
 	dir = 8
 	},
-/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"be" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/vending/nanomed{
-	dir = 4
-	},
+"rg" = (
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"bg" = (
-/obj/docking_port/mobile/marine_dropship/one,
-/turf/closed/shuttle/dropship1/aisle{
-	dir = 4
-	},
+"rj" = (
+/turf/template_noop,
+/area/template_noop)
+"rs" = (
+/obj/structure/dropship_piece/one/front/right,
+/turf/template_noop,
 /area/shuttle/dropship/alamo)
-"bi" = (
-/turf/closed/shuttle/dropship1/edge{
-	dir = 4
-	},
+"sY" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard,
+/turf/closed/shuttle/dropship1/edge,
 /area/shuttle/dropship/alamo)
-"bj" = (
+"tg" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/floor,
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"bk" = (
-/turf/closed/shuttle/dropship1/aisle{
-	dir = 8
-	},
+"vR" = (
+/obj/structure/dropship_piece/one/engine/rightbottom,
+/turf/template_noop,
 /area/shuttle/dropship/alamo)
-"bl" = (
+"xH" = (
 /obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/light{
 	dir = 8
 	},
-/turf/open/shuttle/dropship/floor,
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"bm" = (
-/turf/closed/shuttle/dropship1/edge{
+"xK" = (
+/obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
-/area/shuttle/dropship/alamo)
-"bn" = (
-/obj/machinery/telecomms/relay/preset/telecomms/onboard,
-/turf/closed/shuttle/dropship1/aisle{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"bo" = (
-/turf/open/shuttle/dropship/four,
-/area/shuttle/dropship/alamo)
-"bp" = (
-/obj/item/radio/intercom/dropship,
-/obj/machinery/holopad,
-/turf/open/shuttle/dropship/five,
-/area/shuttle/dropship/alamo)
-"bq" = (
 /turf/open/shuttle/dropship/eight,
 /area/shuttle/dropship/alamo)
-"br" = (
-/turf/closed/shuttle/dropship1/cornersalt,
-/area/shuttle/dropship/alamo)
-"bs" = (
-/obj/structure/dropship_piece/one/corner/middleright,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"bt" = (
-/obj/structure/dropship_piece/one/corner/middleleft,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"bu" = (
-/turf/closed/shuttle/dropship1/edge/alt{
-	dir = 1
+"zr" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8
 	},
-/area/shuttle/dropship/alamo)
-"bv" = (
-/turf/closed/shuttle/dropship1/cornersalt{
-	dir = 1
+/obj/machinery/camera/autoname/mainship/dropship_one{
+	dir = 8;
+	pixel_x = 16
 	},
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"bw" = (
+"At" = (
 /obj/structure/bed/chair/dropship/passenger,
+/obj/docking_port/mobile/marine_dropship/two,
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"bx" = (
+"Au" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 4
 	},
-/obj/machinery/camera/autoname/mainship/dropship_one{
-	dir = 4;
-	pixel_x = -16
-	},
 /obj/machinery/vending/nanomed{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"by" = (
-/turf/closed/shuttle/dropship1/edge/alt,
-/area/shuttle/dropship/alamo)
-"bD" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/camera/autoname/mainship/dropship_one{
-	dir = 4;
-	pixel_x = -16
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"bE" = (
-/obj/structure/dropship_piece/one/engine/lefttop,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"bF" = (
-/obj/structure/dropship_piece/one/engine/righttop,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"bG" = (
-/turf/closed/shuttle/dropship1/enginefour,
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"bH" = (
-/turf/closed/shuttle/dropship1/enginefour{
+"Bb" = (
+/turf/closed/shuttle/dropship1/window{
 	dir = 1
 	},
 /area/shuttle/dropship/alamo)
-"bI" = (
-/obj/effect/attach_point/crew_weapon/dropship1,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"bJ" = (
-/turf/closed/shuttle/dropship1/wall,
-/area/shuttle/dropship/alamo)
-"bK" = (
-/turf/closed/shuttle/dropship1/enginefour{
-	dir = 4
+"BG" = (
+/turf/closed/shuttle/dropship1/wall{
+	dir = 1
 	},
 /area/shuttle/dropship/alamo)
-"bL" = (
-/turf/closed/shuttle/dropship1/enginefour{
+"Cr" = (
+/turf/closed/shuttle/dropship1/wall{
 	dir = 8
 	},
 /area/shuttle/dropship/alamo)
-"bM" = (
-/turf/closed/shuttle/dropship1/enginethree,
-/area/shuttle/dropship/alamo)
-"bN" = (
-/turf/closed/shuttle/dropship1/enginethree{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"bO" = (
+"Dc" = (
 /turf/closed/shuttle/dropship1/wall{
 	dir = 4
 	},
 /area/shuttle/dropship/alamo)
-"bP" = (
-/turf/closed/shuttle/dropship1/wall{
-	dir = 8
+"Dt" = (
+/obj/structure/dropship_piece/one/engine/righttop,
+/turf/template_noop,
+/area/shuttle/dropship/alamo)
+"Dw" = (
+/obj/structure/dropship_piece/two/corner/rearright{
+	dir = 1
 	},
+/obj/structure/dropship_piece/one/corner/middleright,
+/turf/template_noop,
 /area/shuttle/dropship/alamo)
-"bQ" = (
-/turf/closed/shuttle/dropship1/enginethree{
+"Eb" = (
+/turf/closed/shuttle/dropship1/interiorwindow{
 	dir = 8
 	},
 /area/shuttle/dropship/alamo)
-"bR" = (
-/turf/closed/shuttle/dropship1/enginethree{
+"Fy" = (
+/turf/closed/shuttle/dropship1/enginetwo{
 	dir = 4
 	},
 /area/shuttle/dropship/alamo)
-"bS" = (
-/turf/closed/shuttle/dropship1/enginetwo,
-/area/shuttle/dropship/alamo)
-"bT" = (
-/turf/closed/shuttle/dropship1/enginetwo{
+"Gf" = (
+/obj/machinery/door/poddoor/shutters/transit{
 	dir = 1
 	},
+/turf/open/shuttle/dropship/floor/alt,
 /area/shuttle/dropship/alamo)
-"bW" = (
-/obj/structure/dropship_piece/one/corner/rearleft,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"bX" = (
-/turf/closed/shuttle/dropship1/interiormisc,
-/area/shuttle/dropship/alamo)
-"bY" = (
-/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds1,
+"Hg" = (
 /obj/machinery/door/poddoor/shutters/transit{
 	dir = 1
 	},
+/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds1,
+/turf/open/shuttle/dropship/floor/alt,
+/area/shuttle/dropship/alamo)
+"Hj" = (
+/obj/machinery/computer/shuttle/marine_dropship/two,
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"bZ" = (
+"HK" = (
 /obj/machinery/door/poddoor/shutters/transit{
-	dir = 1
+	dir = 8
 	},
+/obj/machinery/door/airlock/dropship_hatch/left,
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"ca" = (
-/turf/closed/shuttle/dropship1/interiormisc{
-	dir = 1
+"Ix" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
 	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/alamo)
-"cb" = (
-/obj/structure/dropship_piece/one/corner/rearright,
-/turf/template_noop,
+"Kd" = (
+/turf/closed/shuttle/dropship1/cornersalt2,
 /area/shuttle/dropship/alamo)
-"cc" = (
-/obj/structure/dropship_piece/one/rearwing/lefttop,
-/turf/template_noop,
+"Kl" = (
+/turf/closed/shuttle/dropship1/edge,
 /area/shuttle/dropship/alamo)
-"cd" = (
-/obj/structure/dropship_piece/one/rearwing/righttop,
-/turf/template_noop,
+"Kr" = (
+/obj/structure/bed/chair/dropship/passenger,
+/turf/open/shuttle/dropship/seven,
 /area/shuttle/dropship/alamo)
-"ce" = (
-/obj/structure/dropship_piece/one/rearwing/leftllbottom,
-/turf/template_noop,
+"Kx" = (
+/turf/closed/shuttle/dropship1/cornersalt2{
+	dir = 1
+	},
 /area/shuttle/dropship/alamo)
-"cf" = (
-/obj/structure/dropship_piece/one/rearwing/leftlbottom,
-/turf/template_noop,
+"Mb" = (
+/turf/closed/shuttle/dropship1/enginethree,
 /area/shuttle/dropship/alamo)
-"cg" = (
-/obj/structure/dropship_piece/one/rearwing/leftbottom,
-/turf/template_noop,
+"Nl" = (
+/obj/effect/attach_point/crew_weapon/dropship1,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"ci" = (
-/obj/structure/dropship_piece/one/rearwing/rightbottom,
-/turf/template_noop,
+"Ov" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/turf/open/shuttle/dropship/four,
 /area/shuttle/dropship/alamo)
-"cj" = (
-/obj/structure/dropship_piece/one/rearwing/rightrbottom,
-/turf/template_noop,
+"OK" = (
+/turf/closed/shuttle/dropship1/enginetwo,
 /area/shuttle/dropship/alamo)
-"ck" = (
-/obj/structure/dropship_piece/one/rearwing/rightrrbottom,
+"RC" = (
+/obj/structure/dropship_piece/one/cockpit/left,
 /turf/template_noop,
 /area/shuttle/dropship/alamo)
-"dS" = (
-/turf/closed/shuttle/dropship1/enginetwo{
-	dir = 4
+"RS" = (
+/turf/closed/shuttle/dropship1/enginefour{
+	dir = 8
 	},
 /area/shuttle/dropship/alamo)
-"gB" = (
-/turf/closed/shuttle/dropship1/edge/alt{
-	dir = 4
+"Ta" = (
+/turf/closed/shuttle/dropship1/enginetwo{
+	dir = 1
 	},
 /area/shuttle/dropship/alamo)
-"iV" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/structure/closet/walllocker/hydrant/extinguisher{
+"Ug" = (
+/turf/closed/shuttle/dropship1/cornersalt{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/alamo)
-"vw" = (
-/obj/structure/dropship_piece/one/engine/leftbottom,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"yA" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/structure/closet/walllocker/hydrant/extinguisher{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
+"Vf" = (
+/turf/closed/shuttle/dropship1/interiorwindow,
 /area/shuttle/dropship/alamo)
-"Dp" = (
-/turf/open/shuttle/dropship/ten,
+"WT" = (
+/turf/closed/shuttle/dropship1/wall,
 /area/shuttle/dropship/alamo)
-"FA" = (
-/turf/closed/shuttle/dropship1/enginetwo{
-	dir = 8
-	},
+"Xc" = (
+/obj/structure/bed/chair/dropship/passenger,
+/obj/item/radio/intercom/dropship,
+/turf/open/shuttle/dropship/six,
 /area/shuttle/dropship/alamo)
-"Ki" = (
-/obj/machinery/computer/shuttle/marine_dropship/one,
-/turf/closed/shuttle/dropship1/panel{
+"Yf" = (
+/turf/closed/shuttle/dropship1/enginefour{
 	dir = 1
 	},
 /area/shuttle/dropship/alamo)
-"QK" = (
-/obj/structure/dropship_piece/one/engine/rightbottom,
+"Yp" = (
+/obj/structure/dropship_piece/one/front,
 /turf/template_noop,
 /area/shuttle/dropship/alamo)
-"Zx" = (
-/turf/closed/shuttle/dropship1/wall{
-	dir = 1
-	},
+"YX" = (
+/obj/structure/dropship_piece/one/engine/leftbottom,
+/turf/template_noop,
 /area/shuttle/dropship/alamo)
 
 (1,1,1) = {"
-ao
-ao
-ao
-ao
-ao
-aG
-aQ
-aX
-ao
-ao
-ao
-ao
-ao
-ao
-bE
-bG
-bM
+rj
+rj
+rj
+rj
+rj
+rj
+rj
+pe
 bS
-vw
-ao
-ao
+Mb
+OK
+YX
+rj
 "}
 (2,1,1) = {"
-ao
-ao
-ao
-ap
-ay
-aH
-aR
-aY
-ac
-ac
-bu
-bi
-bu
-bt
-bF
-bH
-bN
-bT
-QK
-ao
-ce
+rj
+rj
+rj
+rj
+rj
+rj
+rj
+Dt
+Yf
+gt
+Ta
+vR
+rj
 "}
 (3,1,1) = {"
-ao
-ao
-ao
-aq
-aE
-aI
-bD
-aI
-al
-al
-aI
-aI
-aI
-br
-bu
-bu
-bO
-bJ
-bW
-ao
-cf
+rj
+rj
+rj
+rj
+Kd
+iS
+HK
+iS
+iS
+Dc
+WT
+iS
+aD
 "}
 (4,1,1) = {"
-aa
-ae
-aj
-ar
-aE
-aJ
-aS
-aS
-aS
-aS
-aS
-aS
-bo
-aI
-bx
-iV
-bl
-aI
-bX
-cc
-cg
+gO
+RC
+Ug
+Vf
+Kl
+Xc
+jM
+mS
+Ix
+Au
+mS
+Ov
+Hg
 "}
 (5,1,1) = {"
-ab
-af
-ak
-as
-aB
-aK
-bj
-aN
-bd
-yA
-aN
-bj
-Dp
-aS
-aS
-aS
-aS
-aS
-bY
-ao
-ao
+Yp
+Bb
+Hj
+gb
+nu
+lG
+At
+Nl
+rg
+rg
+rg
+lG
+Gf
 "}
 (6,1,1) = {"
-ab
-ag
-Ki
-at
-aC
-aK
-aT
-bn
-aZ
-aZ
-bg
-bk
-bp
-bw
-bI
-al
-al
-al
-bZ
-ao
-ao
+rs
+jb
+ql
+Eb
+sY
+Kr
+jM
+zr
+tg
+gj
+xH
+xK
+Gf
 "}
 (7,1,1) = {"
-ab
-ah
-am
-au
-aD
-aK
-bl
-aI
-be
-iV
-aI
-bl
-Dp
-aS
-aS
-aS
-aS
-aS
-bZ
-ao
-ao
+rj
+rj
+rj
+rj
+Kx
+hm
+dT
+hm
+hm
+Cr
+BG
+hm
+Dw
 "}
 (8,1,1) = {"
-ad
-ai
-an
-av
-aE
-aM
-aS
-aS
-aS
-aS
-aS
-aS
-bq
-aN
-bd
-yA
-bj
-aN
-ca
-cd
-ci
+rj
+rj
+rj
+rj
+rj
+rj
+rj
+pe
+cM
+jJ
+Fy
+YX
+rj
 "}
 (9,1,1) = {"
-ao
-ao
-ao
-aw
-aE
-aN
-aU
-aN
-al
-al
-aN
-aN
-aN
-bv
-by
-by
-bP
-Zx
-cb
-ao
-cj
-"}
-(10,1,1) = {"
-ao
-ao
-ao
-ax
-aF
-aO
-aV
-ba
-bc
-bc
-gB
-bm
-by
-bs
-bE
-bK
-bQ
-dS
-vw
-ao
-ck
-"}
-(11,1,1) = {"
-ao
-ao
-ao
-ao
-ao
-aP
-aW
-bb
-ao
-ao
-ao
-ao
-ao
-ao
-bF
-bL
-bR
-FA
-QK
-ao
-ao
+rj
+rj
+rj
+rj
+rj
+rj
+rj
+Dt
+RS
+eN
+qr
+vR
+rj
 "}
diff --git a/_maps/shuttles/normandy.dmm b/_maps/shuttles/normandy.dmm
index a14f6b45a4f..19e6cab728e 100644
--- a/_maps/shuttles/normandy.dmm
+++ b/_maps/shuttles/normandy.dmm
@@ -1,455 +1,794 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ay" = (
-/obj/structure/dropship_piece/two/engine/leftbottom,
-/turf/closed/shuttle/dropship2/engineone,
+"ax" = (
+/obj/structure/dropship_piece/two/corner/middleright,
+/turf/template_noop,
 /area/shuttle/dropship/normandy)
-"bi" = (
-/obj/structure/bed/chair/dropship/passenger{
+"aD" = (
+/turf/closed/shuttle/dropship2/engine_sidealt{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/four,
 /area/shuttle/dropship/normandy)
-"cK" = (
-/turf/closed/shuttle/dropship2/glassone,
-/area/shuttle/dropship/normandy)
-"cW" = (
-/obj/structure/bed/chair/dropship/passenger,
-/turf/open/shuttle/dropship/seven,
-/area/shuttle/dropship/normandy)
-"eY" = (
-/turf/open/shuttle/dropship/three,
+"bc" = (
+/turf/closed/shuttle/dropship2/finright{
+	dir = 1
+	},
 /area/shuttle/dropship/normandy)
-"fz" = (
-/obj/structure/dropship_piece/two/engine/leftbottom,
-/turf/closed/shuttle/dropship2/engineone{
-	dir = 4
+"bg" = (
+/turf/closed/shuttle/dropship2/engine_sidealt{
+	dir = 8
 	},
 /area/shuttle/dropship/normandy)
-"fJ" = (
+"bq" = (
 /obj/structure/bed/chair/dropship/passenger{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8
+	dir = 4
 	},
-/turf/open/shuttle/dropship/three,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"gx" = (
-/turf/closed/shuttle/dropship2/engine_sidealt{
+"cE" = (
+/turf/closed/shuttle/dropship2/aisle{
 	dir = 4
 	},
 /area/shuttle/dropship/normandy)
-"gA" = (
-/obj/effect/attach_point/crew_weapon/dropship2,
-/turf/open/shuttle/dropship/floor,
+"cN" = (
+/turf/template_noop,
+/area/template_noop)
+"cX" = (
+/turf/closed/shuttle/dropship2/engine_sidealt{
+	dir = 1
+	},
 /area/shuttle/dropship/normandy)
-"hz" = (
-/obj/structure/dropship_piece/two/cockpit/right{
+"ex" = (
+/turf/closed/shuttle/dropship2/edge/alt,
+/area/shuttle/dropship/normandy)
+"eZ" = (
+/turf/closed/shuttle/dropship2/finleft{
+	dir = 1
+	},
+/area/shuttle/dropship/normandy)
+"fa" = (
+/turf/closed/shuttle/dropship2/engineone/alt{
 	dir = 1
 	},
+/area/shuttle/dropship/normandy)
+"fh" = (
+/obj/structure/dropship_piece/two/corner/middleleft,
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"iq" = (
-/obj/structure/bed/chair/dropship/passenger,
-/obj/docking_port/mobile/marine_dropship/two,
+"fr" = (
+/obj/machinery/door/poddoor/shutters/transit{
+	dir = 1
+	},
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"jx" = (
-/obj/machinery/computer/shuttle/marine_dropship/two,
-/turf/open/shuttle/dropship/floor,
+"fP" = (
+/turf/closed/shuttle/dropship2/window,
 /area/shuttle/dropship/normandy)
-"jY" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
+"gt" = (
+/turf/closed/shuttle/dropship2/enginethree{
+	dir = 1
 	},
-/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/normandy)
-"lI" = (
-/obj/machinery/door/poddoor/shutters/transit{
+"hk" = (
+/obj/structure/dropship_piece/two/front{
 	dir = 1
 	},
-/turf/open/shuttle/dropship/floor/alt,
+/turf/template_noop,
 /area/shuttle/dropship/normandy)
-"mf" = (
-/obj/machinery/telecomms/relay/preset/telecomms/onboard,
-/turf/closed/shuttle/dropship2/edge{
+"hV" = (
+/obj/structure/dropship_piece/two/engine/righttop,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"jc" = (
+/obj/item/phone{
+	pixel_x = -11;
+	pixel_y = 14
+	},
+/obj/machinery/computer/dropship_weapons/dropship2,
+/turf/closed/shuttle/dropship2/panel{
+	dir = 4
+	},
+/area/shuttle/dropship/normandy)
+"jo" = (
+/obj/structure/dropship_piece/two/wing/right/bottom,
+/obj/effect/attach_point/weapon/dropship2,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"jG" = (
+/turf/closed/shuttle/dropship2/enginetwo{
 	dir = 1
 	},
 /area/shuttle/dropship/normandy)
-"nu" = (
-/obj/structure/bed/chair/dropship/passenger{
+"jY" = (
+/obj/structure/dropship_piece/two/rearwing/righttop,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"kh" = (
+/obj/docking_port/mobile/marine_dropship/one,
+/turf/closed/shuttle/dropship2/aisle{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/normandy)
-"oe" = (
+"kD" = (
+/turf/closed/shuttle/dropship2/edge/alt{
+	dir = 1
+	},
+/area/shuttle/dropship/normandy)
+"kZ" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
 /obj/machinery/camera/autoname/mainship/dropship_two{
 	dir = 8
 	},
-/turf/open/shuttle/dropship/three,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"oB" = (
-/obj/structure/bed/chair/dropship/passenger,
-/obj/item/radio/intercom/dropship/normandy,
-/turf/open/shuttle/dropship/six,
+"lp" = (
+/obj/structure/dropship_piece/two/rearwing/lefttop,
+/turf/template_noop,
 /area/shuttle/dropship/normandy)
-"pB" = (
-/turf/closed/shuttle/dropship2/glassfour,
+"lq" = (
+/obj/structure/dropship_piece/two/rearwing/rightrrbottom,
+/turf/template_noop,
 /area/shuttle/dropship/normandy)
-"qP" = (
-/turf/closed/shuttle/dropship2/enginetwo{
-	dir = 1
-	},
+"lY" = (
+/obj/structure/dropship_piece/two/wing/left/bottom,
+/obj/effect/attach_point/weapon/dropship2,
+/turf/template_noop,
 /area/shuttle/dropship/normandy)
-"qW" = (
-/turf/closed/shuttle/dropship2/enginethree{
+"my" = (
+/turf/closed/shuttle/dropship2/engineone/alt{
 	dir = 4
 	},
 /area/shuttle/dropship/normandy)
-"rG" = (
-/turf/closed/shuttle/dropship2/edge{
-	dir = 1
-	},
+"nf" = (
+/turf/closed/shuttle/dropship2/enginethree,
 /area/shuttle/dropship/normandy)
-"rN" = (
-/turf/closed/shuttle/dropship2/enginetwo{
+"ns" = (
+/obj/machinery/door/poddoor/shutters/transit{
 	dir = 8
 	},
+/obj/machinery/door/airlock/dropship_hatch/left/two,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"sh" = (
-/turf/closed/shuttle/dropship2/enginetwo{
+"nT" = (
+/obj/structure/dropship_piece/two/engine/leftbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"oF" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard,
+/turf/closed/shuttle/dropship2/aisle{
 	dir = 4
 	},
 /area/shuttle/dropship/normandy)
-"th" = (
-/turf/open/shuttle/dropship/five,
-/area/shuttle/dropship/normandy)
-"ud" = (
-/turf/closed/shuttle/dropship2/engineone/alt,
-/area/shuttle/dropship/normandy)
-"ur" = (
-/obj/structure/bed/chair/dropship/pilot{
+"pm" = (
+/obj/machinery/computer/shuttle/marine_dropship/one,
+/turf/closed/shuttle/dropship2/panel{
 	dir = 1
 	},
-/obj/machinery/camera/autoname/mainship/dropship_two{
-	dir = 8
+/area/shuttle/dropship/normandy)
+"pH" = (
+/turf/closed/shuttle/dropship2/finleft,
+/area/shuttle/dropship/normandy)
+"pO" = (
+/obj/structure/bed/chair/dropship/passenger,
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"rC" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
 	},
 /obj/machinery/light{
 	dir = 8
 	},
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"xX" = (
-/turf/closed/shuttle/dropship2/singlewindow{
-	dir = 1
-	},
+"rJ" = (
+/turf/closed/shuttle/dropship2/cornersalt,
 /area/shuttle/dropship/normandy)
-"yx" = (
-/obj/structure/dropship_piece/two/corner/rearleft{
-	dir = 1
-	},
+"rL" = (
+/obj/structure/dropship_piece/two/wing/right/top,
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"yT" = (
-/obj/machinery/door/poddoor/shutters/transit,
-/obj/machinery/door/airlock/dropship_hatch/right/two,
-/turf/open/shuttle/dropship/floor,
+"sx" = (
+/obj/item/radio/intercom/dropship/normandy,
+/turf/open/shuttle/dropship/seven,
 /area/shuttle/dropship/normandy)
-"zF" = (
-/obj/structure/dropship_piece/two/front/left{
+"tn" = (
+/obj/structure/dropship_piece/two/weapon/rightleft,
+/obj/effect/attach_point/electronics/dropship2,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"tD" = (
+/obj/structure/dropship_piece/two/weapon/leftleft{
 	dir = 1
 	},
+/obj/effect/attach_point/weapon/dropship2,
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"AM" = (
-/turf/closed/shuttle/dropship2/enginetwo,
+"tE" = (
+/turf/closed/shuttle/dropship2/glassthree,
 /area/shuttle/dropship/normandy)
-"BK" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 1
+"ur" = (
+/turf/closed/shuttle/dropship2/enginethree{
+	dir = 8
 	},
-/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds2,
-/turf/open/shuttle/dropship/floor/alt,
 /area/shuttle/dropship/normandy)
-"Cq" = (
-/obj/machinery/door/poddoor/shutters/transit{
+"uK" = (
+/turf/closed/shuttle/dropship2/enginetwo{
 	dir = 8
 	},
-/obj/machinery/door/airlock/dropship_hatch/left/two,
-/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"CN" = (
-/turf/closed/shuttle/dropship2/engineone/alt{
+"uL" = (
+/turf/closed/shuttle/dropship2/finright{
+	dir = 8
+	},
+/area/shuttle/dropship/normandy)
+"uU" = (
+/turf/closed/shuttle/dropship2/cornersalt{
 	dir = 1
 	},
 /area/shuttle/dropship/normandy)
-"Dz" = (
-/obj/structure/bed/chair/dropship/passenger{
+"ve" = (
+/turf/closed/shuttle/dropship2/engineone/alt,
+/area/shuttle/dropship/normandy)
+"vw" = (
+/obj/structure/dropship_piece/two/engine/rightbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"wt" = (
+/turf/closed/shuttle/dropship2/edge{
 	dir = 8
 	},
-/obj/machinery/light{
+/area/shuttle/dropship/normandy)
+"yt" = (
+/turf/closed/shuttle/dropship2/aisle,
+/area/shuttle/dropship/normandy)
+"zl" = (
+/turf/closed/shuttle/dropship2/enginethree{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/normandy)
-"DH" = (
-/turf/closed/shuttle/dropship2/walltwo,
+"zF" = (
+/turf/closed/shuttle/dropship2/finright,
 /area/shuttle/dropship/normandy)
-"Fn" = (
-/turf/closed/shuttle/dropship2/glassthree,
+"Ag" = (
+/obj/effect/attach_point/crew_weapon/dropship2,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"FH" = (
-/turf/closed/shuttle/dropship2/engineone/alt{
+"AZ" = (
+/obj/structure/dropship_piece/two/wing/left/top,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"Bn" = (
+/obj/structure/dropship_piece/two/cockpit/right{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"Br" = (
+/turf/closed/shuttle/dropship2/edge{
 	dir = 4
 	},
 /area/shuttle/dropship/normandy)
-"Gg" = (
-/turf/closed/shuttle/dropship2/engineone/alt{
+"Cd" = (
+/turf/open/shuttle/dropship/three,
+/area/shuttle/dropship/normandy)
+"Dw" = (
+/turf/closed/shuttle/dropship2/aisle{
 	dir = 8
 	},
 /area/shuttle/dropship/normandy)
-"Ii" = (
-/turf/closed/shuttle/dropship2/enginethree,
-/area/shuttle/dropship/normandy)
-"Iv" = (
-/turf/closed/shuttle/dropship2/engine_sidealt{
+"EF" = (
+/turf/closed/shuttle/dropship2/interiormisc{
 	dir = 8
 	},
 /area/shuttle/dropship/normandy)
-"Js" = (
-/turf/closed/shuttle/dropship2/glasstwo,
+"EH" = (
+/turf/closed/shuttle/dropship2/enginetwo,
 /area/shuttle/dropship/normandy)
-"JK" = (
-/turf/closed/shuttle/dropship2/enginethree{
-	dir = 1
+"ET" = (
+/turf/closed/shuttle/dropship2/window{
+	dir = 8
 	},
 /area/shuttle/dropship/normandy)
-"JT" = (
+"EW" = (
 /turf/closed/shuttle/dropship2/engine_sidealt,
 /area/shuttle/dropship/normandy)
-"LS" = (
+"FA" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/obj/machinery/camera/autoname/mainship/dropship_two{
+	dir = 4
+	},
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"Mg" = (
-/obj/structure/dropship_piece/two/engine/rightbottom,
-/turf/closed/shuttle/dropship2/engineone{
-	dir = 8
-	},
+"FO" = (
+/turf/open/shuttle/dropship/five,
 /area/shuttle/dropship/normandy)
-"OZ" = (
-/turf/closed/shuttle/dropship2/wallthree,
+"GC" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"Ph" = (
+"Hf" = (
 /obj/structure/dropship_piece/two/front/right{
 	dir = 1
 	},
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"Qh" = (
-/obj/structure/dropship_piece/two/front{
-	dir = 1
+"HR" = (
+/obj/structure/dropship_piece/two/engine/lefttop,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"HT" = (
+/obj/structure/dropship_piece/two/rearwing/rightrbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"HU" = (
+/obj/structure/dropship_piece/two/rearwing/leftbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"HY" = (
+/turf/open/shuttle/dropship/four,
+/area/shuttle/dropship/normandy)
+"IC" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/obj/structure/closet/walllocker/hydrant/extinguisher{
+	dir = 4
 	},
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"Km" = (
+/obj/item/radio/intercom/dropship/normandy,
+/turf/open/shuttle/dropship/six,
+/area/shuttle/dropship/normandy)
+"KP" = (
+/obj/structure/dropship_piece/two/weapon/leftright,
+/obj/effect/attach_point/electronics/dropship2,
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"QN" = (
-/obj/structure/dropship_piece/two/corner/rearright{
+"KQ" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 8
+	},
+/obj/machinery/vending/nanomed{
+	dir = 8
+	},
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"Mh" = (
+/obj/machinery/door/poddoor/shutters/transit{
 	dir = 1
 	},
+/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds2,
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"Ne" = (
+/obj/structure/dropship_piece/two/weapon/rightright{
+	dir = 1
+	},
+/obj/effect/attach_point/weapon/dropship2,
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"Rq" = (
+"Ns" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
-/turf/open/shuttle/dropship/eight,
+/obj/structure/closet/walllocker/hydrant/extinguisher{
+	dir = 8
+	},
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"Su" = (
-/turf/closed/shuttle/dropship2/enginethree{
+"NN" = (
+/turf/closed/shuttle/dropship2/interiorwindow{
 	dir = 8
 	},
 /area/shuttle/dropship/normandy)
-"SV" = (
+"Od" = (
+/turf/closed/shuttle/dropship2/edge,
+/area/shuttle/dropship/normandy)
+"Pc" = (
+/turf/closed/shuttle/dropship2/cornersalt2{
+	dir = 1
+	},
+/area/shuttle/dropship/normandy)
+"Pz" = (
+/obj/structure/dropship_piece/two/rearwing/leftlbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"PH" = (
+/obj/machinery/computer/security/dropship/two,
+/turf/closed/shuttle/dropship2/panel,
+/area/shuttle/dropship/normandy)
+"PI" = (
+/turf/closed/shuttle/dropship2/enginetwo{
+	dir = 4
+	},
+/area/shuttle/dropship/normandy)
+"Qp" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 4
 	},
 /obj/machinery/vending/nanomed{
 	dir = 4
 	},
-/turf/open/shuttle/dropship/three,
+/turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
-"Tb" = (
-/obj/structure/dropship_piece/two/cockpit/left{
+"QD" = (
+/obj/machinery/door/airlock/hatch/cockpit/two,
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"QV" = (
+/obj/structure/bed/chair/dropship/passenger{
+	dir = 4
+	},
+/obj/machinery/vending/nanomed{
+	dir = 4
+	},
+/obj/machinery/camera/autoname/mainship/dropship_two{
+	dir = 4
+	},
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"QY" = (
+/turf/closed/shuttle/dropship2/cornersalt2,
+/area/shuttle/dropship/normandy)
+"RG" = (
+/turf/closed/shuttle/dropship2/glassfour,
+/area/shuttle/dropship/normandy)
+"RK" = (
+/turf/closed/shuttle/dropship2/engineone/alt{
+	dir = 8
+	},
+/area/shuttle/dropship/normandy)
+"RP" = (
+/turf/closed/shuttle/dropship2/finright{
+	dir = 4
+	},
+/area/shuttle/dropship/normandy)
+"Te" = (
+/obj/structure/dropship_piece/two/rearwing/rightbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"Tk" = (
+/turf/open/shuttle/dropship/eight,
+/area/shuttle/dropship/normandy)
+"Tw" = (
+/turf/closed/shuttle/dropship2/finleft{
+	dir = 8
+	},
+/area/shuttle/dropship/normandy)
+"Vg" = (
+/obj/structure/dropship_piece/two/front/left{
 	dir = 1
 	},
 /turf/template_noop,
 /area/shuttle/dropship/normandy)
-"Wg" = (
-/turf/closed/shuttle/dropship2/rearcorner/alt{
+"VB" = (
+/obj/structure/bed/chair/dropship/pilot{
 	dir = 1
 	},
+/obj/machinery/light,
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"VE" = (
+/turf/closed/shuttle/dropship2/interiormisc,
 /area/shuttle/dropship/normandy)
-"Wk" = (
-/turf/closed/shuttle/dropship2/rearcorner{
+"Wd" = (
+/obj/machinery/door/poddoor/shutters/transit,
+/obj/machinery/door/airlock/dropship_hatch/right/two,
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"WO" = (
+/obj/structure/bed/chair/dropship/pilot{
 	dir = 1
 	},
+/obj/machinery/camera/autoname/mainship/dropship_two,
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"WQ" = (
+/obj/machinery/holopad,
+/obj/item/radio/intercom/dropship/normandy,
+/turf/open/shuttle/dropship/five,
+/area/shuttle/dropship/normandy)
+"Xk" = (
+/obj/structure/dropship_piece/two/rearwing/leftllbottom,
+/turf/template_noop,
+/area/shuttle/dropship/normandy)
+"XA" = (
+/turf/closed/shuttle/dropship2/window{
+	dir = 4
+	},
 /area/shuttle/dropship/normandy)
-"XK" = (
+"XL" = (
 /obj/structure/bed/chair/dropship/passenger{
 	dir = 8
 	},
-/obj/machinery/vending/nanomed{
-	dir = 8
+/turf/open/shuttle/dropship/floor,
+/area/shuttle/dropship/normandy)
+"XN" = (
+/turf/closed/shuttle/dropship2/interiorwindow,
+/area/shuttle/dropship/normandy)
+"Yi" = (
+/turf/closed/shuttle/dropship2/interiormisc{
+	dir = 4
 	},
-/turf/open/shuttle/dropship/three,
 /area/shuttle/dropship/normandy)
-"Ye" = (
-/turf/closed/shuttle/dropship2/engine_sidealt{
-	dir = 1
+"YR" = (
+/turf/open/shuttle/dropship/ten,
+/area/shuttle/dropship/normandy)
+"Zh" = (
+/turf/closed/shuttle/dropship2/finleft{
+	dir = 4
 	},
 /area/shuttle/dropship/normandy)
-"Zp" = (
+"Zm" = (
+/obj/structure/dropship_piece/two/cockpit/left{
+	dir = 1
+	},
 /turf/template_noop,
-/area/template_noop)
-"ZF" = (
-/obj/machinery/door/airlock/hatch/cockpit/two,
+/area/shuttle/dropship/normandy)
+"ZE" = (
 /turf/open/shuttle/dropship/floor,
 /area/shuttle/dropship/normandy)
 
 (1,1,1) = {"
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-ud
-Ii
-AM
-fz
-Zp
+cN
+cN
+cN
+cN
+cN
+AZ
+Tw
+lY
+cN
+cN
+cN
+cN
+cN
+cN
+HR
+ve
+nf
+EH
+nT
+cN
+cN
 "}
 (2,1,1) = {"
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-CN
-JK
-rN
-Mg
-Zp
+cN
+cN
+cN
+tD
+QY
+Zh
+eZ
+pH
+ns
+ns
+kD
+Br
+kD
+fh
+hV
+fa
+gt
+uK
+vw
+cN
+Xk
 "}
 (3,1,1) = {"
-Zp
-Zp
-Zp
-Zp
-Wg
-DH
-Cq
-DH
-DH
-JT
-gx
-DH
-yx
+cN
+cN
+cN
+KP
+Od
+GC
+FA
+GC
+ZE
+ZE
+GC
+GC
+GC
+rJ
+kD
+kD
+EW
+aD
+fh
+cN
+Pz
 "}
 (4,1,1) = {"
-zF
-Tb
-Fn
-Js
-rG
-oB
-eY
-nu
-fJ
-SV
-nu
-bi
-BK
+Vg
+Zm
+tE
+XN
+Od
+Km
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+HY
+GC
+QV
+IC
+rC
+GC
+VE
+lp
+HU
 "}
 (5,1,1) = {"
-Qh
-xX
-jx
-ur
-ZF
-th
-iq
-gA
-LS
-LS
-LS
-th
-lI
+hk
+fP
+PH
+VB
+Yi
+FO
+bq
+XL
+KQ
+Ns
+XL
+bq
+YR
+Cd
+Cd
+Cd
+Cd
+Cd
+Mh
+cN
+cN
 "}
 (6,1,1) = {"
-Ph
-hz
-pB
-cK
-mf
-cW
-eY
-oe
-Dz
-XK
-jY
-Rq
-lI
+hk
+XA
+pm
+ZE
+QD
+FO
+yt
+oF
+cE
+cE
+kh
+Dw
+WQ
+pO
+Ag
+ZE
+ZE
+ZE
+fr
+cN
+cN
 "}
 (7,1,1) = {"
-Zp
-Zp
-Zp
-Zp
-Wk
-OZ
-yT
-OZ
-OZ
-Ye
-Iv
-OZ
-QN
+hk
+ET
+jc
+WO
+EF
+FO
+rC
+GC
+Qp
+IC
+GC
+rC
+YR
+Cd
+Cd
+Cd
+Cd
+Cd
+fr
+cN
+cN
 "}
 (8,1,1) = {"
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-FH
-Su
-sh
-ay
-Zp
+Hf
+Bn
+RG
+NN
+Od
+sx
+Cd
+Cd
+Cd
+Cd
+Cd
+Cd
+Tk
+XL
+KQ
+Ns
+bq
+XL
+VE
+jY
+Te
 "}
 (9,1,1) = {"
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Zp
-Gg
-qW
-qP
-Mg
-Zp
+cN
+cN
+cN
+tn
+Od
+XL
+kZ
+XL
+ZE
+ZE
+XL
+XL
+XL
+uU
+ex
+ex
+cX
+bg
+ax
+cN
+HT
+"}
+(10,1,1) = {"
+cN
+cN
+cN
+Ne
+Pc
+RP
+bc
+zF
+Wd
+Wd
+ex
+wt
+ex
+ax
+HR
+my
+ur
+PI
+nT
+cN
+lq
+"}
+(11,1,1) = {"
+cN
+cN
+cN
+cN
+cN
+rL
+uL
+jo
+cN
+cN
+cN
+cN
+cN
+cN
+hV
+RK
+zl
+jG
+vw
+cN
+cN
 "}
diff --git a/_maps/~RUTGMC/shuttles/alamo.dmm b/_maps/~RUTGMC/shuttles/alamo.dmm
deleted file mode 100644
index b6b90327e55..00000000000
--- a/_maps/~RUTGMC/shuttles/alamo.dmm
+++ /dev/null
@@ -1,451 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aD" = (
-/obj/structure/dropship_piece/two/corner/rearleft{
-	dir = 1
-	},
-/obj/structure/dropship_piece/one/corner/middleleft,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"bS" = (
-/turf/closed/shuttle/dropship1/enginefour,
-/area/shuttle/dropship/alamo)
-"cM" = (
-/turf/closed/shuttle/dropship1/enginefour{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"dT" = (
-/obj/machinery/door/poddoor/shutters/transit,
-/obj/machinery/door/airlock/dropship_hatch/right,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"eN" = (
-/turf/closed/shuttle/dropship1/enginethree{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"gb" = (
-/obj/structure/bed/chair/dropship/pilot{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/camera/autoname/mainship/dropship_one{
-	dir = 4;
-	pixel_x = -16
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"gj" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/vending/nanomed{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"gt" = (
-/turf/closed/shuttle/dropship1/enginethree{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"gO" = (
-/obj/structure/dropship_piece/one/front/left,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"hm" = (
-/turf/closed/shuttle/dropship1/edge/alt,
-/area/shuttle/dropship/alamo)
-"iS" = (
-/turf/closed/shuttle/dropship1/edge/alt{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"jb" = (
-/obj/structure/dropship_piece/one/cockpit/right,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"jJ" = (
-/turf/closed/shuttle/dropship1/enginethree{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"jM" = (
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"lG" = (
-/turf/open/shuttle/dropship/five,
-/area/shuttle/dropship/alamo)
-"mS" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"nu" = (
-/obj/machinery/door/airlock/hatch/cockpit,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"pe" = (
-/obj/structure/dropship_piece/one/engine/lefttop,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"ql" = (
-/turf/closed/shuttle/dropship1/cornersalt{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"qr" = (
-/turf/closed/shuttle/dropship1/enginetwo{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"rg" = (
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"rj" = (
-/turf/template_noop,
-/area/template_noop)
-"rs" = (
-/obj/structure/dropship_piece/one/front/right,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"sY" = (
-/obj/machinery/telecomms/relay/preset/telecomms/onboard,
-/turf/closed/shuttle/dropship1/edge,
-/area/shuttle/dropship/alamo)
-"tg" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"vR" = (
-/obj/structure/dropship_piece/one/engine/rightbottom,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"xH" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"xK" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/eight,
-/area/shuttle/dropship/alamo)
-"zr" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/camera/autoname/mainship/dropship_one{
-	dir = 8;
-	pixel_x = 16
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"At" = (
-/obj/structure/bed/chair/dropship/passenger,
-/obj/docking_port/mobile/marine_dropship/two,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"Au" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/vending/nanomed{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"Bb" = (
-/turf/closed/shuttle/dropship1/window{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"BG" = (
-/turf/closed/shuttle/dropship1/wall{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"Cr" = (
-/turf/closed/shuttle/dropship1/wall{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"Dc" = (
-/turf/closed/shuttle/dropship1/wall{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"Dt" = (
-/obj/structure/dropship_piece/one/engine/righttop,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"Dw" = (
-/obj/structure/dropship_piece/two/corner/rearright{
-	dir = 1
-	},
-/obj/structure/dropship_piece/one/corner/middleright,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"Eb" = (
-/turf/closed/shuttle/dropship1/interiorwindow{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"Fy" = (
-/turf/closed/shuttle/dropship1/enginetwo{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"Gf" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 1
-	},
-/turf/open/shuttle/dropship/floor/alt,
-/area/shuttle/dropship/alamo)
-"Hg" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 1
-	},
-/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds1,
-/turf/open/shuttle/dropship/floor/alt,
-/area/shuttle/dropship/alamo)
-"Hj" = (
-/obj/machinery/computer/shuttle/marine_dropship/two,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"HK" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 8
-	},
-/obj/machinery/door/airlock/dropship_hatch/left,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"Ix" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/alamo)
-"Kd" = (
-/turf/closed/shuttle/dropship1/cornersalt2,
-/area/shuttle/dropship/alamo)
-"Kl" = (
-/turf/closed/shuttle/dropship1/edge,
-/area/shuttle/dropship/alamo)
-"Kr" = (
-/obj/structure/bed/chair/dropship/passenger,
-/turf/open/shuttle/dropship/seven,
-/area/shuttle/dropship/alamo)
-"Kx" = (
-/turf/closed/shuttle/dropship1/cornersalt2{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"Mb" = (
-/turf/closed/shuttle/dropship1/enginethree,
-/area/shuttle/dropship/alamo)
-"Nl" = (
-/obj/effect/attach_point/crew_weapon/dropship1,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/alamo)
-"Ov" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/four,
-/area/shuttle/dropship/alamo)
-"OK" = (
-/turf/closed/shuttle/dropship1/enginetwo,
-/area/shuttle/dropship/alamo)
-"RC" = (
-/obj/structure/dropship_piece/one/cockpit/left,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"RS" = (
-/turf/closed/shuttle/dropship1/enginefour{
-	dir = 8
-	},
-/area/shuttle/dropship/alamo)
-"Ta" = (
-/turf/closed/shuttle/dropship1/enginetwo{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"Ug" = (
-/turf/closed/shuttle/dropship1/cornersalt{
-	dir = 4
-	},
-/area/shuttle/dropship/alamo)
-"Vf" = (
-/turf/closed/shuttle/dropship1/interiorwindow,
-/area/shuttle/dropship/alamo)
-"WT" = (
-/turf/closed/shuttle/dropship1/wall,
-/area/shuttle/dropship/alamo)
-"Xc" = (
-/obj/structure/bed/chair/dropship/passenger,
-/obj/item/radio/intercom/dropship,
-/turf/open/shuttle/dropship/six,
-/area/shuttle/dropship/alamo)
-"Yf" = (
-/turf/closed/shuttle/dropship1/enginefour{
-	dir = 1
-	},
-/area/shuttle/dropship/alamo)
-"Yp" = (
-/obj/structure/dropship_piece/one/front,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-"YX" = (
-/obj/structure/dropship_piece/one/engine/leftbottom,
-/turf/template_noop,
-/area/shuttle/dropship/alamo)
-
-(1,1,1) = {"
-rj
-rj
-rj
-rj
-rj
-rj
-rj
-pe
-bS
-Mb
-OK
-YX
-rj
-"}
-(2,1,1) = {"
-rj
-rj
-rj
-rj
-rj
-rj
-rj
-Dt
-Yf
-gt
-Ta
-vR
-rj
-"}
-(3,1,1) = {"
-rj
-rj
-rj
-rj
-Kd
-iS
-HK
-iS
-iS
-Dc
-WT
-iS
-aD
-"}
-(4,1,1) = {"
-gO
-RC
-Ug
-Vf
-Kl
-Xc
-jM
-mS
-Ix
-Au
-mS
-Ov
-Hg
-"}
-(5,1,1) = {"
-Yp
-Bb
-Hj
-gb
-nu
-lG
-At
-Nl
-rg
-rg
-rg
-lG
-Gf
-"}
-(6,1,1) = {"
-rs
-jb
-ql
-Eb
-sY
-Kr
-jM
-zr
-tg
-gj
-xH
-xK
-Gf
-"}
-(7,1,1) = {"
-rj
-rj
-rj
-rj
-Kx
-hm
-dT
-hm
-hm
-Cr
-BG
-hm
-Dw
-"}
-(8,1,1) = {"
-rj
-rj
-rj
-rj
-rj
-rj
-rj
-pe
-cM
-jJ
-Fy
-YX
-rj
-"}
-(9,1,1) = {"
-rj
-rj
-rj
-rj
-rj
-rj
-rj
-Dt
-RS
-eN
-qr
-vR
-rj
-"}
diff --git a/_maps/~RUTGMC/shuttles/normandy.dmm b/_maps/~RUTGMC/shuttles/normandy.dmm
deleted file mode 100644
index 19e6cab728e..00000000000
--- a/_maps/~RUTGMC/shuttles/normandy.dmm
+++ /dev/null
@@ -1,794 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ax" = (
-/obj/structure/dropship_piece/two/corner/middleright,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"aD" = (
-/turf/closed/shuttle/dropship2/engine_sidealt{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"bc" = (
-/turf/closed/shuttle/dropship2/finright{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"bg" = (
-/turf/closed/shuttle/dropship2/engine_sidealt{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"bq" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"cE" = (
-/turf/closed/shuttle/dropship2/aisle{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"cN" = (
-/turf/template_noop,
-/area/template_noop)
-"cX" = (
-/turf/closed/shuttle/dropship2/engine_sidealt{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"ex" = (
-/turf/closed/shuttle/dropship2/edge/alt,
-/area/shuttle/dropship/normandy)
-"eZ" = (
-/turf/closed/shuttle/dropship2/finleft{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"fa" = (
-/turf/closed/shuttle/dropship2/engineone/alt{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"fh" = (
-/obj/structure/dropship_piece/two/corner/middleleft,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"fr" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 1
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"fP" = (
-/turf/closed/shuttle/dropship2/window,
-/area/shuttle/dropship/normandy)
-"gt" = (
-/turf/closed/shuttle/dropship2/enginethree{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"hk" = (
-/obj/structure/dropship_piece/two/front{
-	dir = 1
-	},
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"hV" = (
-/obj/structure/dropship_piece/two/engine/righttop,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"jc" = (
-/obj/item/phone{
-	pixel_x = -11;
-	pixel_y = 14
-	},
-/obj/machinery/computer/dropship_weapons/dropship2,
-/turf/closed/shuttle/dropship2/panel{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"jo" = (
-/obj/structure/dropship_piece/two/wing/right/bottom,
-/obj/effect/attach_point/weapon/dropship2,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"jG" = (
-/turf/closed/shuttle/dropship2/enginetwo{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"jY" = (
-/obj/structure/dropship_piece/two/rearwing/righttop,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"kh" = (
-/obj/docking_port/mobile/marine_dropship/one,
-/turf/closed/shuttle/dropship2/aisle{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"kD" = (
-/turf/closed/shuttle/dropship2/edge/alt{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"kZ" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/camera/autoname/mainship/dropship_two{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"lp" = (
-/obj/structure/dropship_piece/two/rearwing/lefttop,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"lq" = (
-/obj/structure/dropship_piece/two/rearwing/rightrrbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"lY" = (
-/obj/structure/dropship_piece/two/wing/left/bottom,
-/obj/effect/attach_point/weapon/dropship2,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"my" = (
-/turf/closed/shuttle/dropship2/engineone/alt{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"nf" = (
-/turf/closed/shuttle/dropship2/enginethree,
-/area/shuttle/dropship/normandy)
-"ns" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 8
-	},
-/obj/machinery/door/airlock/dropship_hatch/left/two,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"nT" = (
-/obj/structure/dropship_piece/two/engine/leftbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"oF" = (
-/obj/machinery/telecomms/relay/preset/telecomms/onboard,
-/turf/closed/shuttle/dropship2/aisle{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"pm" = (
-/obj/machinery/computer/shuttle/marine_dropship/one,
-/turf/closed/shuttle/dropship2/panel{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"pH" = (
-/turf/closed/shuttle/dropship2/finleft,
-/area/shuttle/dropship/normandy)
-"pO" = (
-/obj/structure/bed/chair/dropship/passenger,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"rC" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"rJ" = (
-/turf/closed/shuttle/dropship2/cornersalt,
-/area/shuttle/dropship/normandy)
-"rL" = (
-/obj/structure/dropship_piece/two/wing/right/top,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"sx" = (
-/obj/item/radio/intercom/dropship/normandy,
-/turf/open/shuttle/dropship/seven,
-/area/shuttle/dropship/normandy)
-"tn" = (
-/obj/structure/dropship_piece/two/weapon/rightleft,
-/obj/effect/attach_point/electronics/dropship2,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"tD" = (
-/obj/structure/dropship_piece/two/weapon/leftleft{
-	dir = 1
-	},
-/obj/effect/attach_point/weapon/dropship2,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"tE" = (
-/turf/closed/shuttle/dropship2/glassthree,
-/area/shuttle/dropship/normandy)
-"ur" = (
-/turf/closed/shuttle/dropship2/enginethree{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"uK" = (
-/turf/closed/shuttle/dropship2/enginetwo{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"uL" = (
-/turf/closed/shuttle/dropship2/finright{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"uU" = (
-/turf/closed/shuttle/dropship2/cornersalt{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"ve" = (
-/turf/closed/shuttle/dropship2/engineone/alt,
-/area/shuttle/dropship/normandy)
-"vw" = (
-/obj/structure/dropship_piece/two/engine/rightbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"wt" = (
-/turf/closed/shuttle/dropship2/edge{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"yt" = (
-/turf/closed/shuttle/dropship2/aisle,
-/area/shuttle/dropship/normandy)
-"zl" = (
-/turf/closed/shuttle/dropship2/enginethree{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"zF" = (
-/turf/closed/shuttle/dropship2/finright,
-/area/shuttle/dropship/normandy)
-"Ag" = (
-/obj/effect/attach_point/crew_weapon/dropship2,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"AZ" = (
-/obj/structure/dropship_piece/two/wing/left/top,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"Bn" = (
-/obj/structure/dropship_piece/two/cockpit/right{
-	dir = 1
-	},
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"Br" = (
-/turf/closed/shuttle/dropship2/edge{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"Cd" = (
-/turf/open/shuttle/dropship/three,
-/area/shuttle/dropship/normandy)
-"Dw" = (
-/turf/closed/shuttle/dropship2/aisle{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"EF" = (
-/turf/closed/shuttle/dropship2/interiormisc{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"EH" = (
-/turf/closed/shuttle/dropship2/enginetwo,
-/area/shuttle/dropship/normandy)
-"ET" = (
-/turf/closed/shuttle/dropship2/window{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"EW" = (
-/turf/closed/shuttle/dropship2/engine_sidealt,
-/area/shuttle/dropship/normandy)
-"FA" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/camera/autoname/mainship/dropship_two{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"FO" = (
-/turf/open/shuttle/dropship/five,
-/area/shuttle/dropship/normandy)
-"GC" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"Hf" = (
-/obj/structure/dropship_piece/two/front/right{
-	dir = 1
-	},
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"HR" = (
-/obj/structure/dropship_piece/two/engine/lefttop,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"HT" = (
-/obj/structure/dropship_piece/two/rearwing/rightrbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"HU" = (
-/obj/structure/dropship_piece/two/rearwing/leftbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"HY" = (
-/turf/open/shuttle/dropship/four,
-/area/shuttle/dropship/normandy)
-"IC" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/structure/closet/walllocker/hydrant/extinguisher{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"Km" = (
-/obj/item/radio/intercom/dropship/normandy,
-/turf/open/shuttle/dropship/six,
-/area/shuttle/dropship/normandy)
-"KP" = (
-/obj/structure/dropship_piece/two/weapon/leftright,
-/obj/effect/attach_point/electronics/dropship2,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"KQ" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/machinery/vending/nanomed{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"Mh" = (
-/obj/machinery/door/poddoor/shutters/transit{
-	dir = 1
-	},
-/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds2,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"Ne" = (
-/obj/structure/dropship_piece/two/weapon/rightright{
-	dir = 1
-	},
-/obj/effect/attach_point/weapon/dropship2,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"Ns" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/obj/structure/closet/walllocker/hydrant/extinguisher{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"NN" = (
-/turf/closed/shuttle/dropship2/interiorwindow{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"Od" = (
-/turf/closed/shuttle/dropship2/edge,
-/area/shuttle/dropship/normandy)
-"Pc" = (
-/turf/closed/shuttle/dropship2/cornersalt2{
-	dir = 1
-	},
-/area/shuttle/dropship/normandy)
-"Pz" = (
-/obj/structure/dropship_piece/two/rearwing/leftlbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"PH" = (
-/obj/machinery/computer/security/dropship/two,
-/turf/closed/shuttle/dropship2/panel,
-/area/shuttle/dropship/normandy)
-"PI" = (
-/turf/closed/shuttle/dropship2/enginetwo{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"Qp" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/vending/nanomed{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"QD" = (
-/obj/machinery/door/airlock/hatch/cockpit/two,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"QV" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 4
-	},
-/obj/machinery/vending/nanomed{
-	dir = 4
-	},
-/obj/machinery/camera/autoname/mainship/dropship_two{
-	dir = 4
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"QY" = (
-/turf/closed/shuttle/dropship2/cornersalt2,
-/area/shuttle/dropship/normandy)
-"RG" = (
-/turf/closed/shuttle/dropship2/glassfour,
-/area/shuttle/dropship/normandy)
-"RK" = (
-/turf/closed/shuttle/dropship2/engineone/alt{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"RP" = (
-/turf/closed/shuttle/dropship2/finright{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"Te" = (
-/obj/structure/dropship_piece/two/rearwing/rightbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"Tk" = (
-/turf/open/shuttle/dropship/eight,
-/area/shuttle/dropship/normandy)
-"Tw" = (
-/turf/closed/shuttle/dropship2/finleft{
-	dir = 8
-	},
-/area/shuttle/dropship/normandy)
-"Vg" = (
-/obj/structure/dropship_piece/two/front/left{
-	dir = 1
-	},
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"VB" = (
-/obj/structure/bed/chair/dropship/pilot{
-	dir = 1
-	},
-/obj/machinery/light,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"VE" = (
-/turf/closed/shuttle/dropship2/interiormisc,
-/area/shuttle/dropship/normandy)
-"Wd" = (
-/obj/machinery/door/poddoor/shutters/transit,
-/obj/machinery/door/airlock/dropship_hatch/right/two,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"WO" = (
-/obj/structure/bed/chair/dropship/pilot{
-	dir = 1
-	},
-/obj/machinery/camera/autoname/mainship/dropship_two,
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"WQ" = (
-/obj/machinery/holopad,
-/obj/item/radio/intercom/dropship/normandy,
-/turf/open/shuttle/dropship/five,
-/area/shuttle/dropship/normandy)
-"Xk" = (
-/obj/structure/dropship_piece/two/rearwing/leftllbottom,
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"XA" = (
-/turf/closed/shuttle/dropship2/window{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"XL" = (
-/obj/structure/bed/chair/dropship/passenger{
-	dir = 8
-	},
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-"XN" = (
-/turf/closed/shuttle/dropship2/interiorwindow,
-/area/shuttle/dropship/normandy)
-"Yi" = (
-/turf/closed/shuttle/dropship2/interiormisc{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"YR" = (
-/turf/open/shuttle/dropship/ten,
-/area/shuttle/dropship/normandy)
-"Zh" = (
-/turf/closed/shuttle/dropship2/finleft{
-	dir = 4
-	},
-/area/shuttle/dropship/normandy)
-"Zm" = (
-/obj/structure/dropship_piece/two/cockpit/left{
-	dir = 1
-	},
-/turf/template_noop,
-/area/shuttle/dropship/normandy)
-"ZE" = (
-/turf/open/shuttle/dropship/floor,
-/area/shuttle/dropship/normandy)
-
-(1,1,1) = {"
-cN
-cN
-cN
-cN
-cN
-AZ
-Tw
-lY
-cN
-cN
-cN
-cN
-cN
-cN
-HR
-ve
-nf
-EH
-nT
-cN
-cN
-"}
-(2,1,1) = {"
-cN
-cN
-cN
-tD
-QY
-Zh
-eZ
-pH
-ns
-ns
-kD
-Br
-kD
-fh
-hV
-fa
-gt
-uK
-vw
-cN
-Xk
-"}
-(3,1,1) = {"
-cN
-cN
-cN
-KP
-Od
-GC
-FA
-GC
-ZE
-ZE
-GC
-GC
-GC
-rJ
-kD
-kD
-EW
-aD
-fh
-cN
-Pz
-"}
-(4,1,1) = {"
-Vg
-Zm
-tE
-XN
-Od
-Km
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-HY
-GC
-QV
-IC
-rC
-GC
-VE
-lp
-HU
-"}
-(5,1,1) = {"
-hk
-fP
-PH
-VB
-Yi
-FO
-bq
-XL
-KQ
-Ns
-XL
-bq
-YR
-Cd
-Cd
-Cd
-Cd
-Cd
-Mh
-cN
-cN
-"}
-(6,1,1) = {"
-hk
-XA
-pm
-ZE
-QD
-FO
-yt
-oF
-cE
-cE
-kh
-Dw
-WQ
-pO
-Ag
-ZE
-ZE
-ZE
-fr
-cN
-cN
-"}
-(7,1,1) = {"
-hk
-ET
-jc
-WO
-EF
-FO
-rC
-GC
-Qp
-IC
-GC
-rC
-YR
-Cd
-Cd
-Cd
-Cd
-Cd
-fr
-cN
-cN
-"}
-(8,1,1) = {"
-Hf
-Bn
-RG
-NN
-Od
-sx
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Tk
-XL
-KQ
-Ns
-bq
-XL
-VE
-jY
-Te
-"}
-(9,1,1) = {"
-cN
-cN
-cN
-tn
-Od
-XL
-kZ
-XL
-ZE
-ZE
-XL
-XL
-XL
-uU
-ex
-ex
-cX
-bg
-ax
-cN
-HT
-"}
-(10,1,1) = {"
-cN
-cN
-cN
-Ne
-Pc
-RP
-bc
-zF
-Wd
-Wd
-ex
-wt
-ex
-ax
-HR
-my
-ur
-PI
-nT
-cN
-lq
-"}
-(11,1,1) = {"
-cN
-cN
-cN
-cN
-cN
-rL
-uL
-jo
-cN
-cN
-cN
-cN
-cN
-cN
-hV
-RK
-zl
-jG
-vw
-cN
-cN
-"}
diff --git a/code/__DEFINES/predators.dm b/code/__DEFINES/predators.dm
index ae7fb2b101c..1c3eb08bc9a 100644
--- a/code/__DEFINES/predators.dm
+++ b/code/__DEFINES/predators.dm
@@ -32,7 +32,7 @@
 #define JOB_PREDATOR "Predator"
 
 #define CATEGORY_YAUTJA "YAUTJA"
-#define HUNTERSHIPS_TEMPLATE_PATH "_maps/~RUTGMC/predship/huntership.dmm"
+#define HUNTERSHIPS_TEMPLATE_PATH "_maps/predator/huntership.dmm"
 
 #define DUMMY_PRED_SLOT_PREFERENCES "dummy_preference_preview_second"
 
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index c9bbbd4a855..8d34c7cf897 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -106,12 +106,12 @@
 
 // Shuttles start here:
 /datum/map_template/shuttle/dropship_one
-	prefix = "_maps/~RUTGMC/shuttles/"
+	prefix = "_maps/shuttles/"
 	shuttle_id = SHUTTLE_NORMANDY
 	name = "Normandy"
 
 /datum/map_template/shuttle/dropship_two
-	prefix = "_maps/~RUTGMC/shuttles/"
+	prefix = "_maps/shuttles/"
 	shuttle_id = SHUTTLE_ALAMO
 	name = "Alamo"