From 59c32572832f89860a4e0da410a98a974a49c1e9 Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Fri, 15 Sep 2023 22:22:47 -0400 Subject: [PATCH] what --- code/game/turfs/turf.dm | 2 +- code/modules/keybindings/bindings_atom.dm | 2 +- code/modules/mob/mob_movement.dm | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 837610d5d7fe..8b2dfe28bfc4 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -206,7 +206,7 @@ return FALSE // if we are thrown, moved, dragged, or in any other way abused by code - check our diagonals - if(!mover.move_intentionally) + if(!mover.move_intentionally || fdir == NORTHEAST || fdir == NORTHWEST || fdir == SOUTHEAST || fdir == SOUTHWEST) // Check objects in adjacent turf EAST/WEST if(fd1 && fd1 != fdir) T = get_step(mover, fd1) diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm index 82c3d4699f5c..b776585c8a95 100644 --- a/code/modules/keybindings/bindings_atom.dm +++ b/code/modules/keybindings/bindings_atom.dm @@ -5,7 +5,7 @@ var/movement_dir = NONE for(var/_key in user.keys_held) if(user.movement_keys[_key]) - movement_dir = user.movement_keys[_key] + movement_dir += user.movement_keys[_key] if(!movement_dir) return diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index c3266982b20d..267309e6ef8e 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -167,6 +167,8 @@ mob.next_move_slowdown = 0 if((mob.flags_atom & DIRLOCK) && mob.dir != direct) move_delay += MOVE_REDUCTION_DIRECTION_LOCKED // by Geeves + if(direct == NORTHEAST || direct == NORTHWEST || direct == SOUTHEAST || direct == SOUTHWEST) + move_delay *= sqrt(2) //Diagonal movement takes longer mob.cur_speed = Clamp(10/(move_delay + 0.5), MIN_SPEED, MAX_SPEED) //We are now going to move