Weapon changes for #147

-Everything but Caber is included here