Reverted back the new map
Buffed marines weapons a bit
Disabled voice so I could reenable python.

Fixed resin nest resist spam
Adjusted the time, way too long.
Fixed misspelling in Alpha locker's icon, was spelled "ahlpa"
Idiot
Fixed new helmets not having squad markings.
Admin file update

Re-ordered the list so it's less stupid
Removed Deadmins, re-added caryl
FIXING A CONFLICT
Admin File update

Again... this time fixed.
Merge pull request #23 from Infernus444/master

Reverted back the new map
Disabled text to speech
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge remote-tracking branch 'upstream/master'
Merge pull request #22 from apophis775/master

Admin File Update
Merge pull request #25 from Infernus444/master

Buffed marines weapons a bit
a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Minor Bugfixed

Sentinel fixed
Commander given access_robotics
Removed ability to hand Xenos anything (ghetto fix)
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge pull request #26 from apophis775/master

Apop Bugfix