mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Makes you turn when pulling and adds sound to rolling bed and chair (#32778)
* Makes you turn at what you are pulling and adds sound to rolling bed and chair * ShizCalev's sound
This commit is contained in:
@@ -99,6 +99,10 @@
|
|||||||
M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
|
M.pixel_x = M.get_standard_pixel_x_offset(M.lying)
|
||||||
M.pixel_y = M.get_standard_pixel_y_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
|
/obj/item/roller
|
||||||
name = "roller bed"
|
name = "roller bed"
|
||||||
|
|||||||
@@ -194,6 +194,12 @@
|
|||||||
buildstackamount = 5
|
buildstackamount = 5
|
||||||
item_chair = null
|
item_chair = null
|
||||||
|
|
||||||
|
|
||||||
|
/obj/structure/chair/office/Moved()
|
||||||
|
. = ..()
|
||||||
|
if(has_gravity())
|
||||||
|
playsound(src, 'sound/effects/roll.ogg', 100, 1)
|
||||||
|
|
||||||
/obj/structure/chair/office/light
|
/obj/structure/chair/office/light
|
||||||
icon_state = "officechair_white"
|
icon_state = "officechair_white"
|
||||||
|
|
||||||
|
|||||||
@@ -162,7 +162,7 @@
|
|||||||
|
|
||||||
//We are now going to move
|
//We are now going to move
|
||||||
var/delay = mob.movement_delay()
|
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
|
move_delay = old_move_delay + delay
|
||||||
else
|
else
|
||||||
move_delay = delay + world.time
|
move_delay = delay + world.time
|
||||||
@@ -187,6 +187,9 @@
|
|||||||
for(var/obj/O in mob.user_movement_hooks)
|
for(var/obj/O in mob.user_movement_hooks)
|
||||||
O.intercept_user_move(direct, mob, n, oldloc)
|
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)
|
/mob/Moved(oldLoc, dir, Forced = FALSE)
|
||||||
. = ..()
|
. = ..()
|
||||||
for(var/obj/O in contents)
|
for(var/obj/O in contents)
|
||||||
|
|||||||
BIN
sound/effects/roll.ogg
Normal file
BIN
sound/effects/roll.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user