Makeshift weapons integration
Makeshift weapons misc fixes
merge fixes
Merge pull request #68 from alex-gh/makeshift_weapons

Makeshift weapons