Power fix
Updated for merging
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines
Map updateMap Update:
-Fixed command console in commander's office
-Sulaco Armory now has a button, that LO, MP, or commander can bolt it open
-Sulaco Medical storage lockers now have standard radio headsets
-Fixed equipment lockers having wrong uniforms and armors
-Removed clothes, medical, engineering, standard and leader lockers from squad rooms.
-Squad radio headsets now spawn in squad equipment locker
-Removed night vision goggles

Other Updates:
-LOs and MPs now spawn with a belt that contains colt and 2 magazines
-Replaced the colt box ammunition icon with magazine icon
-Replaced the old riot shield icon with the new one
-Updated preview of the marine on startup
merging
Merge branch 'Infernus44'

Conflicts:
	code/modules/marines/closets.dm
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines
Yanking Code Removal

Felk asked for the yanking code to be removed, it glitches with
predators.
Merge pull request #12 from Infernus444/master

Map update and minor changes
Merge pull request #13 from apophis775/master

Yanking Code Removal
Adding myself to admins.txt
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines