Shuttlefixin

[SaraSayomi]

About The Pull Request

Fixes shuttles and several other merge conflicts

Why It's Good For The Game

A Port?

Pre-Merge Checklist

• [x] You tested this on a local server.
• [x] This code did not runtime during testing.
• [x] You documented all of your changes.

Changelog

:cl: fix: remove doubled up shuttle markers, causing shuttles to love up on the station with murder fix: several spacelaw merge conflicts fix: Not sanity /:cl: