Merge branch 'master' into development

# Conflicts:
#	code/modules/multiz/movement.dm
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-6_surface.dmm

code/modules/multiz/structures.dm

@@ -131,6 +131,13 @@
 
 /obj/structure/ladder/proc/climbLadder(var/mob/M, var/target_ladder)
 	var/turf/T = get_turf(target_ladder)
+	var/turf/LAD = get_turf(src)
+	var/direction = UP
+	if(istype(target_ladder, target_down))
+		direction = DOWN
+	if(!LAD.CanZPass(M, direction))
+		to_chat(M, "<span class='notice'>\The [T] is blocking \the [src].</span>")
+		return FALSE
 	for(var/atom/A in T)
 		if(!A.CanPass(M, M.loc, 1.5, 0))
 			to_chat(M, "<span class='notice'>\The [A] is blocking \the [src].</span>")
@@ -199,7 +206,7 @@
 /obj/structure/stairs/CheckExit(mob/living/mover, turf/target)
 	if (!istype(mover) || target.z != z)
 		return ..()
-	
+
 	if (mover.loc == loc && get_dir(mover, target) != reverse_dir[dir])
 		addtimer(CALLBACK(src, .proc/mob_fall, mover), 0)