cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8000 from VOREStation/Arokha/issue7803

Browse Source 
Fix rollerbed movement with buckled mobs
This commit is contained in:
Aronai Sieyes
2020-05-21 15:40:27 -04:00
committed by GitHub
parent 58d9b0a6fb a8ac98b623
commit 35c0fa2103
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -83,7 +83,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))