Phase one merge
Phase two merge - merge should be complete~
Edited readme, some other things I am not positive what they do but whatever not like they are gonna break something.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Bleh, still learning GIT
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Makes lattices immune to the bluespace event.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Fixing crap on my own repo. This is a draw back of git it seems (nothing changed)
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
- Rewords traitor's instructions regarding code words to read that they don't need to be used in order.
- Added several new items for traitors to steal. Play to find out what they are (or be a lameass and read the code)
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station