what

cmss13-devs · Sep 16, 2023 · 59c3257 · 59c3257
1 parent 45de005
commit 59c3257
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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