Fixes mk 8

code/controllers/voting.dm

@@ -51,8 +51,8 @@ datum/controller/vote
 				voting.Cut()
 
 	proc/autotransfer()
-		initiate_vote("leave_system","the server", 1)
-		log_debug("The server has called a departure vote")
+		initiate_vote("end_round","the server", 1)
+		log_debug("The server has called a roundend vote")
 
 	proc/autogamemode()
 		initiate_vote("gamemode","the server", 1)
@@ -96,7 +96,7 @@ datum/controller/vote
 				else if(mode == "gamemode")
 					if(master_mode in choices)
 						choices[master_mode] += non_voters
-				else if(mode == "leave_system")
+				else if(mode == "end_round")
 					var/factor = 0.5
 					switch(world.time / (10 * 60)) // minutes
 						if(0 to 60)
@@ -109,7 +109,7 @@ datum/controller/vote
 							factor = 1.2
 						else
 							factor = 1.4
-					choices["Depart System"] = round(choices["Depart System"] * factor)
+					choices["End Round"] = round(choices["End Round"] * factor)
 					world << "<font color='purple'>Transfer Factor: [factor]</font>"
 
 		for(var/option in choices)
@@ -205,8 +205,8 @@ datum/controller/vote
 							master_mode = .[1]
 					secondary_mode = .[2]
 					tertiary_mode = .[3]
-				if("leave_system")
-					if(.[1] == "Depart System")
+				if("end_round")
+					if(.[1] == "End Round")
 						init_shift_change(null, 1)
 					else if(.[1] == "Add Antagonist")
 						spawn(10)
@@ -310,10 +310,10 @@ datum/controller/vote
 						gamemode_names[M.config_tag] = capitalize(M.name) //It's ugly to put this here but it works
 						additional_text.Add("<td align = 'center'>[M.required_players]</td>")
 					gamemode_names["secret"] = "Secret"
-				if("leave_system")
+				if("end_round")
 					if(check_rights(R_ADMIN|R_MOD, 0))
 						question = "End the shift?"
-						choices.Add("Depart System", "Continue The Round")
+						choices.Add("End Round", "Continue The Round")
 						if (config.allow_extra_antags && !antag_add_finished)
 							choices.Add("Add Antagonist")
 					else
@@ -324,7 +324,7 @@ datum/controller/vote
 							return 0
 							initiator_key << "The transfer button has been disabled!"
 						question = "End the shift?"
-						choices.Add("Depart System", "Continue The Round")
+						choices.Add("End Round", "Continue The Round")
 						if (config.allow_extra_antags && is_addantag_allowed(1))
 							choices.Add("Add Antagonist")
 				if("add_antagonist")
@@ -440,9 +440,9 @@ datum/controller/vote
 				. += "<font color='grey'>Restart (Disallowed)</font>"
 			. += "</li><li>"
 			if(trialmin || config.allow_vote_restart)
-				. += "<a href='?src=\ref[src];vote=leave_system'>Depart System</a>"
+				. += "<a href='?src=\ref[src];vote=end_round'>End Round</a>"
 			else
-				. += "<font color='grey'>Depart System (Disallowed)</font>"
+				. += "<font color='grey'>End Round (Disallowed)</font>"
 			if(trialmin)
 				. += "\t(<a href='?src=\ref[src];vote=toggle_restart'>[config.allow_vote_restart?"Allowed":"Disallowed"]</a>)"
 			. += "</li><li>"
@@ -497,9 +497,9 @@ datum/controller/vote
 				if("gamemode")
 					if(config.allow_vote_mode || usr.client.holder)
 						initiate_vote("gamemode",usr.key)
-				if("leave_system")
+				if("end_round")
 					if(config.allow_vote_restart || usr.client.holder)
-						initiate_vote("leave_system",usr.key)
+						initiate_vote("end_round",usr.key)
 				if("add_antagonist")
 					if(config.allow_extra_antags)
 						initiate_vote("add_antagonist",usr.key)

