UristMcStation/UristMcStation — pull request #101 by Glloyd (2014-10-10 20:29:35+00:00)
Title: Motherfucking Merge. Kill Me Right Now.

Read the title. Because this went so long, there's a few things I have to do, and I'll be doing them over the weekend.

TODO:

- [x] merge
- [x] resolve conflicts
- [x] make things compile
- [x] kill self
- [x] fix pipe manifolds
- [ ] fix simple pipes
- [ ] basically fix the entire fucking atmos department
- [ ] re-add hydro trays
- [ ] expand xenoflora (with vents and shit)
- [ ] remove the grab requirement for cuffs
- [ ] remap the supermatter
- [ ] get the arrival shuttle working again
- [ ] add the new things to the map (double check what needs to be added)
- [ ] test
- [ ] update again
- [ ] update the dates on breaking news. Sorry Knox, I didn't get it done as quick as I thought I would, I'm in the middle of midterms.
- [ ] Merge this PR and ask Vactor to update.