Fix rollerbed movement with buckled mobs

This commit is contained in:
Aronai Sieyes
2020-05-21 15:34:29 -04:00
parent fb70d2781e
commit 79b9e13bb4
2 changed files with 4 additions and 2 deletions
+3 -1
View File
@@ -158,9 +158,11 @@
L.forceMove(loc, direct, movetime)
L.last_move = last_move
L.inertia_dir = last_move
if(!buckle_dir)
L.set_dir(dir)
else
L.set_dir(buckle_dir)
/atom/movable/proc/can_buckle_check(mob/living/M, forced = FALSE)
if(!buckled_mobs)
+1 -1
View File
@@ -81,7 +81,7 @@ default behaviour is:
return 0
/mob/living/Bump(atom/movable/AM)
if(now_pushing || !loc)
if(now_pushing || !loc || buckled == AM)
return
now_pushing = 1
if (istype(AM, /mob/living))