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/Ikarrus/-tg-station
[MAP] Fixed batons in the thunderdome not having a cell.
Merge pull request #590 from Ikarrus/thunderbaton

[MAP] Fixed batons in the thunderdome not having a cell