a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge pull request #79 from apophis775/master

Minor Stuff
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Added Deactivated Reactive Armor for donator fluff
Added Santa Hat fluff for donator
Updates 11DEC2014 Part 1

Shield Generator now acidable
Added Weak Acid and Weak Neurotoxin for Sentinel
Minor adjustments to Sentinel for balancing prior to re-introduction
Updates 11DEC2014 Part 2

Sentinel Evolving enabled
Spitter Balances.
Speed adjustments
Updates 11DEC2014 Part 3

Spitters inherit all Sentinal Powers
Admins can now transform anyone into Spitters and Praetorians
Praetorians have Regular and Super Neurotoxin
Praetorians have regular and Super Acid
Super Acid, has been SUPER nerfed.
Praetorians balances
Merge remote-tracking branch 'upstream/master'