a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
added donator
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Merge pull request #43 from Infernus444/master

Fixes and more stuff
A
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
As requested, the "Changelog" button now sends the user to Apophis' COLONIAL MARINES UPDATE LOG forum thread.
Merge pull request #44 from rahlzel/patch-1

As requested, the "Changelog" button now sends the user to Apophis' COLO...
a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Weapon Rebuild Part 1

Initial minor re-structuring of the code
Weapons are now 95% more Lore Friendly
Marine Weapon Vendor moved into the Marine Weapon Code, for ease of
adjusting.
Merge pull request #45 from apophis775/master

Weapon Rebuild Part 1
a
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git
Fixed handcuffs/legcuffs being removed by Admins using "Rejuvenate" on player
Merge pull request #46 from rahlzel/upstream

Fixed handcuffs/legcuffs being removed by Admins using "Rejuvenate" on player
Merge branch 'master' of https://github.com/jaggerestep/ColonialMarines.git