weapon updates
Merge branch 'master' of https://github.com/SammyNXS/SIGGRAPH-Kraken