Merge pull request #7220 from VOREStation/Arokha/roller

Fix rollerbed movement with buckled mobs
This commit is contained in:
Atermonera
2020-05-24 14:28:55 -07:00
committed by GitHub
2 changed files with 4 additions and 2 deletions
+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))