Another cleanup.
Started rewriting shops, will finish later.
Completely re-wrote shops.
Cleaned up a few things and found some more issues.
Tested shops and found an issue.
Started on dwarf multi-cannon :)