Specific weapons

Supersedes #1634

Some git stuff went down and I'm embarrassed to say I couldn't fix it but, this is better than the last pull.