Update weapons to latest changes
Merge pull request #698 from robotboy655/weapons

Update weapons to latest changes