Merges AI Branch into Master

code/modules/shuttles/shuttle.dm

@@ -208,6 +208,7 @@
 
 	for(var/turf/T in dstturfs)
 		var/turf/D = locate(T.x, throwy - 1, T.z)
+<<<<<<< HEAD
 		for(var/I in T)
 			if(istype(I,/mob/living))
 				var/mob/living/L = I
@@ -215,6 +216,16 @@
 			else if(istype(I,/obj))
 				var/obj/O = I
 				O.forceMove(D)
+=======
+		for(var/atom/movable/AM as mob|obj in T)
+			AM.Move(D)
+
+	for(var/mob/living/carbon/bug in destination)
+		bug.gib()
+
+	for(var/mob/living/simple_mob/pest in destination)
+		pest.gib()
+>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
 
 	origin.move_contents_to(destination, direction=direction)