General code fixes

Weapons now have types
Merge remote-tracking branch 'origin/CallebergBranch'