shuttle_controller now uses a shuttle datum

baystation12.dme

@@ -1292,6 +1292,7 @@
 #include "code\modules\shuttles\departmental.dm"
 #include "code\modules\shuttles\shuttle.dm"
 #include "code\modules\shuttles\shuttle_console.dm"
+#include "code\modules\shuttles\shuttle_emergency.dm"
 #include "code\modules\shuttles\shuttle_specops.dm"
 #include "code\modules\shuttles\shuttle_supply.dm"
 #include "code\modules\shuttles\shuttles_multi.dm"

code/controllers/shuttle_controller.dm

@@ -5,429 +5,185 @@
 
 // these define the time taken for the shuttle to get to SS13
 // and the time before it leaves again
-#define SHUTTLEARRIVETIME 600		// 10 minutes = 600 seconds
+#define SHUTTLE_PREPTIME 				300	// 5 minutes = 300 seconds - after this time, the shuttle cannot be recalled
-#define SHUTTLELEAVETIME 180		// 3 minutes = 180 seconds
+#define SHUTTLE_LEAVETIME 				180	// 3 minutes = 180 seconds - the duration for which the shuttle will wait at the station
-#define SHUTTLETRANSITTIME 120		// 2 minutes = 120 seconds
+#define SHUTTLE_TRANSIT_DURATION		300	// 5 minutes = 300 seconds - how long it takes for the shuttle to get to the station
+#define SHUTTLE_TRANSIT_DURATION_RETURN 120	// 2 minutes = 120 seconds - for some reason it takes less time to come back, go figure.
 
 var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle
 
-datum/shuttle_controller/emergency_shuttle
+/datum/shuttle_controller/emergency_shuttle
-	var/alert = 0 //0 = emergency, 1 = crew cycle
+	var/datum/shuttle/ferry/shuttle
 	
-	var/location = 0 //0 = somewhere far away (in spess), 1 = at SS13, 2 = returned from SS13
+	var/launch_time			//the time at which the shuttle will be launched
-	var/online = 0
+	var/auto_recall = 0		//if set, the shuttle will be auto-recalled
-	var/direction = 1 //-1 = going back to central command, 1 = going to SS13, 2 = in transit to centcom (not recalled)
+	var/auto_recall_time	//the time at which the shuttle will be auto-recalled
+	var/evac = 0			//1 = emergency evacuation, 0 = crew transfer
+	var/wait_for_launch = 0	//if the shuttle is waiting to launch
 	
-	var/endtime			// timeofday that shuttle arrives
+	var/deny_shuttle = 0	//allows admins to prevent the shuttle from being called
-	var/timelimit //important when the shuttle gets called for more than shuttlearrivetime
+	var/departed = 0		//if the shuttle has left the station at least once
-		//timeleft = 360 //600
-	var/fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED"
 
-	var/always_fake_recall = 0
+/datum/shuttle_controller/emergency_shuttle/New()
-	var/deny_shuttle = 0 //for admins not allowing it to be called.
+	if ("Escape" in shuttles && istype(shuttles["Escape"], /datum/shuttle/ferry/emergency))
-	var/departed = 0
+		shuttle = shuttles["Escape"]
-	// call the shuttle
+	
-	// if not called before, set the endtime to T+600 seconds
+	//still don't have the shuttle, so create one
-	// otherwise if outgoing, switch to incoming
+	if (!shuttle)
-	proc/incall(coeff = 1)
+		shuttle = new/datum/shuttle/ferry/emergency()
-		if(deny_shuttle && alert == 1) //crew transfer shuttle does not gets recalled by gamemode
+		shuttle.location = 1
-			return
+		shuttle.warmup_time = 10
-		if(endtime)
+		shuttle.area_offsite = locate(/area/shuttle/escape/centcom)
-			if(direction == -1)
+		shuttle.area_station = locate(/area/shuttle/escape/station)
-				setdirection(1)
+		shuttle.area_transition = locate(/area/shuttle/escape/transit)
+		shuttle.travel_time = SHUTTLE_TRANSIT_DURATION
+		//shuttle.docking_controller_tag = "supply_shuttle"
+		//shuttle.dock_target_station = "cargo_bay"
+		shuttles["Escape"] = shuttle
+
+/datum/shuttle_controller/emergency_shuttle/proc/process()
+	if (wait_for_launch)
+		if (auto_recall && can_recall() && world.time >= auto_recall_time)
+			recall()
+		if (world.time >= launch_time)	//time to launch the shuttle
+			
+			//set the travel time
+			if (!shuttle.location)	//at station
+				shuttle.travel_time = SHUTTLE_TRANSIT_DURATION_RETURN
+				departed = 1	//technically we haven't left yet, but this should be good enough
+				//TODO launch pods
 			else
