More weapon things

Sorry for so many uploads. Everything should be fine now I just had some
problems between syncing Julian's last commit and mine.