From b39093732bd77538b33f33dee7fec3c477e9e153 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 25 Jun 2014 00:07:35 -0400 Subject: [PATCH] Fix for long_jumps never leaving transition area The previous behaviour of move() called without arguments assumed a short_jump, which meant that the wrong origin area would be used. --- code/modules/shuttles/shuttle_ferry.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index 3d1c2f4ba8e..e37ba86e374 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -47,15 +47,11 @@ ..(departing, destination, interim, travel_time, direction) /datum/shuttle/ferry/move(var/area/origin,var/area/destination) - if(!destination) - destination = get_location_area(!location) - if(!origin) - origin = get_location_area(location) if (docking_controller && !docking_controller.undocked()) docking_controller.force_undock() - ..(origin, destination) + ..(origin, destination) if (destination == area_station) location = 0 if (destination == area_offsite) location = 1