search

addictgamer / Terrastation-13

Custom space station 13 server created by terraform gaming. Based off of TGS and Paradise.
Other
5 stars 8 forks source link

Updating with Bay12 #23

Closed taukausanake closed 10 years ago

taukausanake commented 10 years ago

Should we keep our repo updated with theirs? I was going over some of the commits they made and I don't know if all of them are good. Most might be, others fixes to their other commits. I don't like the idea of others making edits to our flavor of code because we may not want them. It's been three months since the last merge was made and they make changes every day at minimum. What do we want to do with this? A full merge at this point is a bad idea I say.

taukausanake commented 10 years ago

Fuck it. No more merging from Bay12. Way too much stuff from it and the latest doesn't even compile.

addictgamer commented 10 years ago

What. That's bad.