Fixes #6448

Re-adds armory camera. Relocates a camera in the fore primary hallway for the third time.