Updated Carpet NPCs, ref #1995