From dc7585fabf4b48369d41ddf1654e60e7711be54e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 2 Apr 2018 01:36:42 -0500 Subject: [PATCH] [MIRROR] Moves quick equip hotkey up to /mob (#6229) * Moves quick equip hotkey up to /mob * Merge pull request #36869 from RandomMarine/e Moves quick equip hotkey up to /mob --- code/modules/keybindings/bindings_human.dm | 8 +------- code/modules/keybindings/bindings_mob.dm | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/modules/keybindings/bindings_human.dm b/code/modules/keybindings/bindings_human.dm index 85aeba5f10..b0e2994ffc 100644 --- a/code/modules/keybindings/bindings_human.dm +++ b/code/modules/keybindings/bindings_human.dm @@ -30,7 +30,7 @@ return stored.attack_hand(src) // take out thing from belt return - + if("B") // Put held thing in backpack or take out most recent thing from backpack var/obj/item/thing = get_active_held_item() var/obj/item/storage/equipped_backpack = get_item_by_slot(slot_back) @@ -60,10 +60,4 @@ return stored.attack_hand(src) // take out thing from backpack return - - switch(_key) - if("E") - quick_equip() - return - return ..() \ No newline at end of file diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm index 08e7a7bb20..925f305525 100644 --- a/code/modules/keybindings/bindings_mob.dm +++ b/code/modules/keybindings/bindings_mob.dm @@ -29,6 +29,9 @@ else dropItemToGround(I) return + if("E") + quick_equip() + return if("Alt") toggle_move_intent() return