ok

2020-02-24 16:51:35 -07:00
parent 424eb48d9e
commit 2eae147e93
2 changed files with 6 additions and 7 deletions
@@ -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)
@@ -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()
 	. = ..()