diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm
index 75b2b6cb232..c12c7c17878 100644
--- a/_maps/shuttles/cargo_delta.dmm
+++ b/_maps/shuttles/cargo_delta.dmm
@@ -79,7 +79,8 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/docking_port/mobile/supply{
-	dir = 4
+	dir = 4;
+	port_direction = 8
 	},
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /turf/open/floor/plating,
diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm
index 948369f4908..e0dc7be8bef 100644
--- a/_maps/shuttles/cargo_kilo.dmm
+++ b/_maps/shuttles/cargo_kilo.dmm
@@ -91,7 +91,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
 /obj/docking_port/mobile/supply{
-	dir = 4
+	dir = 4;
+	port_direction = 8
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/supply)
diff --git a/_maps/shuttles/cargo_pubby.dmm b/_maps/shuttles/cargo_pubby.dmm
index c3d064bc59d..4ff003c70b3 100644
--- a/_maps/shuttles/cargo_pubby.dmm
+++ b/_maps/shuttles/cargo_pubby.dmm
@@ -140,7 +140,8 @@
 /area/shuttle/supply)
 "R" = (
 /obj/docking_port/mobile/supply{
-	dir = 4
+	dir = 4;
+	port_direction = 8
 	},
 /obj/machinery/door/airlock/shuttle{
 	name = "Supply Shuttle Airlock"
diff --git a/_maps/shuttles/ert_bounty.dmm b/_maps/shuttles/ert_bounty.dmm
index 03be12a36a7..b1fbf895fa5 100644
--- a/_maps/shuttles/ert_bounty.dmm
+++ b/_maps/shuttles/ert_bounty.dmm
@@ -18,7 +18,9 @@
 	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
 	name = "hunter shuttle";
 	rechargeTime = 1800;
-	shuttle_id = "huntership"
+	shuttle_id = "huntership";
+	port_direction = 4;
+	preferred_direction = 4
 	},
 /obj/structure/fans/tiny,
 /turf/open/floor/pod/dark,
@@ -205,7 +207,9 @@
 /area/shuttle/hunter)
 "H" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
-	dir = 8
+	dir = 8;
+	y_offset = 6;
+	x_offset = 3
 	},
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm
index 69a4d6fa18c..42366d373d8 100644
--- a/_maps/shuttles/ferry_base.dmm
+++ b/_maps/shuttles/ferry_base.dmm
@@ -48,7 +48,7 @@
 	dir = 8;
 	shuttle_id = "ferry";
 	name = "ferry shuttle";
-	port_direction = 2
+	preferred_direction = 4
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/transport)
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index b5bb7186693..5bb79a3e56e 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -142,7 +142,7 @@
 	dir = 8;
 	shuttle_id = "ferry";
 	name = "The Lighthouse";
-	port_direction = 2
+	preferred_direction = 4
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/transport)
diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm
index fc986bcda50..a4fd0c9e19b 100644
--- a/_maps/shuttles/ferry_meat.dmm
+++ b/_maps/shuttles/ferry_meat.dmm
@@ -105,7 +105,7 @@
 	dir = 8;
 	shuttle_id = "ferry";
 	name = "ferry shuttle";
-	port_direction = 2
+	preferred_direction = 4
 	},
 /turf/open/floor/iron/freezer,
 /area/shuttle/transport)
diff --git a/code/datums/shuttles/arrival.dm b/code/datums/shuttles/arrival.dm
index 376de809afa..645147ee5ba 100644
--- a/code/datums/shuttles/arrival.dm
+++ b/code/datums/shuttles/arrival.dm
@@ -26,10 +26,6 @@
 	suffix = "pubby"
 	name = "arrival shuttle (Pubby)"
 
-/datum/map_template/shuttle/arrival/omega
-	suffix = "omega"
-	name = "arrival shuttle (Omega)"
-
 /datum/map_template/shuttle/arrival/northstar
 	suffix = "northstar"
 	name = "arrival shuttle (North Star)"
diff --git a/code/datums/shuttles/cargo.dm b/code/datums/shuttles/cargo.dm
index a18b7a4ac9a..8f5d83619f4 100644
--- a/code/datums/shuttles/cargo.dm
+++ b/code/datums/shuttles/cargo.dm
@@ -11,10 +11,6 @@
 	suffix = "birdboat"
 	name = "supply shuttle (Birdboat)"
 
-/datum/map_template/shuttle/cargo/donut
-	suffix = "donut"
-	name = "supply shuttle (Donut)"
-
 /datum/map_template/shuttle/cargo/pubby
 	suffix = "pubby"
 	name = "supply shuttle (Pubby)"
diff --git a/code/datums/shuttles/ferry.dm b/code/datums/shuttles/ferry.dm
index e4f540992ff..a0d3eac82d9 100644
--- a/code/datums/shuttles/ferry.dm
+++ b/code/datums/shuttles/ferry.dm
@@ -33,8 +33,3 @@
 	suffix = "kilo"
 	name = "kilo transport ferry"
 	description = "Standard issue CentCom Ferry for Kilo pattern stations. Includes additional equipment and rechargers."
-
-/datum/map_template/shuttle/ferry/northstar
-	suffix = "northstar"
-	name = "north star transport ferry"
-	description = "In the very depths of the frontier, you'll need a rugged shuttle capable of delivering crew, this is that."