code/modules/shuttles/shuttle_autodock.dm

@@ -35,7 +35,7 @@
 
 	return ..()
 
-/datum/shuttle/autodock/shuttle_moved()
+/datum/shuttle/autodock/shuttle_moved(var/obj/effect/shuttle_landmark/destination, var/list/turf_translation)
 	force_undock() //bye!
 	..()
 

code/modules/shuttles/shuttle_emergency.dm

@@ -29,15 +29,14 @@
 /datum/shuttle/autodock/ferry/emergency/long_jump(var/destination, var/interim, var/travel_time, var/direction)
 	..(destination, interim, emergency_controller.get_long_jump_time(), direction)
 
-/datum/shuttle/autodock/ferry/emergency/shuttle_moved()
-	if(next_location != waypoint_station)
+/datum/shuttle/autodock/ferry/emergency/shuttle_moved(var/obj/effect/shuttle_landmark/destination, var/list/turf_translation)
+	if(current_location == waypoint_station && destination == waypoint_transition)
 		emergency_controller.shuttle_leaving()
 		if(emergency_controller.emergency_evacuation)
 			priority_announcement.Announce(format_evac_message(using_map.emergency_shuttle_leaving_dock, raw_eta = emergency_controller.get_eta()))
 		else
 			priority_announcement.Announce(format_evac_message(using_map.shuttle_leaving_dock, raw_eta = emergency_controller.get_eta()))
-
-	else if(next_location == waypoint_offsite && emergency_controller.has_evacuated())
+	else if(destination == waypoint_offsite && emergency_controller.has_evacuated())
 		emergency_controller.shuttle_evacuated()
 	..()
 

code/modules/shuttles/shuttle_ferry.dm

@@ -36,7 +36,7 @@
 	direction = !location
 	..()
 
-/datum/shuttle/autodock/ferry/shuttle_moved()
+/datum/shuttle/autodock/ferry/shuttle_moved(var/obj/effect/shuttle_landmark/destination, var/list/turf_translation)
 	..()
 
 	if (next_location == waypoint_station) location = 0

code/modules/shuttles/shuttles_multi.dm

@@ -44,7 +44,7 @@
 	else
 		home_waypoint = current_location
 
-/datum/shuttle/autodock/multi/antag/shuttle_moved()
+/datum/shuttle/autodock/multi/antag/shuttle_moved(var/obj/effect/shuttle_landmark/destination, var/list/turf_translation)
 	if(current_location == home_waypoint)
 		announce_arrival()
 	else if(next_location == home_waypoint)

maps/yonaguni/yonaguni_events.dm

@@ -12,7 +12,7 @@
 		if(EVENT_LEVEL_MAJOR)
 			command_announcement.Announce("[station_name()] has cleared the debris storm.", "[station_name()] Sensor Array")
 		else
-			command_announcement.Announce("[station_name()] has cleared the debris shower", "[station_name()] Sensor Array")
+			command_announcement.Announce("[station_name()] has cleared the debris shower.", "[station_name()] Sensor Array")
 
 /datum/map/yonaguni/dust_detected_announcement(var/event_severity = EVENT_LEVEL_MUNDANE)
 	command_announcement.Announce("Heavy shower of high-velocity particulate detected en route to [station_name()]. Please secure or avoid unshielded windows.", "Radar Array")

maps/~mapsystem/maps.dm

@@ -165,7 +165,7 @@ var/const/MAP_HAS_RANK = 2		//Rank system, also togglable
 			else
 				return "<font color='green'><b>You managed to survive the events on [station_name()] as [player.real_name].</b></font>"
 		else if(isAdminLevel(playerTurf.z))
-			return "<font color='green'><b>You successfully left the system after events on [station_name()] as [player.real_name].</b></font>"
+			return "<font color='green'><b>You escaped alive from [station_name()] as [player.real_name].</b></font>"
 		else if(issilicon(player))
 			return "<font color='green'><b>You remained operational after the events on [station_name()] as [player.real_name].</b></font>"
 		else