Merge pull request #2 from ShooShoSha/weapons

Weapons
Merge pull request #3 from ShooShoSha/1.7.2

Merge pull request #2 from ShooShoSha/weapons