Weapon emit fixes
Merge branch 'master' of https://github.com/n3wm1nd/TA