Erthilo 5a75e606a6 Merge branch 'bs12_with_tgport' of git://github.com/caelaislinn/Baystation12 into TGUpdates ...

Conflicts:
	baystation12.dme

2012-08-24 16:35:18 +01:00

..

admin

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

assembly

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

chemical

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

client

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

clothing

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

critters

…

customitems

…

detectivework

…

DetectiveWork

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

flufftext

…

food

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

icon generation

…

library

…

maps

…

mining

compile fix

2012-08-24 22:19:57 +10:00

mob

Merge branch 'bs12_with_tgport' of git://github.com/caelaislinn/Baystation12 into TGUpdates

2012-08-24 16:35:18 +01:00

paperwork

Scrubbed Mime and Clown references. Fixed invisible mutantrace people. Added Tajaran to mutantrace options.

2012-08-23 16:20:40 +01:00

power

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

projectiles

Removed detective revolver check.

2012-08-24 00:01:08 +01:00

reagents

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

recycling

…

research

…

scripting

…

security levels

…