new map stuff
walls
stool
Merge branch 'master' of https://github.com/tgstation/-tg-station into assblastusamap

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
FUCK YOU GIT
Merge pull request #5115 from paprka/assblastusamap

[MAP] Science! No conflicts edition
Merge branch 'master' of https://github.com/tgstation/-tg-station into mininglocker

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm