cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds direction arg for area/move_contents_to()

Browse Source 
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
This commit is contained in:
mwerezak
2014-06-23 23:48:28 -04:00
parent ebacf05acf
commit d892099ea3
10 changed files with 219 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/shuttles/shuttle.dm
View File

@@ -22,7 +22,8 @@
move(origin, destination)
moving_status = SHUTTLE_IDLE
/datum/shuttle/proc/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time)
/datum/shuttle/proc/long_jump(var/area/departing, var/area/destination, var/area/interim, var/travel_time, var/direction)
//world << "shuttle/long_jump: departing=[departing], destination=[destination], interim=[interim], travel_time=[travel_time]"
if(moving_status != SHUTTLE_IDLE) return
//it would be cool to play a sound here
@@ -31,11 +32,11 @@
if (moving_status == SHUTTLE_IDLE)
return //someone cancelled the launch
move(departing, interim)
move(departing, interim, direction)
sleep(travel_time*10)
move(interim, destination)
move(interim, destination, direction)
moving_status = SHUTTLE_IDLE
@@ -65,7 +66,7 @@
return 0
//just moves the shuttle from A to B, if it can be moved
/datum/shuttle/proc/move(var/area/origin,var/area/destination)
/datum/shuttle/proc/move(var/area/origin, var/area/destination, var/direction=null)
//world << "move_shuttle() called for [shuttle_tag] leaving [origin] en route to [destination]."
@@ -99,7 +100,7 @@
for(var/mob/living/simple_animal/pest in destination)
pest.gib()
origin.move_contents_to(destination) //might need to use the "direction" argument here, I dunno.
origin.move_contents_to(destination, direction=direction)
for(var/mob/M in destination)
if(M.client)