Merge pull request #6920 from Citadel-Station-13/upstream-merge-38066

[MIRROR] Allow running into space diagonally
2018-05-27 14:42:47 -05:00
parent 1b9aa0e612 50eb853ba7
commit 0bc1c309d7
1 changed files with 6 additions and 2 deletions
@@ -199,8 +199,12 @@
 						first_step_dir = WEST
 						moving_diagonally = SECOND_DIAG_STEP
 						. = step(src, SOUTH)
-			if(!. && moving_diagonally == SECOND_DIAG_STEP)
-				setDir(first_step_dir)
+			if(moving_diagonally == SECOND_DIAG_STEP)
+				if(!.)
+					setDir(first_step_dir)
+				else if (!inertia_moving)
+					inertia_next_move = world.time + inertia_move_delay
+					newtonian_move(direct)
 			moving_diagonally = 0
 			return