More weapons updates

not that you could tell, but all the logic and stuff is working now, all
the things that should call things are calling things.