diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm
index 44a34fddec..86876abe28 100644
--- a/code/game/machinery/embedded_controller/docking_program.dm
+++ b/code/game/machinery/embedded_controller/docking_program.dm
@@ -117,7 +117,7 @@
 				if(docking_codes)
 					var/code = signal.data["code"]
 					if(code != docking_codes)
-						testing("Controller [id_tag] got request_dock but code:[code] != docking_codes:[docking_codes]")
+						log_debug("Controller [id_tag] got request_dock but code:[code] != docking_codes:[docking_codes]")
 						return
 
 				control_mode = MODE_SERVER
diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm
index a5876f55dd..cad706c800 100644
--- a/code/modules/shuttles/shuttle_ferry.dm
+++ b/code/modules/shuttles/shuttle_ferry.dm
@@ -48,3 +48,9 @@
 /datum/shuttle/autodock/ferry/process_arrived()
 	..()
 	next_location = get_location_waypoint(!location)
+
+// Ferry shuttles should generally always be able to dock.  So read the docking codes off of the target.
+/datum/shuttle/autodock/ferry/update_docking_target(var/obj/effect/shuttle_landmark/location)
+	..()
+	if(active_docking_controller && active_docking_controller.docking_codes)
+		set_docking_codes(active_docking_controller.docking_codes)
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index 53286ac949..8b4de51588 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -79,9 +79,3 @@
 /datum/shuttle/autodock/ferry/supply/proc/eta_minutes()
 	var/ticksleft = arrive_time - world.time
 	return round(ticksleft/600,1)
-
-// Read the docking codes off of the target to make sure we can always dock.
-/datum/shuttle/autodock/ferry/supply/update_docking_target(var/obj/effect/shuttle_landmark/location)
-	..()
-	if(active_docking_controller && active_docking_controller.docking_codes)
-		set_docking_codes(active_docking_controller.docking_codes)