Merge “[added] remaining city patrolling NPCs [added] temporary combatPatrol ai template [changed] method used for patrol point delays [fixed] various NPC to better reflect live” into unstable