search

cebutris / MithraBayport

Other
1 stars 6 forks source link

The First Sync With Upstream #38

Closed Michiyamenotehifunana closed 5 years ago

Michiyamenotehifunana commented 5 years ago

This PR syncs our codebase up with Baystation12.

We need to do this in order to not stagnate.

This sync should fix a ton of bugs and random runtimes, in addition to respriting the photocopier (which I did upstream).

cebutris commented 5 years ago

Are we sure this doesn't touch any of our non-modular changes?

Michiyamenotehifunana commented 5 years ago

This didn't throw any merge conflicts at me, nor did it trigger CODEOWNERS, and it didn't cause any obvious regressions when I tested it. I'll double check.

Michiyamenotehifunana commented 5 years ago

The only modified file this sync affects is changeling_powers.dm, and its changes were gracefully merged without affecting ours.

In addition, an update_icons.dm was modified, but that is the aliens one rather than the human one which we butchered.

I am fairly confident that this won't fuck everything up.