diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm
index dd6140f6eb..924b77bdb1 100644
--- a/code/controllers/subsystem/shuttles.dm
+++ b/code/controllers/subsystem/shuttles.dm
@@ -279,6 +279,8 @@ var/datum/controller/subsystem/shuttle/SSshuttle
 			log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.")
 			message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
 
+
+
 /datum/controller/subsystem/shuttle/proc/registerHostileEnvironment(datum/bad)
 	hostileEnvironments[bad] = TRUE
 	checkHostileEnvironment()
@@ -349,6 +351,14 @@ var/datum/controller/subsystem/shuttle/SSshuttle
 		if(!(M in transit_requesters))
 			transit_requesters += M
 
+/datum/controller/subsystem/shuttle/proc/autoEnd()
+	if(world.time > 108000 && EMERGENCY_IDLE_OR_RECALLED) //3 hours
+		SSshuttle.emergency.request(null, 1.5)
+		priority_announce("The shift has come to an end and the shuttle called.")
+		log_game("Round time limit reached. Shuttle has been auto-called.")
+		message_admins("Round time limit reached. Shuttle called.")
+
+
 /datum/controller/subsystem/shuttle/proc/generate_transit_dock(obj/docking_port/mobile/M)
 	// First, determine the size of the needed zone
 	// Because of shuttle rotation, the "width" of the shuttle is not
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 9ffebe0911..0e228b0f3c 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -125,6 +125,7 @@ var/datum/controller/subsystem/ticker/ticker
 			check_queue()
 			check_maprotate()
 			scripture_states = scripture_unlock_alert(scripture_states)
+			SSshuttle.autoEnd()
 
 			if(!mode.explosion_in_progress && mode.check_finished() || force_ending)
 				current_state = GAME_STATE_FINISHED