weapon faster attacks
Merge pull request #858 from NimbusBP1729/weapon_tweaks

weapon faster attacks
Fixes #860
Merge branch 'master' of github.com:kyleconroy/hawkthorne-journey