Weapon fix
Merge branch 'input' of https://github.com/vkd/Ctrl-Space into input