-			settimeleft(get_shuttle_arrive_time()*coeff)
+				shuttle.travel_time = SHUTTLE_TRANSIT_DURATION
-			online = 1
+			
-			if(always_fake_recall)
+			shuttle.launch(src)
-				fake_recall = rand(300,500)		//turning on the red lights in hallways
+
-		if(alert == 0)
+//called when the shuttle has arrived.
+/datum/shuttle_controller/emergency_shuttle/proc/shuttle_arrived()
+	if (!shuttle.location)	//at station
+		launch_time = world.time + SHUTTLE_LEAVETIME
+		wait_for_launch = 1		//get ready to return
+
+//returns the time left until the shuttle arrives at it's destination, in ticks
+/datum/shuttle_controller/emergency_shuttle/proc/estimate_arrival_time()
+	var/eta = launch_time + shuttle.travel_time
+	return (eta - world.time)
+
+//returns the time left until the shuttle launches, in ticks
+/datum/shuttle_controller/emergency_shuttle/proc/estimate_launch_time()
+	return (launch_time - world.time)
+
+/datum/shuttle_controller/emergency_shuttle/proc/has_eta()
+	return (wait_for_launch || shuttle.moving_status != SHUTTLE_IDLE)
+
+//returns 1 if the shuttle has gone to the station and come back at least once,
+//used for game completion checking purposes
+/datum/shuttle_controller/emergency_shuttle/proc/returned()
+	return 0	//TODO
+
+//returns 1 if the shuttle is not idle at centcom
+/datum/shuttle_controller/emergency_shuttle/proc/online()
+	if (!shuttle.location)	//not at centcom
+		return 1
+	if (wait_for_launch || shuttle.moving_status != SHUTTLE_IDLE)
+		return 1
+	return 0
+
+//returns 1 if the shuttle is currently in transit (or just leaving) to the station
+/datum/shuttle_controller/emergency_shuttle/proc/going_to_station()
+	return (!shuttle.direction && shuttle.moving_status != SHUTTLE_IDLE)
+
+//returns 1 if the shuttle is currently in transit (or just leaving) to centcom
+/datum/shuttle_controller/emergency_shuttle/proc/going_to_centcom()
+	return (shuttle.direction && shuttle.moving_status != SHUTTLE_IDLE)
+
+//returns 1 if the shuttle is docked at the station and waiting to leave
+/datum/shuttle_controller/emergency_shuttle/proc/waiting_to_leave()
+	if (shuttle.location)
+		return 0	//not at station
+	if (!wait_for_launch)
+		return 0	//not going anywhere
+	if (shuttle.moving_status != SHUTTLE_IDLE)
+		return 0	//shuttle is doing stuff
+	return 1
+
+//so we don't have emergency_shuttle.shuttle.location everywhere
+/datum/shuttle_controller/emergency_shuttle/proc/location()
+	if (!shuttle)
+		return 1 	//if we dont have a shuttle datum, just act like it's at centcom
+	return shuttle.location
+
+//calls the shuttle for an emergency evacuation
+/datum/shuttle_controller/emergency_shuttle/proc/call_evac()
+	if(!can_call()) return
+	
+	//set the launch timer
+	launch_time = world.time + get_shuttle_prep_time()
+	auto_recall_time = world.time + rand(300,500)
+	wait_for_launch = 1
+	
+	evac = 1
+	captain_announce("An emergency evacuation shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
+	world << sound('sound/AI/shuttlecalled.ogg')
 	for(var/area/A in world)
 		if(istype(A, /area/hallway))
 			A.readyalert()
 
-	proc/get_shuttle_arrive_time()
+//calls the shuttle for a routine crew transfer
-		// During mutiny rounds, the shuttle takes twice as long.
+/datum/shuttle_controller/emergency_shuttle/proc/call_transfer()
-		if(ticker && istype(ticker.mode,/datum/game_mode/mutiny))
+	if(!can_call()) return
-			return SHUTTLEARRIVETIME * 2
 
-		return SHUTTLEARRIVETIME
+	//set the launch timer
+	launch_time = world.time + get_shuttle_prep_time()
+	auto_recall_time = world.time + rand(100,SHUTTLE_PREPTIME-30)
+	wait_for_launch = 1
 	
-datum/shuttle_controller/emergency_shuttle/proc/shuttlealert(var/X)
+	captain_announce("A crew transfer has been initiated. The shuttle has been called. It will arrive in [round(estimate_arrival_time()/60)] minutes.")
-		alert = X
 
-datum/shuttle_controller/emergency_shuttle/proc/recall()
+//recalls the shuttle
-	if(direction == 1)
+/datum/shuttle_controller/emergency_shuttle/proc/recall()
-		var/timeleft = timeleft()
+	if (!can_recall()) return
-		if(alert == 0)
+
-			if(timeleft >= get_shuttle_arrive_time())
+	wait_for_launch = 0
-				return
+	shuttle.cancel_launch(src)
+
+	if (evac)
 		captain_announce("The emergency shuttle has been recalled.")
 		world << sound('sound/AI/shuttlerecalled.ogg')
-			setdirection(-1)
+		
-			online = 1
 		for(var/area/A in world)
 			if(istype(A, /area/hallway))
 				A.readyreset()
-			return
+		evac = 0
-		else //makes it possible to send shuttle back.
-			captain_announce("The shuttle has been recalled.")
-			setdirection(-1)
-			online = 1
-			alert = 0 // set alert back to 0 after an admin recall
-			return
-
-	// returns the time (in seconds) before shuttle arrival
-	// note if direction = -1, gives a count-up to SHUTTLEARRIVETIME
-datum/shuttle_controller/emergency_shuttle/proc/timeleft()
-	if(online)
-		var/timeleft = round((endtime - world.timeofday)/10 ,1)
-		if(direction == 1 || direction == 2)
-			return timeleft
 	else
-			return get_shuttle_arrive_time()-timeleft
+		captain_announce("The scheduled crew transfer has been cancelled.")
-	else
-		return get_shuttle_arrive_time()
 
-	// sets the time left to a given delay (in seconds)
+/datum/shuttle_controller/emergency_shuttle/proc/can_call()
-datum/shuttle_controller/emergency_shuttle/proc/settimeleft(var/delay)
+	if (deny_shuttle)
-	endtime = world.timeofday + delay * 10
+		return 0
-	timelimit = delay
+	if (shuttle.moving_status != SHUTTLE_IDLE || !shuttle.location)	//must be idle at centcom
-
+		return 0
-	// sets the shuttle direction
+	if (wait_for_launch)	//already launching
-	// 1 = towards SS13, -1 = back to centcom
-datum/shuttle_controller/emergency_shuttle/proc/setdirection(var/dirn)
-	if(direction == dirn)
-		return
-	direction = dirn
-	// if changing direction, flip the timeleft by SHUTTLEARRIVETIME
-	var/ticksleft = endtime - world.timeofday
-	endtime = world.timeofday + (get_shuttle_arrive_time()*10 - ticksleft)
-	return
-
-datum/shuttle_controller/emergency_shuttle/proc/process()
-
-datum/shuttle_controller/emergency_shuttle/process()
-	if(!online)
-		return
-	var/timeleft = timeleft()
-	if(timeleft > 1e5)		// midnight rollover protection
-		timeleft = 0
-	switch(location)
-		if(0)
-
-			/* --- Shuttle is in transit to Central Command from SS13 --- */
-			if(direction == 2)
-				if(timeleft>0)
 		return 0
-
-				/* --- Shuttle has arrived at Centrcal Command --- */
-				else
-					// turn off the star spawners
-					/*
-					for(var/obj/effect/starspawner/S in world)
-						S.spawning = 0
-					*/
-
-					location = 2
-
-					//main shuttle
-					var/area/start_location = locate(/area/shuttle/escape/transit)
-					var/area/end_location = locate(/area/shuttle/escape/centcom)
-
-					start_location.move_contents_to(end_location, null, NORTH)
-
-					for(var/obj/machinery/door/unpowered/shuttle/D in end_location)
-						spawn(0)
-							D.locked = 0
-							D.open()
-
-					for(var/mob/M in end_location)
-						if(M.client)
-							spawn(0)
-								if(M.buckled)
-									shake_camera(M, 4, 1) // buckled, not a lot of shaking
-								else
-									shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-						if(istype(M, /mob/living/carbon))
-							if(!M.buckled)
-								M.Weaken(5)
-
-							//pods
-					start_location = locate(/area/shuttle/escape_pod1/transit)
-					end_location = locate(/area/shuttle/escape_pod1/centcom)
-					start_location.move_contents_to(end_location, null, NORTH)
-
-					for(var/obj/machinery/door/D in machines)
-						if( get_area(D) == end_location )
-							spawn(0)
-								D.open()
-
-					for(var/mob/M in end_location)
-						if(M.client)
-							spawn(0)
-								if(M.buckled)
-									shake_camera(M, 4, 1) // buckled, not a lot of shaking
-								else
-									shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-						if(istype(M, /mob/living/carbon))
-							if(!M.buckled)
-								M.Weaken(5)
-
-					start_location = locate(/area/shuttle/escape_pod2/transit)
-					end_location = locate(/area/shuttle/escape_pod2/centcom)
-					start_location.move_contents_to(end_location, null, NORTH)
-
-					for(var/obj/machinery/door/D in machines)
-						if( get_area(D) == end_location )
-							spawn(0)
-								D.open()
-
-					for(var/mob/M in end_location)
-						if(M.client)
-							spawn(0)
-								if(M.buckled)
-									shake_camera(M, 4, 1) // buckled, not a lot of shaking
-								else
-									shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-						if(istype(M, /mob/living/carbon))
-							if(!M.buckled)
-								M.Weaken(5)
-
-					start_location = locate(/area/shuttle/escape_pod3/transit)
-					end_location = locate(/area/shuttle/escape_pod3/centcom)
-					start_location.move_contents_to(end_location, null, NORTH)
-
-					for(var/obj/machinery/door/D in machines)
-						if( get_area(D) == end_location )
-							spawn(0)
-								D.open()
-
-					for(var/mob/M in end_location)
-						if(M.client)
-							spawn(0)
-								if(M.buckled)
-									shake_camera(M, 4, 1) // buckled, not a lot of shaking
-								else
-									shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-						if(istype(M, /mob/living/carbon))
-							if(!M.buckled)
-								M.Weaken(5)
-
-					start_location = locate(/area/shuttle/escape_pod5/transit)
-					end_location = locate(/area/shuttle/escape_pod5/centcom)
-					start_location.move_contents_to(end_location, null, EAST)
-
-					for(var/obj/machinery/door/D in machines)
-						if( get_area(D) == end_location )
-							spawn(0)
-								D.open()
-
-					for(var/mob/M in end_location)
-						if(M.client)
-							spawn(0)
-								if(M.buckled)
-									shake_camera(M, 4, 1) // buckled, not a lot of shaking
-								else
-									shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-						if(istype(M, /mob/living/carbon))
-							if(!M.buckled)
-								M.Weaken(5)
-
-					online = 0
-
 	return 1
 
-					/* --- Shuttle has docked centcom after being recalled --- */
+//this only returns 0 if it would absolutely make no sense to recall
-			if(timeleft>timelimit)
+//e.g. the shuttle is already at the station or wasn't called to begin with
-				online = 0
+//other reasons for the shuttle not being recallable should be handled elsewhere
-				direction = 1
+/datum/shuttle_controller/emergency_shuttle/proc/can_recall()
-				endtime = null
+	if (shuttle.moving_status == SHUTTLE_INTRANSIT)	//if the shuttle is already in transit then it's too late
-
 		return 0
-
+	if (!shuttle.location)	//already at the station.
-			else if((fake_recall != 0) && (timeleft <= fake_recall))
+		return 0
-				recall()
+	if (!wait_for_launch)	//we weren't going anywhere, anyways...
-				fake_recall = 0
 		return 0
-
-					/* --- Shuttle has docked with the station - begin countdown to transit --- */
-			else if(timeleft <= 0)
-				location = 1
-				var/area/start_location = locate(/area/shuttle/escape/centcom)
-				var/area/end_location = locate(/area/shuttle/escape/station)
-
-				var/list/dstturfs = list()
-				var/throwy = world.maxy
-
-				for(var/turf/T in end_location)
-					dstturfs += T
-					if(T.y < throwy)
-						throwy = T.y
-
-				// hey you, get out of the way!
-				for(var/turf/T in dstturfs)
-					// find the turf to move things to
-					var/turf/D = locate(T.x, throwy - 1, 1)
-					//var/turf/E = get_step(D, SOUTH)
-					for(var/atom/movable/AM as mob|obj in T)
-						AM.Move(D)
-						// NOTE: Commenting this out to avoid recreating mass driver glitch
-						/*
-						spawn(0)
-							AM.throw_at(E, 1, 1)
-							return
-						*/
-
-					if(istype(T, /turf/simulated))
-						del(T)
-
-				for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
-					bug.gib()
-
-				for(var/mob/living/simple_animal/pest in end_location) // And for the other kind of bug...
-					pest.gib()
-
-				start_location.move_contents_to(end_location)
-				settimeleft(SHUTTLELEAVETIME)
-				//send2irc("Server", "The Emergency Shuttle has docked with the station.")
-				captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
-				world << sound('sound/AI/shuttledock.ogg')
-
 	return 1
 
-		if(1)
+/datum/shuttle_controller/emergency_shuttle/proc/get_shuttle_prep_time()
-
+	// During mutiny rounds, the shuttle takes twice as long.
-			// Just before it leaves, close the damn doors!
+	if(ticker && istype(ticker.mode,/datum/game_mode/mutiny))
-			if(timeleft == 2 || timeleft == 1)
+		return SHUTTLE_PREPTIME * 3		//15 minutes
-				var/area/start_location = locate(/area/shuttle/escape/station)
-				for(var/obj/machinery/door/unpowered/shuttle/D in start_location)
-					spawn(0)
-						D.close()
-						D.locked = 1
-
-			if(timeleft>0)
-				return 0
-
-			/* --- Shuttle leaves the station, enters transit --- */
-			else
-
-				// Turn on the star effects
-
-				/* // kinda buggy atm, i'll fix this later
-				for(var/obj/effect/starspawner/S in world)
-					if(!S.spawning)
-						spawn() S.startspawn()
-				*/
-
-				departed = 1 // It's going!
-				location = 0 // in deep space
-				direction = 2 // heading to centcom
-
-				//main shuttle
-				var/area/start_location = locate(/area/shuttle/escape/station)
-				var/area/end_location = locate(/area/shuttle/escape/transit)
-
-				settimeleft(SHUTTLETRANSITTIME)
-				start_location.move_contents_to(end_location, null, NORTH)
-
-				// Close shuttle doors, lock
-				for(var/obj/machinery/door/unpowered/shuttle/D in end_location)
-					spawn(0)
-						D.close()
-						D.locked = 1
-
-							// Some aesthetic turbulance shaking
-				for(var/mob/M in end_location)
-					if(M.client)
-						spawn(0)
-							if(M.buckled)
-								shake_camera(M, 4, 1) // buckled, not a lot of shaking
-							else
-								shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-					if(istype(M, /mob/living/carbon))
-						if(!M.buckled)
-							M.Weaken(5)
-
-				//pods
-				start_location = locate(/area/shuttle/escape_pod1/station)
-				end_location = locate(/area/shuttle/escape_pod1/transit)
-				start_location.move_contents_to(end_location, null, NORTH)
-				for(var/obj/machinery/door/D in end_location)
-					spawn(0)
-						D.close()
-
-				for(var/mob/M in end_location)
-					if(M.client)
-						spawn(0)
-							if(M.buckled)
-								shake_camera(M, 4, 1) // buckled, not a lot of shaking
-							else
-								shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-					if(istype(M, /mob/living/carbon))
-						if(!M.buckled)
-							M.Weaken(5)
-
-				start_location = locate(/area/shuttle/escape_pod2/station)
-				end_location = locate(/area/shuttle/escape_pod2/transit)
-				start_location.move_contents_to(end_location, null, NORTH)
-				for(var/obj/machinery/door/D in end_location)
-					spawn(0)
-						D.close()
-
-				for(var/mob/M in end_location)
-					if(M.client)
-						spawn(0)
-							if(M.buckled)
-								shake_camera(M, 4, 1) // buckled, not a lot of shaking
-							else
-								shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-					if(istype(M, /mob/living/carbon))
-						if(!M.buckled)
-							M.Weaken(5)
-
-				start_location = locate(/area/shuttle/escape_pod3/station)
-				end_location = locate(/area/shuttle/escape_pod3/transit)
-				start_location.move_contents_to(end_location, null, NORTH)
-				for(var/obj/machinery/door/D in end_location)
-					spawn(0)
-						D.close()
-
-				for(var/mob/M in end_location)
-					if(M.client)
-						spawn(0)
-							if(M.buckled)
-								shake_camera(M, 4, 1) // buckled, not a lot of shaking
-							else
-								shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-					if(istype(M, /mob/living/carbon))
-						if(!M.buckled)
-							M.Weaken(5)
-
-				start_location = locate(/area/shuttle/escape_pod5/station)
-				end_location = locate(/area/shuttle/escape_pod5/transit)
-				start_location.move_contents_to(end_location, null, EAST)
-				for(var/obj/machinery/door/D in end_location)
-					spawn(0)
-						D.close()
-
-				for(var/mob/M in end_location)
-					if(M.client)
-						spawn(0)
-							if(M.buckled)
-								shake_camera(M, 4, 1) // buckled, not a lot of shaking
-							else
-								shake_camera(M, 10, 2) // unbuckled, HOLY SHIT SHAKE THE ROOM
-					if(istype(M, /mob/living/carbon))
-						if(!M.buckled)
-							M.Weaken(5)
-
-				captain_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.")
-
-				return 1
-
-		else
-			return 1
 
+	return SHUTTLE_PREPTIME
 
 /*
 	Some slapped-together star effects for maximum spess immershuns. Basically consists of a

code/game/gamemodes/game_mode.dm

@@ -125,7 +125,7 @@ Implants;
 
 
 /datum/game_mode/proc/check_finished() //to be called by ticker
-	if(emergency_shuttle.location==2 || station_was_nuked)
+	if(emergency_shuttle.returned() || station_was_nuked)
 		return 1
 	return 0
 

code/game/gamemodes/gameticker.dm

@@ -315,10 +315,10 @@ var/global/datum/controller/gameticker/ticker
 		var/game_finished = 0
 		var/mode_finished = 0
 		if (config.continous_rounds)
-			game_finished = (emergency_shuttle.location == 2 || mode.station_was_nuked)
+			game_finished = (emergency_shuttle.returned() || mode.station_was_nuked)
 			mode_finished = (!post_game && mode.check_finished())
 		else
-			game_finished = (mode.check_finished() || (emergency_shuttle.location == 2 && emergency_shuttle.alert == 1))
+			game_finished = (mode.check_finished() || (emergency_shuttle.returned() && emergency_shuttle.evac == 1))
 			mode_finished = game_finished
 
 		if(!mode.explosion_in_progress && game_finished && (mode_finished || post_game))

code/game/gamemodes/malfunction/malfunction.dm

@@ -67,7 +67,7 @@
 				AI_mind.current.icon_state = "ai-malf2"
 */
 	if(emergency_shuttle)
-		emergency_shuttle.always_fake_recall = 1
+		emergency_shuttle.auto_recall = 1
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	..()
@@ -136,7 +136,7 @@
 	if (is_malf_ai_dead())
 		if(config.continous_rounds)
 			if(emergency_shuttle)
-				emergency_shuttle.always_fake_recall = 0
+				emergency_shuttle.auto_recall = 0
 			malf_mode_declared = 0
 		else
 			return 1
@@ -206,7 +206,7 @@
 
 /datum/game_mode/malfunction/declare_completion()
 	var/malf_dead = is_malf_ai_dead()
-	var/crew_evacuated = (emergency_shuttle.location==2)
+	var/crew_evacuated = (emergency_shuttle.returned())
 
 	if      ( station_captured &&                station_was_nuked)
 		feedback_set_details("round_end_result","win - AI win - nuke")

code/game/gamemodes/newobjective.dm

@@ -267,7 +267,7 @@ datum
 				explanation_text = "Frame [target.current.real_name], the [target.assigned_role] for a crime and make sure they are arrested and brought back to the Centcom station alive.  We'll handle the rest from there."
 
 			check_completion()
-				if(emergency_shuttle.location<2)
+				if(!emergency_shuttle.returned())
 					return 0
 				if(target.current.stat == 2)
 					return 0
@@ -313,7 +313,7 @@ datum
 				explanation_text = "[target.current.real_name], the [target.assigned_role] is a [pick("relative of a","friend of a","") + pick("high ranking","important","well-liked")] Syndicate [pick("Leader","Officer","Agent","sympathiser")].  Make sure they get off the station safely, while minimizing intervention."
 
 			check_completion()
-				if(emergency_shuttle.location<2)
+				if(!emergency_shuttle.returned())
 					return 0
 
 				if(target.current.stat == 2)
@@ -477,7 +477,7 @@ datum
 			explanation_text = "Hijack the emergency shuttle by escaping alone."
 
 			check_completion()
-				if(emergency_shuttle.location<2)
+				if(!emergency_shuttle.returned())
 					return 0
 
 				if(!owner.current || owner.current.stat == 2)
@@ -512,7 +512,7 @@ datum
 			explanation_text = "Escape on the shuttle alive, without being arrested."
 
 			check_completion()
-				if(emergency_shuttle.location<2)
+				if(!emergency_shuttle.returned())
 					return 0
 
 				if(!owner.current || owner.current.stat ==2)
@@ -1224,7 +1224,7 @@ datum
 			check_completion()
 				if(!istype(owner.current, /mob/living/silicon))
 					return 0
-				if(emergency_shuttle.location<2)
+				if(!emergency_shuttle.returned())
 					return 0
 				if(!owner.current)
 					return 0
@@ -1447,7 +1447,7 @@ datum/objective/silence
 	explanation_text = "Do not allow anyone to escape the station.  Only allow the shuttle to be called when everyone is dead and your story is the only one left."
 
 	check_completion()
-		if(emergency_shuttle.location<2)
+		if(!emergency_shuttle.returned())
 			return 0
 
 		var/area/shuttle = locate(/area/shuttle/escape/centcom)

code/game/gamemodes/nuclear/nuclear.dm

@@ -277,7 +277,7 @@
 		if(!is_type_in_list(disk_area, centcom_areas))
 			disk_rescued = 0
 			break
-	var/crew_evacuated = (emergency_shuttle.location==2)
+	var/crew_evacuated = (emergency_shuttle.returned())
 	//var/operatives_are_dead = is_operatives_are_dead()
 
 

code/game/gamemodes/objective.dm

@@ -285,7 +285,7 @@ datum/objective/hijack
 	check_completion()
 		if(!owner.current || owner.current.stat)
 			return 0
-		if(emergency_shuttle.location<2)
+		if(!emergency_shuttle.returned())
 			return 0
 		if(issilicon(owner.current))
 			return 0
@@ -307,7 +307,7 @@ datum/objective/block
 	check_completion()
 		if(!istype(owner.current, /mob/living/silicon))
 			return 0
-		if(emergency_shuttle.location<2)
+		if(!emergency_shuttle.returned())
 			return 0
 		if(!owner.current)
 			return 0
@@ -325,7 +325,7 @@ datum/objective/silence
 	explanation_text = "Do not allow anyone to escape the station.  Only allow the shuttle to be called when everyone is dead and your story is the only one left."
 
 	check_completion()
-		if(emergency_shuttle.location<2)
+		if(!emergency_shuttle.returned())
 			return 0
 
 		for(var/mob/living/player in player_list)
@@ -350,7 +350,7 @@ datum/objective/escape
 			return 0
 		if(isbrain(owner.current))
 			return 0
-		if(emergency_shuttle.location<2)
+		if(!emergency_shuttle.returned())
 			return 0
 		if(!owner.current || owner.current.stat ==2)
 			return 0
@@ -709,7 +709,7 @@ datum/objective/absorb
 			explanation_text = "Our knowledge must live on. Make sure at least 5 acolytes escape on the shuttle to spread their work on an another station."
 
 			check_completion()
-				if(emergency_shuttle.location<2)
+				if(!emergency_shuttle.returned())
 					return 0
 
 				var/cultists_escaped = 0

code/game/gamemodes/revolution/revolution.dm

@@ -91,7 +91,7 @@
 		greet_revolutionary(rev_mind)
 	modePlayer += head_revolutionaries
 	if(emergency_shuttle)
-		emergency_shuttle.always_fake_recall = 1
+		emergency_shuttle.auto_recall = 1
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	..()
@@ -175,7 +175,7 @@
 	if(config.continous_rounds)
 		if(finished != 0)
 			if(emergency_shuttle)
-				emergency_shuttle.always_fake_recall = 0
+				emergency_shuttle.auto_recall = 0
 		return ..()
 	if(finished != 0)
 		return 1

code/game/gamemodes/sandbox/sandbox.dm

@@ -18,4 +18,4 @@
 /datum/game_mode/sandbox/post_setup()
 	..()
 	if(emergency_shuttle)
-		emergency_shuttle.always_fake_recall = 1
+		emergency_shuttle.auto_recall = 1

code/game/machinery/computer/communications.dm

@@ -119,7 +119,7 @@
 		if("callshuttle2")
 			if(src.authenticated)
 				call_shuttle_proc(usr)
-				if(emergency_shuttle.online)
+				if(emergency_shuttle.online())
 					post_status("shuttle")
 			src.state = STATE_DEFAULT
 		if("cancelshuttle")
@@ -284,8 +284,8 @@
 
 	user.set_machine(src)
 	var/dat = "<head><title>Communications Console</title></head><body>"
-	if (emergency_shuttle.online && emergency_shuttle.location==0)
+	if (emergency_shuttle.has_eta())
-		var/timeleft = emergency_shuttle.timeleft()
+		var/timeleft = emergency_shuttle.estimate_arrival_time()
 		dat += "<B>Emergency shuttle</B>\n<BR>\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]<BR>"
 
 	if (istype(user, /mob/living/silicon))
@@ -309,8 +309,8 @@
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"
 
 				dat += "<BR>\[ <A HREF='?src=\ref[src];operation=changeseclevel'>Change alert level</A> \]"
-				if(emergency_shuttle.location==0)
+				if(!emergency_shuttle.location())
-					if (emergency_shuttle.online)
+					if (emergency_shuttle.online())
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=cancelshuttle'>Cancel Shuttle Call</A> \]"
 					else
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=callshuttle'>Call Emergency Shuttle</A> \]"
@@ -377,7 +377,7 @@
 	var/dat = ""
 	switch(src.aistate)
 		if(STATE_DEFAULT)
-			if(emergency_shuttle.location==0 && !emergency_shuttle.online)
+			if(!emergency_shuttle.location() && !emergency_shuttle.online())
 				dat += "<BR>\[ <A HREF='?src=\ref[src];operation=ai-callshuttle'>Call Emergency Shuttle</A> \]"
 			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=ai-messagelist'>Message List</A> \]"
 			dat += "<BR>\[ <A HREF='?src=\ref[src];operation=ai-status'>Set Status Display</A> \]"
@@ -424,22 +424,26 @@
 		PS.allowedtocall = !(PS.allowedtocall)
 
 /proc/call_shuttle_proc(var/mob/user)
-	if ((!( ticker ) || emergency_shuttle.location))
+	if ((!( ticker ) || !emergency_shuttle.location()))
 		return
 
 	if(sent_strike_team == 1)
 		user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated."
 		return
 
-	if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE
+	if(emergency_shuttle.deny_shuttle)
-		user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minutes before trying again."
+		user << "The emergency shuttle may not be sent at this time. Please try again later."
 		return
 
-	if(emergency_shuttle.direction == -1)
+	if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE
+		user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/60)] minutes before trying again."
+		return
+
+	if(emergency_shuttle.going_to_centcom())
 		user << "The emergency shuttle may not be called while returning to CentCom."
 		return
 
