More work on Factional NPC scripts
Merge pull request #687 from tacef/master

More work on Factional NPC scripts