Merge pull request #3981 from Citadel-Station-13/upstream-merge-32778

[MIRROR] Makes you turn when pulling and adds sound to rolling bed and chair
This commit is contained in:
deathride58
2017-11-17 04:52:22 +00:00
committed by GitHub
4 changed files with 14 additions and 1 deletions

View File

@@ -162,7 +162,7 @@
//We are now going to move
var/delay = mob.movement_delay()
if (old_move_delay + (delay*MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time)
if(old_move_delay + (delay*MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time)
move_delay = old_move_delay + delay
else
move_delay = delay + world.time
@@ -187,6 +187,9 @@
for(var/obj/O in mob.user_movement_hooks)
O.intercept_user_move(direct, mob, n, oldloc)
if(mob.pulling && !ismob(mob.pulling))
mob.dir = turn(mob.dir, 180)
/mob/Moved(oldLoc, dir, Forced = FALSE)
. = ..()
for(var/obj/O in contents)