-	if(emergency_shuttle.online)
+	if(emergency_shuttle.online())
 		user << "The emergency shuttle is already on its way."
 		return
 
@@ -447,23 +451,22 @@
 		user << "Under directive 7-10, [station_name()] is quarantined until further notice."
 		return
 
-	emergency_shuttle.incall()
+	emergency_shuttle.call_evac()
 	log_game("[key_name(user)] has called the shuttle.")
 	message_admins("[key_name_admin(user)] has called the shuttle.", 1)
-	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+
-	world << sound('sound/AI/shuttlecalled.ogg')
 
 	return
 
 /proc/init_shift_change(var/mob/user, var/force = 0)
-	if ((!( ticker ) || emergency_shuttle.location))
+	if ((!( ticker ) || !emergency_shuttle.location()))
 		return
 
-	if(emergency_shuttle.direction == -1)
+	if(emergency_shuttle.going_to_centcom())
 		user << "The shuttle may not be called while returning to CentCom."
 		return
 
-	if(emergency_shuttle.online)
+	if(emergency_shuttle.online())
 		user << "The shuttle is already on its way."
 		return
 
@@ -478,32 +481,30 @@
 			return
 
 		if(world.time < 54000) // 30 minute grace period to let the game get going
-			user << "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again."//may need to change "/600"
+			user << "The shuttle is refueling. Please wait another [round((54000-world.time)/60)] minutes before trying again."
 			return
 
 		if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "sandbox")
 			//New version pretends to call the shuttle but cause the shuttle to return after a random duration.
