Merge local upstream commits branch with Mithrastation - Githubissues

VulpesLegan / MITHRAStation

The codebase used by the Mithra SS13 server, based on Vorestation

http://vore-station.net

Other

0 stars 3 forks source link

Merge local upstream commits branch with Mithrastation #65

Closed EvilJackCarver closed 5 years ago

EvilJackCarver commented 5 years ago

:warning: Read the below section very carefully before pressing "merge". If you do not, you can and will fuck up the repo! :warning:

WARNING: This is not intended to be merged directly to master without review. Ensure this is on a branch separate from VulpesLegan:master before merging.
WARNING: If the merge-to branch on this pull request is master, CLOSE THE PULL REQUEST IMMEDIATELY!

This is on a separate branch so I can thumb through the changes at my leisure to correct and check what needs to be corrected and checked.
This pull request exists so others can do the same should they so wish.
This is completely untested and should be tested prior to merging into master.

:warning: Read the above section very carefully before pressing "merge". If you do not, you can and will fuck up the repo! :warning:

Pulled changes from upstream and fixed the merge conflicts. PRing here so I (and others, if needed) can chip away at changes and fix things before we merge into master.

I'd merge it myself but it's 02:39 now and I don't trust myself this late at night not to fuck up and merge into master on accident

EvilJackCarver commented 5 years ago

Heh, turns out it actually compiled without me having to touch any of the files.