diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 98b77823d99..58e9c54b52a 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -18,7 +18,7 @@ var/global/datum/shuttle_controller/shuttle_controller process_shuttles = list() var/datum/shuttle/ferry/shuttle - + // Escape shuttle and pods shuttle = new/datum/shuttle/ferry/emergency() shuttle.location = 1 @@ -35,7 +35,7 @@ var/global/datum/shuttle_controller/shuttle_controller //shuttle.dock_target_station = "cargo_bay" shuttles["Escape"] = shuttle process_shuttles += shuttle - + shuttle = new/datum/shuttle/ferry/escape_pod() shuttle.location = 0 shuttle.warmup_time = 0 @@ -63,7 +63,7 @@ var/global/datum/shuttle_controller/shuttle_controller shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one process_shuttles += shuttle shuttles["Escape Pod 2"] = shuttle - + shuttle = new/datum/shuttle/ferry/escape_pod() shuttle.location = 0 shuttle.warmup_time = 0 @@ -77,9 +77,9 @@ var/global/datum/shuttle_controller/shuttle_controller shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one process_shuttles += shuttle shuttles["Escape Pod 3"] = shuttle - + //There is no pod 4, apparently. - + shuttle = new/datum/shuttle/ferry/escape_pod() shuttle.location = 0 shuttle.warmup_time = 0 @@ -93,7 +93,7 @@ var/global/datum/shuttle_controller/shuttle_controller shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one process_shuttles += shuttle shuttles["Escape Pod 5"] = shuttle - + //give the emergency shuttle controller it's shuttles emergency_shuttle.shuttle = shuttles["Escape"] emergency_shuttle.escape_pods = list( @@ -102,7 +102,7 @@ var/global/datum/shuttle_controller/shuttle_controller shuttles["Escape Pod 3"], shuttles["Escape Pod 5"], ) - + // Supply shuttle shuttle = new/datum/shuttle/ferry/supply() shuttle.location = 1 @@ -113,7 +113,7 @@ var/global/datum/shuttle_controller/shuttle_controller shuttle.dock_target_station = "cargo_bay" shuttles["Supply"] = shuttle process_shuttles += shuttle - + supply_controller.shuttle = shuttle // Admin shuttles. @@ -179,15 +179,15 @@ var/global/datum/shuttle_controller/shuttle_controller // ERT Shuttle var/datum/shuttle/ferry/multidock/specops/ERT = new() - ERT.location = 0 + ERT.location = 1 ERT.warmup_time = 10 - ERT.area_offsite = locate(/area/shuttle/specops/station) //centcom is the home station, the Exodus is offsite - ERT.area_station = locate(/area/shuttle/specops/centcom) + ERT.area_offsite = locate(/area/shuttle/specops/centcom) //centcom is the home station, the Exodus is offsite + ERT.area_station = locate(/area/shuttle/specops/station) ERT.docking_controller_tag = "specops_shuttle_port" ERT.docking_controller_tag_station = "specops_shuttle_port" ERT.docking_controller_tag_offsite = "specops_shuttle_fore" - ERT.dock_target_station = "specops_centcom_dock" - ERT.dock_target_offsite = "specops_dock_airlock" + ERT.dock_target_station = "specops_dock_airlock" + ERT.dock_target_offsite = "specops_centcom_dock" shuttles["Special Operations"] = ERT process_shuttles += ERT @@ -240,7 +240,7 @@ var/global/datum/shuttle_controller/shuttle_controller var/datum/shuttle/shuttle var/datum/shuttle/ferry/multidock/multidock var/list/dock_controller_map = list() //so we only have to iterate once through each list - + //multidock shuttles var/list/dock_controller_map_station = list() var/list/dock_controller_map_offsite = list() @@ -253,7 +253,7 @@ var/global/datum/shuttle_controller/shuttle_controller multidock = shuttle dock_controller_map_station[multidock.docking_controller_tag_station] = multidock dock_controller_map_offsite[multidock.docking_controller_tag_offsite] = multidock - + //escape pod arming controllers var/datum/shuttle/ferry/escape_pod/pod var/list/pod_controller_map = list() @@ -279,20 +279,20 @@ var/global/datum/shuttle_controller/shuttle_controller if (istype(multidock)) multidock.docking_controller_offsite = C.program dock_controller_map_offsite -= C.id_tag - + //escape pods if (C.id_tag in pod_controller_map) pod = pod_controller_map[C.id_tag] if (istype(C.program, /datum/computer/file/embedded_program/docking/simple/escape_pod/)) pod.arming_controller = C.program - + //sanity check if (dock_controller_map.len || dock_controller_map_station.len || dock_controller_map_offsite.len) var/dat = "" for (var/dock_tag in dock_controller_map + dock_controller_map_station + dock_controller_map_offsite) dat += "\"[dock_tag]\", " world << "/red /b warning: shuttles with docking tags [dat] could not find their controllers!" - + //makes all shuttles docked to something at round start go into the docked state for (var/shuttle_tag in shuttles) shuttle = shuttles[shuttle_tag]