-			emergency_shuttle.fake_recall = rand(300,500)
+			emergency_shuttle.auto_recall = 1
 
 		if(ticker.mode.name == "blob" || ticker.mode.name == "epidemic")
 			user << "Under directive 7-10, [station_name()] is quarantined until further notice."
 			return
 
-	emergency_shuttle.shuttlealert(1)
+	emergency_shuttle.call_transfer()
-	emergency_shuttle.incall()
 	log_game("[key_name(user)] has called the shuttle.")
 	message_admins("[key_name_admin(user)] has called the shuttle.", 1)
-	captain_announce("A crew transfer has been initiated. The shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
 
 	return
 
 /proc/cancel_call_proc(var/mob/user)
-	if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0 || emergency_shuttle.timeleft() < 300))
+	if (!( ticker ) || !emergency_shuttle.can_recall())
 		return
 	if((ticker.mode.name == "blob")||(ticker.mode.name == "meteor"))
 		return
 
-	if(emergency_shuttle.direction != -1 && emergency_shuttle.online) //check that shuttle isn't already heading to centcomm
+	if(!emergency_shuttle.going_to_centcom()) //check that shuttle isn't already heading to centcomm
 		emergency_shuttle.recall()
 		log_game("[key_name(user)] has recalled the shuttle.")
 		message_admins("[key_name_admin(user)] has recalled the shuttle.", 1)
