balancing stuff and also the weapon graphics
Merge branch 'f-battlefield' into windows-dev