Weapon list and form fixes
Merge branch 'release/pianoman-f'