@@ -549,11 +550,9 @@
 	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || sent_strike_team)
 		return ..()
 
-	emergency_shuttle.incall(2)
+	emergency_shuttle.call_evac()
 	log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 	message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
-	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
-	world << sound('sound/AI/shuttlecalled.ogg')
 
 	..()
 
@@ -574,10 +573,8 @@
 	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || sent_strike_team)
 		return ..()
 
-	emergency_shuttle.incall(2)
+	emergency_shuttle.call_evac()
 	log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 	message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
-	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
-	world << sound('sound/AI/shuttlecalled.ogg')
 
 	..()

code/game/machinery/computer/shuttle.dm

@@ -8,7 +8,7 @@
 
 	attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob)
 		if(stat & (BROKEN|NOPOWER))	return
-		if ((!( istype(W, /obj/item/weapon/card) ) || !( ticker ) || emergency_shuttle.location != 1 || !( user )))	return
+		if ((!( istype(W, /obj/item/weapon/card) ) || !( ticker ) || emergency_shuttle.location() || !( user )))	return
 		if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
 			if (istype(W, /obj/item/device/pda))
 				var/obj/item/device/pda/pda = W
@@ -27,7 +27,7 @@
 				return 0
 
 			var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort")
-			if(emergency_shuttle.location != 1 && user.get_active_hand() != W)
+			if(emergency_shuttle.location() && user.get_active_hand() != W)
 				return 0
 			switch(choice)
 				if("Authorize")
