From 07a7b4b6188b878a2d4b97599d4b3915ff85e1cb Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 8 Oct 2022 19:05:47 -0400 Subject: [PATCH] Update bindings_movekeys.dm --- code/modules/keybindings/bindings_movekeys.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/keybindings/bindings_movekeys.dm b/code/modules/keybindings/bindings_movekeys.dm index 8133f32ee37..896618084a6 100644 --- a/code/modules/keybindings/bindings_movekeys.dm +++ b/code/modules/keybindings/bindings_movekeys.dm @@ -54,20 +54,12 @@ var/global/list/MOVE_KEY_MAPPINGS = list( // Map text sent by skin.dmf to our numeric codes. (This can be optimized away once we update skin.dmf) var/movekey = MOVE_KEY_MAPPINGS[movekeyName] -<<<<<<< HEAD - -======= ->>>>>>> c463104999a... Ports Diagonal Movement (#8199) // Validate input. Must be one (and only one) of the key codes) if(isnull(movekey) || (movekey & ~0xFFF) || (movekey & (movekey - 1))) log_debug("Client [ckey] sent an illegal movement key up: [movekeyName] ([movekey])") return -<<<<<<< HEAD - -======= ->>>>>>> c463104999a... Ports Diagonal Movement (#8199) // Clear bit indicating we were holding the key move_keys_held &= ~movekey mod_keys_held &= ~movekey @@ -82,8 +74,4 @@ var/global/list/MOVE_KEY_MAPPINGS = list( // Called every game tick /client/keyLoop() -<<<<<<< HEAD mob.focus?.keyLoop(src) -======= - mob.focus?.keyLoop(src) ->>>>>>> c463104999a... Ports Diagonal Movement (#8199)