Added map changes for #925 and #655, props @Skillert
Split NPC in 4
Merge pull request #929 from EPuncker/master

Added map changes for #925 and #655, props @Skillert