Weapon change setup
Merge pull request #243 from ping19/master

Weapon change setup