Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals

# Conflicts:
#	icons/effects/beam.dmi

code/modules/shuttle/emergency.dm

@@ -166,12 +166,36 @@
 		shuttle_master.emergencyLastCallLoc = null
 	emergency_shuttle_recalled.Announce("The emergency shuttle has been recalled.[shuttle_master.emergencyLastCallLoc ? " Recall signal traced. Results can be viewed on any communications console." : "" ]")
 
-/*
-/obj/docking_port/mobile/emergency/findTransitDock()
-	. = shuttle_master.getDock("emergency_transit")
-	if(.)	return .
-	return ..()
-*/
+/obj/docking_port/mobile/emergency/proc/is_hijacked()
+	for(var/mob/living/player in player_list)
+		if(player.mind)
+			if(player.stat != DEAD)
+				if(issilicon(player)) //Borgs are technically dead anyways
+					continue
+				if(isanimal(player)) //Poly does not own the shuttle
+					continue
+
+				var/special_role = player.mind.special_role
+				if(special_role)
+					if(special_role == SPECIAL_ROLE_TRAITOR) // traitors can hijack the shuttle
+						continue
+
+					if(special_role == SPECIAL_ROLE_CHANGELING) // changelings as well
+						continue
+
+					if(special_role == SPECIAL_ROLE_VAMPIRE || special_role == SPECIAL_ROLE_VAMPIRE_THRALL) // for traitorvamp
+						continue
+
+					if(special_role == SPECIAL_ROLE_NUKEOPS) // so can nukeops, for the hell of it
+						continue
+
+					if(special_role == SPECIAL_ROLE_SYNDICATE_DEATHSQUAD) // and the syndie deathsquad i guess
+						continue
+
+				if(get_area(player) == areaInstance)
+					return FALSE
+
+	return TRUE
 
 
 /obj/docking_port/mobile/emergency/check()
@@ -232,10 +256,19 @@
 				//move each escape pod to its corresponding escape dock
 				for(var/obj/docking_port/mobile/pod/M in shuttle_master.mobile)
 					M.dock(shuttle_master.getDock("[M.id]_away"))
-				//now move the actual emergency shuttle to centcomm
+
 				for(var/area/shuttle/escape/E in world)
 					E << 'sound/effects/hyperspace_end.ogg'
-				dock(shuttle_master.getDock("emergency_away"))
+
+				// now move the actual emergency shuttle to centcomm
+				// unless the shuttle is "hijacked"
+				var/destination_dock = "emergency_away"
+				if(is_hijacked())
+					destination_dock = "emergency_syndicate"
+					priority_announcement.Announce("Corruption detected in shuttle navigation protocols. Please contact your supervisor.")
+
+				dock_id(destination_dock)
+
 				mode = SHUTTLE_ENDGAME
 				timer = 0
 				open_dock()

code/modules/shuttle/shuttle.dm

@@ -489,8 +489,14 @@
 	// Instead of spending a lot of time trying to work out where to place
 	// our shuttle, just create it somewhere empty and send it to where
 	// it should go
-	var/obj/docking_port/stationary/D = findRoundstartDock()
-	return dock(D)
+	. = dock_id(roundstart_move)
+
+/obj/docking_port/mobile/proc/dock_id(id)
+	var/port = shuttle_master.getDock(id)
+	if(port)
+		. = dock(port)
+	else
+		. = null
 
 /obj/effect/landmark/shuttle_import
 	name = "Shuttle Import"

code/modules/shuttle/supply.dm

@@ -246,7 +246,10 @@
 		/obj/machinery/teleport/station,
 		/obj/machinery/teleport/hub,
 		/obj/machinery/telepad,
-		/obj/machinery/clonepod
+		/obj/machinery/clonepod,
+		/obj/effect/hierophant,
+		/obj/item/device/warp_cube,
+		/obj/machinery/quantumpad
 	)
 	if(A)
 		if(is_type_in_list(A, blacklist))