Reworks shuttles to be more extensible

Kudos to Zuhayr for laying the groundwork for this.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/shuttles/shuttle.dm
This commit is contained in:
mwerezak
2014-06-08 18:26:09 -04:00
committed by ZomgPonies
parent e9171a9ae3
commit a54ef207a1
7 changed files with 182 additions and 193 deletions

View File

@@ -69,7 +69,7 @@ datum/controller/game_controller/proc/setup()
if(!garbage)
garbage = new /datum/controller/garbage_collector()
if(!shuttles) shuttles = new /datum/shuttle_controller()
if(!shuttles) setup_shuttles()
setup_objects()
setupgenetics()

View File

@@ -14,7 +14,7 @@ var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle
datum/shuttle_controller/emergency_shuttle
var/alert = 0 //0 = emergency, 1 = crew cycle
location = 0 //0 = somewhere far away (in spess), 1 = at SS13, 2 = returned from SS13
var/location = 0 //0 = somewhere far away (in spess), 1 = at SS13, 2 = returned from SS13
var/online = 0
var/direction = 1 //-1 = going back to central command, 1 = going to SS13, 2 = in transit to centcom (not recalled)