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

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme

code/modules/shuttle/on_move.dm

@@ -1,9 +1,12 @@
 // Shuttle on-movement //
-/atom/movable/proc/onShuttleMove(turf/T1, rotation)
-    if(rotation)
-        shuttleRotate(rotation)
-    forceMove(T1)
-    return 1
+/atom/movable/proc/onShuttleMove(turf/oldT, turf/T1, rotation)
+	var/turf/newT = get_turf(src)
+	if(newT.z != oldT.z)
+		onTransitZ(oldT.z, newT.z)
+	if(rotation)
+		shuttleRotate(rotation)
+	forceMove(T1)
+	return 1
 
 /atom/movable/lighting_overlay/onShuttleMove()
     return 0

code/modules/shuttle/shuttle.dm

@@ -490,6 +490,7 @@
 		var/turf/T1 = L1[i]
 		if(!T1)
 			continue
+
 		if(T0.type != T0.baseturf) //So if there is a hole in the shuttle we don't drag along the space/asteroid/etc to wherever we are going next
 			T0.copyTurf(T1)
 			areaInstance.contents += T1
@@ -714,6 +715,8 @@
 		possible_destinations = C.possible_destinations
 		shuttleId = C.shuttleId
 
+/obj/machinery/computer/shuttle/Initialize(mapload)
+	. = ..()
 	connect()
 
 /obj/machinery/computer/shuttle/proc/connect()