Miniature 2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/vote.dm

Because I did it derpily.

2011-12-03 19:30:28 +10:30

..

admin

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2011-12-03 19:30:28 +10:30

assembly

Signalers will now work with the PDA Signalers.

2011-11-21 07:25:48 +00:00

chemical

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2011-12-03 19:30:28 +10:30

clothing

Re-added PALADIN to the upload because people were complaining (corporate is still there though)

2011-11-22 11:11:58 +00:00

critters

Implemented more getters/setters for damage system. 2

2011-11-26 13:33:18 +00:00

food

Replacing monkie with monkey...

2011-11-28 19:39:22 +00:00

mining

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-03 19:28:10 +10:30

mob

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2011-12-03 19:30:28 +10:30

power

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-03 19:28:10 +10:30

projectiles

Fixed the recharge rates on the captain's laser, energy crossbow, and advanced energy gun.

2011-12-02 00:33:21 +00:00

recycling

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

2011-12-03 19:28:10 +10:30

research

Nanotrasen laws, nobody likes you asimov

2011-11-30 19:23:37 -05:00