Challenge accepted ~shooter
Merge branch 'ShooterLogic'