Updated Carpet NPCs, ref #1195

Move L108-110 above L70