Map squish

Squished cargo, moved tool storage to dorms.