diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 078d1e9a5a5..b4e791670eb 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -23,6 +23,10 @@ docking_controller_offsite = locate(docking_controller_tag_offsite) if(!istype(docking_controller_offsite)) world << "warning: shuttle with docking tag [docking_controller_offsite] could not find it's controller!" + if (!location) + docking_controller = docking_controller_station + else + docking_controller = docking_controller_offsite /datum/shuttle/ferry/multidock/move(var/area/origin,var/area/destination) ..(origin, destination)