Bug fixing

Fixed active weapon list, NPC placement, NPC visibility.
Merge pull request #42 from mentatzoe/master

Bug fixing