cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shuttles now dock on arrival and departure

Browse Source 
Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.

Conflicts:
	code/controllers/master_controller.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
This commit is contained in:
mwerezak
2014-06-08 20:04:31 -04:00
committed by ZomgPonies
parent a54ef207a1
commit cc287d00db
7 changed files with 284 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/master_controller.dm
View File

@@ -33,6 +33,8 @@ datum/controller/game_controller
var/last_thing_processed
var/list/shuttle_list //for debugging and VV
datum/controller/game_controller/New()
//There can be only one master_controller. Out with the old and in with the new.
if(master_controller != src)
@@ -70,6 +72,7 @@ datum/controller/game_controller/proc/setup()
garbage = new /datum/controller/garbage_collector()
if(!shuttles) setup_shuttles()
shuttle_list = shuttles
setup_objects()
setupgenetics()