Latest /tg/ merge, Box shuttle fix [Ready]

Reverts our map changes, I will replace these shortly.