cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01: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

Conflicts:
	code/modules/shuttles/shuttle.dm
	code/setup.dm
This commit is contained in:
mwerezak
2014-06-24 07:26:03 -04:00
committed by ZomgPonies
parent d6e768fbfd
commit eb86081165
12 changed files with 221 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/shuttle_controller.dm
+2 -1
View File
@@ -26,7 +26,8 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.area_offsite = locate(/area/shuttle/escape/centcom)
shuttle.area_station = locate(/area/shuttle/escape/station)
shuttle.area_transition = locate(/area/shuttle/escape/transit)
shuttle.travel_time = 300
shuttle.transit_direction = NORTH
shuttle.move_time = 300
//shuttle.docking_controller_tag = "supply_shuttle"
//shuttle.dock_target_station = "cargo_bay"
shuttles["Escape"] = shuttle