Armory Update

- Armory red-only access revoked, as per Fox and Mel's request.

- General map fixes.