testing weapons again
Merge branch 'master' of https://github.com/MetropoliaPortal/Cargame