Merge pull request #31 from TehCupcakes/npcs

Added some Tir NPCs
Follow up d361a322fa5805ed3fbebb34ca49f592bb8c1993

Changed return code