Downgraded ammunition locker to a regular closet

The armory doesn't need two secure lockers, and certainly not one just to hold beanbag shells.
Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
Merge pull request #4934 from Ikarrus/ammunitionlocker

Downgraded ammunition locker to a regular closet