Remove variable shadowing which may be harming attempts to go to depot
Fix bug where ships at sea would not go to a depot which was also a docking location for a dock.