From 2eae147e93d31fd9363c6befc280b17f66fb9f13 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 24 Feb 2020 16:51:35 -0700
Subject: [PATCH] ok

---
 code/modules/mob/living/carbon/carbon_movement.dm | 9 ++++-----
 code/modules/mob/living/living_movement.dm        | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm
index 2677de6c2f..109473fc31 100644
--- a/code/modules/mob/living/carbon/carbon_movement.dm
+++ b/code/modules/mob/living/carbon/carbon_movement.dm
@@ -47,8 +47,7 @@
 /mob/living/carbon/CanPass(atom/movable/mover, turf/target)
 	. = ..()
 	if(.)
-		var/mob/living/mobdude = mover
-		if(istype(mobdude) && !(mobdude in buckled_mobs))
-			if(CHECK_BITFIELD(mobility_flags, MOBILITY_STAND) && !CHECK_BITFIELD(mobdude.mobility_flags, MOBILITY_STAND))
-				if(!(mobdude.pass_flags & PASSMOB))
-					return FALSE
+		if(isliving(mover))
+			var/mob/living/L = mover
+			if(!lying && L.lying)		//they're down but we're not
+				return (L == buckled) || (L in buckled_mobs)
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index e0ea6350d7..3e7a6fde0b 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -13,9 +13,9 @@
 	if(buckled == mover)
 		return TRUE
 	if(ismob(mover))
-		if (mover in buckled_mobs)
+		if(mover in buckled_mobs)
 			return TRUE
-	return (!mover.density || !density || lying || (mover.throwing && mover.throwing.thrower == src && !ismob(mover)))
+	return (!mover.density || !density || (mover.throwing && mover.throwing.thrower == src && !ismob(mover)))
 
 /mob/living/toggle_move_intent()
 	. = ..()