a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Map updates:
-Each medic squad area gets one febibrillator
-Sulaco medics will get a recharger in medical storage to recharge them
-You can now enter cloning bay trough the window, since the sleeper is no longer dense
-You can now access the chair in recovery room, but you may still get hit by a can..
-Defibrillators in Nostromo Medbay
-Added another vent in aft part of Sulaco
-General armory now has riot shields
a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge pull request #123 from apophis775/master

Admin Update
Merge pull request #122 from Infernus444/master

Map updates
Ban Log
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Fix from Remote Host