Remap Syndicate HQ/Ship

Basically #5564 without cherry-picking, but merging of the branch instead.

I also removed the damn costume storage because DAMN if people really feel like it will be missing, they should speak up. Trying the new map without the storage first.

__Final state:__
![Loading](http://i.imgur.com/euceBKb.png)