Merge branch 'master' into shuttle-processing

Conflicts:
	code/modules/shuttle/ripple.dm

code/modules/shuttle/emergency.dm

@@ -288,10 +288,11 @@
 				priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
 				feedback_add_details("emergency_shuttle", src.name)
 
-				//Gangs only have one attempt left if the shuttle has docked with the station to prevent suffering from dominator delays
+				// Gangs only have one attempt left if the shuttle has
+				// docked with the station to prevent suffering from
+				// endless dominator delays
 				for(var/datum/gang/G in ticker.mode.gangs)
-					if(isnum(G.dom_timer))
-
+					if(G.is_dominating)
 						G.dom_attempts = 0
 					else
 						G.dom_attempts = min(1,G.dom_attempts)

code/modules/shuttle/shuttle.dm

@@ -176,7 +176,7 @@
 
 	var/timer						//used as a timer (if you want time left to complete move, use timeLeft proc)
 	var/mode = SHUTTLE_IDLE			//current shuttle mode (see /__DEFINES/stat.dm)
-	var/callTime = 50				//time spent in transit (deciseconds)
+	var/callTime = 150				//time spent in transit (deciseconds)
 	var/roundstart_move				//id of port to send shuttle to at roundstart
 	var/travelDir = 0				//direction the shuttle would travel in