Brig Fixes

Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
Renames "laser gun" to "laser carbine"
More Fixes

Changes detective's office to better looking and flowing version, adds a
few more lights in places, updates security job numbers for new spawn
count.
Even more fixes

small fixes, biggest ones are airlock controllers
Merge pull request #6006 from Raptor1628/dev

Brig Fixes
Merge pull request #6009 from mwerezak/laser

Renames "laser gun" to "laser carbine"
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea

Conflicts:
	maps/tgstation2.dmm