Partially working shot fx
Fix clang++ error
Backport weapon stats