Merge pull request #32751 from ninjanomnom/keybindings

In-code key handling system, Take 2
This commit is contained in:
oranges
2017-12-05 22:15:13 +13:00
committed by GitHub
44 changed files with 421 additions and 1648 deletions
+1 -2
View File
@@ -68,11 +68,10 @@
a_right.on_found(finder)
/obj/item/device/assembly_holder/Move()
..()
. = ..()
if(a_left && a_right)
a_left.holder_movement()
a_right.holder_movement()
return
/obj/item/device/assembly_holder/attack_hand()//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
if(a_left && a_right)
+1 -2
View File
@@ -83,10 +83,9 @@
/obj/item/device/assembly/infra/Move()
var/t = dir
..()
. = ..()
setDir(t)
qdel(first)
return
/obj/item/device/assembly/infra/holder_movement()
if(!holder)