Tons of minor changes based on PiratePad feedback.
LET'S TRY THIS AGAIN
Merge remote-tracking branch 'remotes/upstream/master' into bleeding-edge-freeze

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
Merge pull request #2267 from comma/master

More fixes
ARGH
Also I fixed the engine slightly
Merge pull request #2265 from Gamerofthegame/bleeding-edge-freeze

Map fixes
Merge pull request #2271 from comma/master

Fixes Take Three
Merge branch 'master' of https://github.com/Baystation12/Baystation12
map derp fixes (step_x step_y)
Did it get reverted or something... witchery.
Anyway, mods jumpy again.
readded missing tramadol reagent
Missing PM link in msay.
Due to git tree being fucked up for some reason, manually reapplied many man many fixes.
Just got to tip of real tree and got zipball, then unpacked it here.
Merge pull request #2278 from comma/master

More fixes
Removed xenoboobs from premises.
Added lung fixing and disease curing things to adminrevive.
Fixed typo in AttoUrney's job.
Fixed issue with newscaster channels not working with ' in them.
Merge branch 'master' of https://github.com/Baystation12/Baystation12