new map stuff
walls
adds mining equipment vendor to mining dock
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 branch 'master' of https://github.com/tgstation/-tg-station into mininglocker

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
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
Merge pull request #5125 from paprka/mininglocker

Adds mining equipment vendor to mining dock
Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm