shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530

Browse Source 
[MIRROR] Makes editing movements delay configs have an effect again
This commit is contained in:
LetterJay
2017-11-11 12:37:59 -06:00
committed by GitHub
parent a3ba99a7e8 5a1d0d706a
commit fc04d94a29
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
View File

@@ -15,18 +15,20 @@
delivery_icon = "deliverybox"
anchorable = FALSE
var/move_speed_multiplier = 1
var/move_delay = 0
var/move_delay = FALSE
var/egged = 0
/obj/structure/closet/cardboard/relaymove(mob/user, direction)
if(opened || move_delay || user.stat || user.IsStun() || user.IsKnockdown() || user.IsUnconscious() || !isturf(loc) || !has_gravity(loc))
return
move_delay = 1
move_delay = TRUE
if(step(src, direction))
spawn(CONFIG_GET(number/walk_delay) * move_speed_multiplier)
move_delay = 0
addtimer(CALLBACK(src, .proc/ResetMoveDelay), CONFIG_GET(number/walk_delay) * move_speed_multiplier)
else
move_delay = 0
ResetMoveDelay()
/obj/structure/closet/cardboard/proc/ResetMoveDelay()
move_delay = FALSE
/obj/structure/closet/cardboard/open()
if(opened || !can_open())