@@ -41,8 +41,7 @@
 						message_admins("[key_name_admin(user)] has launched the shuttle")
 						log_game("[user.ckey] has launched the shuttle early")
 						world << "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>"
-						emergency_shuttle.online = 1
+						emergency_shuttle.launch_time = min(world.time + 100, emergency_shuttle.launch_time)
-						emergency_shuttle.settimeleft(10)
 						//src.authorized = null
 						del(src.authorized)
 						src.authorized = list(  )
@@ -59,11 +58,11 @@
 		else if (istype(W, /obj/item/weapon/card/emag) && !emagged)
 			var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel")
 
-			if(!emagged && emergency_shuttle.location == 1 && user.get_active_hand() == W)
+			if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W)
 				switch(choice)
 					if("Launch")
 						world << "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>"
-						emergency_shuttle.settimeleft( 10 )
+						emergency_shuttle.launch_time = min(world.time + 100, emergency_shuttle.launch_time)
 						emagged = 1
 					if("Cancel")
 						return

code/game/machinery/status_display.dm

@@ -74,13 +74,15 @@
 			if(0)				//blank
 				remove_display()
 			if(1)				//emergency shuttle timer
-				if(emergency_shuttle.online)
+				if(emergency_shuttle.waiting_to_leave())
-					var/line1
+					var/line1 = "-ETD-"
-					var/line2 = get_shuttle_timer()
+					var/line2 = get_shuttle_timer_departure()
-					if(emergency_shuttle.location == 1)
+					if(length(line2) > CHARS_PER_LINE)
-						line1 = "-ETD-"
+						line2 = "Error!"
-					else
+					update_display(line1, line2)
-						line1 = "-ETA-"
+				else if(emergency_shuttle.has_eta())
+					var/line1 = "-ETA-"
+					var/line2 = get_shuttle_timer_arrival()
 					if(length(line2) > CHARS_PER_LINE)
 						line2 = "Error!"
 					update_display(line1, line2)
@@ -164,8 +166,14 @@
 		if(maptext != new_text)
 			maptext = new_text
 
-	proc/get_shuttle_timer()
+	proc/get_shuttle_timer_arrival()
-		var/timeleft = emergency_shuttle.timeleft()
+		var/timeleft = emergency_shuttle.estimate_arrival_time()
+		if(timeleft)
+			return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
+		return ""
+
+	proc/get_shuttle_timer_departure()
+		var/timeleft = emergency_shuttle.estimate_launch_time()
 		if(timeleft)
 			return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
 		return ""

code/modules/admin/player_panel.dm

@@ -397,15 +397,15 @@
 		dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
 		dat += "Round Duration: <B>[round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10]</B><BR>"
 		dat += "<B>Emergency shuttle</B><BR>"
-		if (!emergency_shuttle.online)
+		if (!emergency_shuttle.online())
 			dat += "<a href='?src=\ref[src];call_shuttle=1'>Call Shuttle</a><br>"
 		else
-			var/timeleft = emergency_shuttle.timeleft()
+			var/timeleft = emergency_shuttle.estimate_launch_time()
-			switch(emergency_shuttle.location)
+			switch(emergency_shuttle.location())
-				if(0)
+				if(1)
 					dat += "ETA: <a href='?src=\ref[src];edit_shuttle_time=1'>[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]</a><BR>"
 					dat += "<a href='?src=\ref[src];call_shuttle=2'>Send Back</a><br>"
-				if(1)
+				if(0)
 					dat += "ETA: <a href='?src=\ref[src];edit_shuttle_time=1'>[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]</a><BR>"
 		dat += "<a href='?src=\ref[src];delay_round_end=1'>[ticker.delay_end ? "End Round Normally" : "Delay Round End"]</a><br>"
 		if(ticker.mode.syndicates.len)

code/modules/admin/topic.dm

@@ -214,23 +214,22 @@
 
 		switch(href_list["call_shuttle"])
 			if("1")
-				if ((!( ticker ) || emergency_shuttle.location))
+				if ((!( ticker ) || !emergency_shuttle.location()))
 					return
-				emergency_shuttle.incall()
+				if (emergency_shuttle.can_call())
-				captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+					emergency_shuttle.call_evac()
 					log_admin("[key_name(usr)] called the Emergency Shuttle")
 					message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
 
 			if("2")
-				if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0))
+				if (!( ticker ) || !emergency_shuttle.location())
 					return
