diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 3e69977f367..adb7aa02aaf 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -24,10 +24,12 @@ if(!istype(user) || opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc)) return move_delay = TRUE - if(step(src, direction)) + var/oldloc = loc + step(src, direction) + if(oldloc != loc) addtimer(CALLBACK(src, .proc/ResetMoveDelay), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier) else - ResetMoveDelay() + move_delay = FALSE /obj/structure/closet/cardboard/proc/ResetMoveDelay() move_delay = FALSE @@ -75,14 +77,3 @@ close_sound_volume = 50 material_drop = /obj/item/stack/sheet/plasteel #undef SNAKE_SPAM_TICKS - -/obj/structure/closet/cardboard/relaymove(mob/living/user, direction) - if(!istype(user) || opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc)) - return - move_delay = TRUE - var/oldloc = loc - step(src, direction) - if(oldloc != loc) - addtimer(CALLBACK(src, .proc/ResetMoveDelay), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier) - else - move_delay = FALSE