Merge upstream PR

This commit is contained in:
Aronai Sieyes
2020-05-15 20:46:03 -04:00
parent 02f82fc1f0
commit b3b22daa1d
14 changed files with 0 additions and 554 deletions
@@ -159,20 +159,6 @@
else
unbuckle_mob()
/obj/structure/bed/chair/office/handle_buckled_mob_movement(atom/new_loc, direction, movetime)
for(var/A in buckled_mobs)
var/mob/living/occupant = A
occupant.buckled = null
occupant.Move(loc, direction, movetime)
occupant.buckled = src
if (occupant && (loc != occupant.loc))
if (propelled)
for (var/mob/O in src.loc)
if (O != occupant)
Bump(O)
else
unbuckle_mob()
/obj/structure/bed/chair/office/Bump(atom/A)
..()
if(!has_buckled_mobs()) return