Traitors + Kidan + Machinelanguage

sshado / Aphelion-Code

The code for Baystation12's branch of SS13

http://baystation12.net/

Other

4 stars 8 forks source link

Closed walmartcheapo closed 8 years ago

walmartcheapo commented 8 years ago

Probably the changelogs making it un-merge-able.

walmartcheapo commented 8 years ago

Conflicts are mob/uniform.dmi and obj/clothing/suits.dmi Fixing

BlueNexus commented 8 years ago

Has this been tested?

walmartcheapo commented 8 years ago

Yup.

walmartcheapo commented 8 years ago

It appears this is attempting to revert some other changes made by some other devs for some reason--let me try and fix that.

walmartcheapo commented 8 years ago

Done. I've tested all the changes I personally made. Feel free to merge.