Updated weapons to latest game changes
Merge pull request #650 from robotboy655/w

Updated weapons to latest game changes