-				switch(emergency_shuttle.direction)
+				if (emergency_shuttle.can_call())
-					if(-1)
+					emergency_shuttle.call_evac()
-						emergency_shuttle.incall()
-						captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
 					log_admin("[key_name(usr)] called the Emergency Shuttle")
 					message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
-					if(1)
+				
+				else if (emergency_shuttle.can_recall())
 					emergency_shuttle.recall()
 					log_admin("[key_name(usr)] sent the Emergency Shuttle back")
 					message_admins("\blue [key_name_admin(usr)] sent the Emergency Shuttle back", 1)
@@ -240,10 +239,12 @@
 	else if(href_list["edit_shuttle_time"])
 		if(!check_rights(R_SERVER))	return
 
-		emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num )
+		var/new_time_left = input("Enter new shuttle launch duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.estimate_launch_time() ) as num
-		log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]")
+
-		captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+		emergency_shuttle.launch_time = world.time + new_time_left*10
-		message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1)
+
+		log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [new_time_left]")
+		message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [new_time_left*10]", 1)
 		href_list["secretsadmin"] = "check_antagonist"
 
 	else if(href_list["delay_round_end"])

code/modules/admin/verbs/randomverbs.dm

@@ -883,7 +883,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Admin"
 	set name = "Call Shuttle"
 
-	if ((!( ticker ) || emergency_shuttle.location))
+	if ((!( ticker ) || emergency_shuttle.location()))
 		return
 
 	if(!check_rights(R_ADMIN))	return
@@ -891,16 +891,21 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
 
+	var/choice
 	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "confliction")
-		var/choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel")
+		choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel")
 		if(choice == "Confirm")
-			emergency_shuttle.fake_recall = rand(300,500)
+			emergency_shuttle.auto_recall = 1	//enable auto-recall
 		else
 			return
 
-	emergency_shuttle.incall()
+	choice = input("Is this an emergency evacuation or a crew transfer?") in list("Emergency", "Crew Transfer")
-	captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+	if (choice == "Emergency")
-	world << sound('sound/AI/shuttlecalled.ogg')
+		emergency_shuttle.call_evac()
+	else
+		emergency_shuttle.call_transfer()
+
+
 	feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-called the emergency shuttle.")
 	message_admins("\blue [key_name_admin(usr)] admin-called the emergency shuttle.", 1)
@@ -914,7 +919,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return
 
-	if(!ticker || emergency_shuttle.location || emergency_shuttle.direction == 0)
+	if(!ticker || !emergency_shuttle.can_recall())
 		return
 
 	emergency_shuttle.recall()

code/modules/admin/verbs/striketeam.dm

@@ -30,7 +30,7 @@ var/global/sent_strike_team = 0
 
 	sent_strike_team = 1
 
-	if (emergency_shuttle.direction == 1 && emergency_shuttle.online == 1)
+	if (emergency_shuttle.can_recall())
 		emergency_shuttle.recall()
 
 	var/commando_number = commandos_possible //for selecting a leader

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -35,8 +35,8 @@ var/global/sent_syndicate_strike_team = 0
 
 	sent_syndicate_strike_team = 1
 
-	if (emergency_shuttle.direction == 1 && emergency_shuttle.online == 1)
+	//if (emergency_shuttle.can_recall())
-		emergency_shuttle.recall()
+	//	emergency_shuttle.recall()	//why, exactly? Admins can do this themselves.
 
 	var/syndicate_commando_number = syndicate_commandos_possible //for selecting a leader
 	var/syndicate_leader_selected = 0 //when the leader is chosen. The last person spawned.

code/modules/mob/dead/observer/observer.dm

@@ -216,8 +216,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 					if(ticker.mode:malf_mode_declared)
 						stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
 		if(emergency_shuttle)
-			if(emergency_shuttle.online && emergency_shuttle.location < 2)
+			if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
-				var/timeleft = emergency_shuttle.timeleft()
+				var/timeleft = emergency_shuttle.estimate_arrival_time()
 				if (timeleft)
 					stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 

code/modules/mob/living/carbon/alien/alien.dm

@@ -159,8 +159,8 @@
 		stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")
 
 	if(emergency_shuttle)
-		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+		if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
-			var/timeleft = emergency_shuttle.timeleft()
+			var/timeleft = emergency_shuttle.estimate_arrival_time()
 			if (timeleft)
 				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 

code/modules/mob/living/carbon/human/human.dm

@@ -171,8 +171,8 @@
 		if(ticker.mode:malf_mode_declared)
 			stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
 	if(emergency_shuttle)
-		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+		if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
-			var/timeleft = emergency_shuttle.timeleft()
+			var/timeleft = emergency_shuttle.estimate_arrival_time()
 			if (timeleft)
 				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 

code/modules/mob/living/silicon/ai/ai.dm

@@ -291,7 +291,7 @@ var/list/ai_list = list()
 		call_shuttle_proc(src)
 
 	// hack to display shuttle timer
-	if(emergency_shuttle.online)
+	if(emergency_shuttle.online())
 		var/obj/machinery/computer/communications/C = locate() in machines
 		if(C)
 			C.post_status("shuttle")

code/modules/mob/living/silicon/ai/death.dm

@@ -39,11 +39,9 @@
 		callshuttle = 0
 
 	if(callshuttle == 3) //if all three conditions are met
-		emergency_shuttle.incall(2)
+		emergency_shuttle.call_evac()
 		log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
 		message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
-		captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
-		world << sound('sound/AI/shuttlecalled.ogg')
 
 	if(explosive)
 		spawn(10)

code/modules/mob/living/silicon/silicon.dm

@@ -97,8 +97,9 @@
 
 // this function displays the shuttles ETA in the status panel if the shuttle has been called
 /mob/living/silicon/proc/show_emergency_shuttle_eta()
-	if(emergency_shuttle.online && emergency_shuttle.location < 2)
+	if(emergency_shuttle)
-		var/timeleft = emergency_shuttle.timeleft()
+		if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
+			var/timeleft = emergency_shuttle.estimate_arrival_time()
 			if (timeleft)
 				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 

code/modules/mob/living/simple_animal/borer.dm

@@ -146,8 +146,8 @@
 	statpanel("Status")
 
 	if(emergency_shuttle)
-		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+		if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
-			var/timeleft = emergency_shuttle.timeleft()
+			var/timeleft = emergency_shuttle.estimate_arrival_time()
 			if (timeleft)
 				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 

code/modules/mob/new_player/new_player.dm

@@ -329,11 +329,12 @@
 		dat += "Round Duration: [round(hours)]h [round(mins)]m<br>"
 
 		if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
-			if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled
+			if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled
 				dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
-			if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300 && emergency_shuttle.alert == 0) // Emergency shuttle is past the point of no recall
+			if(emergency_shuttle.online())
+				if (emergency_shuttle.evac)	// Emergency shuttle is past the point of no recall
 					dat += "<font color='red'>The station is currently undergoing evacuation procedures.</font><br>"
