diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 14d29e96a7..4250f66e51 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -95,6 +95,10 @@ M.pixel_x = M.get_standard_pixel_x_offset(M.lying) M.pixel_y = M.get_standard_pixel_y_offset(M.lying) +/obj/structure/bed/roller/Moved() + . = ..() + if(has_gravity()) + playsound(src, 'sound/effects/roll.ogg', 100, 1) /obj/item/roller name = "roller bed" diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 89ed70d104..161d1fef7c 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -194,6 +194,12 @@ buildstackamount = 5 item_chair = null + +/obj/structure/chair/office/Moved() + . = ..() + if(has_gravity()) + playsound(src, 'sound/effects/roll.ogg', 100, 1) + /obj/structure/chair/office/light icon_state = "officechair_white" diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index ee449b77a2..39001d6e71 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -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) diff --git a/sound/effects/roll.ogg b/sound/effects/roll.ogg new file mode 100644 index 0000000000..731c60b4ed Binary files /dev/null and b/sound/effects/roll.ogg differ