Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00
parent eeba86e27e 03d67c753e
commit 1f6b3ce629
285 changed files with 56239 additions and 56588 deletions
@@ -89,10 +89,7 @@
 	return TRUE

 /mob/living/carbon/human/get_leg_ignore()
-	if(movement_type & FLYING)
-		return TRUE
-	var/obj/item/tank/jetpack/J = get_jetpack()
-	if(J && J.on && !has_gravity())
+	if((movement_type & FLYING) || floating)
 		return TRUE
 	return FALSE