-			if(emergency_shuttle.direction == 1 && emergency_shuttle.alert == 1) // Crew transfer initiated
+				else						// Crew transfer initiated
 					dat += "<font color='red'>The station is currently undergoing crew transfer procedures.</font><br>"
 
 		dat += "Choose from the following open positions:<br>"

code/modules/power/singularity/singularity.dm

@@ -475,8 +475,9 @@ var/global/list/uneatable = list(
 /obj/machinery/singularity/narsie/large/New()
 	..()
 	world << "<font size='28' color='red'><b>NAR-SIE HAS RISEN</b></font>"
-	if(emergency_shuttle)
+	if(emergency_shuttle && emergency_shuttle.can_call())
-		emergency_shuttle.incall(0.5) // Cannot recall
+		emergency_shuttle.call_evac()
+		emergency_shuttle.launch_time = 0	// Cannot recall
 
 /obj/machinery/singularity/narsie/process()
 	eat()

code/modules/shuttles/shuttle_console.dm

@@ -6,10 +6,14 @@
 
 /datum/shuttle/ferry
 	var/location = 0	//0 = at area_station, 1 = at area_offsite
+	var/direction = 0	//0 = going to station, 1 = going to offsite.
 	var/process_state = IDLE_STATE
 
 	//this mutex ensures that only one console is processing the shuttle's controls at a time
-	var/obj/machinery/computer/shuttle_control/in_use = null
+	var/obj/machinery/computer/shuttle_control/in_use = null	//this doesn't have to be a console...
+
+	var/area_transition
+	var/travel_time = 0
 
 	var/area_station
 	var/area_offsite
@@ -26,6 +30,7 @@
 	if(!origin)
 		origin = get_location_area(location)
 
+	direction = !location
 	..(origin, destination)
 
 /datum/shuttle/ferry/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time)
@@ -37,6 +42,7 @@
 	if(!departing)
 		departing = get_location_area(location)
 
+	direction = !location
 	..(departing, destination, interim, travel_time)
 
 /datum/shuttle/ferry/move(var/area/origin,var/area/destination)
@@ -48,7 +54,11 @@
 	if (docking_controller && !docking_controller.undocked())
 		docking_controller.force_undock()
 	..(origin, destination)
-	location = !location
+
+
+	if (destination == area_station) location = 0
+	if (destination == area_offsite) location = 1
+		//if this is a long_jump retain the location we were last at until we get to the new one
 
 /datum/shuttle/ferry/proc/get_location_area(location_id = null)
 	if (isnull(location_id))
@@ -63,9 +73,9 @@
 		if (WAIT_LAUNCH)
 			if (skip_docking_checks() || docking_controller.can_launch())
 
-				//once you have a transition area, making ferry shuttles have a transition would merely requre replacing this with
+				if (travel_time && area_transition)
-				//if (transition_area) long_jump(...)
+					long_jump(null, null, area_transition, travel_time)
-				//else short_jump ()
+				else
 					short_jump()
 
 				process_state = WAIT_ARRIVE
@@ -77,6 +87,7 @@
 			if (skip_docking_checks() || docking_controller.docked())
 				process_state = IDLE_STATE
 				in_use = null	//release lock
+				arrived()
 
 /datum/shuttle/ferry/current_dock_target()
 	var/dock_target
@@ -137,6 +148,10 @@
 		return 1
 	return 0
 
+//This gets called when the shuttle finishes arriving at it's destination
+//This can be used by subtypes to do things when the shuttle arrives.
+/datum/shuttle/ferry/proc/arrived()
+	return	//do nothing for now
 
 
 /obj/machinery/computer/shuttle_control

code/modules/shuttles/shuttle_emergency.dm

@@ -0,0 +1,69 @@
+
+
+
+/datum/shuttle/ferry/emergency
+	//pass
+
+/datum/shuttle/ferry/emergency/arrived()
+	emergency_shuttle.shuttle_arrived()
+
+/*
+/datum/shuttle/ferry/emergency/move()
+	if (!location)	//leaving the station
+		emergency_shuttle.departed = 1
+	..()
+*/
+
+/datum/shuttle/ferry/escape_pod
+	//pass
+
+/datum/shuttle/ferry/escape_pod/can_launch()
+	if(location)
+		return 0	//it's a one-way trip.
+	return ..()
+
+/datum/shuttle/ferry/escape_pod/can_force()
+	return 0
+
+/datum/shuttle/ferry/escape_pod/can_cancel()
+	return 0
+
+//TODO replace this with proper door controllers
+/datum/shuttle/ferry/escape_pod/move(var/area/origin,var/area/destination)
+	for(var/obj/machinery/door/D in origin)
+		spawn(0)
+			D.close()
+	
+	..(origin, destination)	//might need to adjust shuttle/move so that it can take into account the direction argument to area/move_contents_to, I dunno.
+	
+	for(var/obj/machinery/door/D in destination)
+		spawn(0)
+			D.open()
+
+//Escape pod garbage, copied from the controller
+/*
+							//pods
+					start_location = locate(/area/shuttle/escape_pod1/station)
+					end_location = locate(/area/shuttle/escape_pod1/transit)
+					end_location = locate(/area/shuttle/escape_pod1/centcom)
+					start_location.move_contents_to(end_location, null, NORTH)
+
+				start_location = locate(/area/shuttle/escape_pod2/station)
+				end_location = locate(/area/shuttle/escape_pod2/transit)
+					end_location = locate(/area/shuttle/escape_pod2/centcom)
+					start_location.move_contents_to(end_location, null, NORTH)
+
+				start_location = locate(/area/shuttle/escape_pod3/station)
+				end_location = locate(/area/shuttle/escape_pod3/transit)
+					end_location = locate(/area/shuttle/escape_pod3/centcom)
+					start_location.move_contents_to(end_location, null, NORTH)
+
+				//There is no pod 4, apparently.
+				
+				start_location = locate(/area/shuttle/escape_pod5/station)
+				end_location = locate(/area/shuttle/escape_pod5/transit)
+					end_location = locate(/area/shuttle/escape_pod5/centcom)
+					start_location.move_contents_to(end_location, null, EAST)
+
+
+*/

code/unused/hivebot/hivebot.dm

@@ -43,8 +43,9 @@
 	..()
 	statpanel("Status")
 	if (src.client.statpanel == "Status")
-		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+		if(emergency_shuttle)
-			var/timeleft = emergency_shuttle.timeleft()
+			if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
+				var/timeleft = emergency_shuttle.estimate_arrival_time()
 				if (timeleft)
 					stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 /*

code/unused/hivebot/mainframe.dm

@@ -23,8 +23,9 @@
 	..()
 	statpanel("Status")
 	if (src.client.statpanel == "Status")
-		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+		if(emergency_shuttle)
-			var/timeleft = emergency_shuttle.timeleft()
+			if(emergency_shuttle.has_eta() && !emergency_shuttle.returned())
+				var/timeleft = emergency_shuttle.estimate_arrival_time()
 				if (timeleft)
 					stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
 /*