Merges AI Branch into Master

code/modules/multiz/movement.dm

@@ -83,11 +83,13 @@
 /mob/proc/can_overcome_gravity()
 	return FALSE
 
-/mob/living/carbon/human/can_overcome_gravity()
-	return species && species.can_overcome_gravity(src)
+/mob/living/can_overcome_gravity()
+	return hovering
 
-/mob/living/simple_animal/construct/can_overcome_gravity()
-	return 1 //They care not for standard physics.
+/mob/living/carbon/human/can_overcome_gravity()
+	. = ..()
+	if(!.)
+		return species && species.can_overcome_gravity(src)
 
 /mob/observer/zMove(direction)
 	var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
@@ -117,36 +119,44 @@
 	return ..()
 
 /mob/observer/can_ztravel()
-	return 1
+	return TRUE
 
-/mob/living/simple_animal/construct/can_ztravel()
-	return 1
+/mob/living/can_ztravel()
+	if(incapacitated())
+		return FALSE
+	return hovering
 
 /mob/living/carbon/human/can_ztravel()
 	if(incapacitated())
-		return 0
+		return FALSE
+
+	if(hovering)
+		return TRUE
 
 	if(flying) //VOREStation Edit. Allows movement up/down with wings.
 		return 1 //VOREStation Edit
 
 	if(Process_Spacemove())
-		return 1
+		return TRUE
 
 	if(Check_Shoegrip())	//scaling hull with magboots
 		for(var/turf/simulated/T in trange(1,src))
 			if(T.density)
-				return 1
+				return TRUE
 
 /mob/living/silicon/robot/can_ztravel()
 	if(incapacitated() || is_dead())
-		return 0
+		return FALSE
+
+	if(hovering)
+		return TRUE
 
 	if(Process_Spacemove()) //Checks for active jetpack
-		return 1
+		return FALSE
 
 	for(var/turf/simulated/T in trange(1,src)) //Robots get "magboots"
 		if(T.density)
-			return 1
+			return TRUE
 
 // TODO - Leshana Experimental
 
@@ -262,19 +272,15 @@
 	if((locate(/obj/structure/disposalpipe/up) in below) || locate(/obj/machinery/atmospherics/pipe/zpipe/up in below))
 		return FALSE
 
+/mob/living/can_fall()
+	if(hovering)
+		return FALSE
+	return ..()
+
 /mob/living/carbon/human/can_fall()
 	if(..())
 		return species.can_fall(src)
 
-/mob/living/simple_animal/parrot/can_fall() // Poly can fly.
-	return FALSE
-
-/mob/living/simple_animal/hostile/carp/can_fall() // So can carp apparently.
-	return FALSE
-
-/mob/living/simple_animal/construct/can_fall() //As do Constructs.
-	return FALSE
-
 // Check if this atom prevents things standing on it from falling. Return TRUE to allow the fall.
 /obj/proc/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf)
 	if(!isturf(mover.loc)) // VORESTATION EDIT. We clearly didn't have enough backup checks.

code/modules/multiz/turf.dm

@@ -149,3 +149,12 @@
 /turf/simulated/open/is_space()
 	var/turf/below = GetBelow(src)
 	return !below || below.is_space()
+<<<<<<< HEAD
+=======
+
+/turf/simulated/open/is_safe_to_enter(mob/living/L)
+	if(L.can_fall())
+		if(!locate(/obj/structure/stairs) in GetBelow(src))
+			return FALSE
+	return ..()
+>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync