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

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

customitems

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

detectivework

First part of a fix for issue 818.

2012-08-22 18:56:31 +00:00

DetectiveWork

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

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

flufftext

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

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

Adding some (currently unused) icon generation stuff

2012-05-30 17:54:33 -04:00

library

Changes to the file structure!

2012-08-22 15:50:09 +00:00

maps

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

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

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

research

rename and rework some xenoarch files slightly, some compile fixes (WIP integration)

2012-08-22 21:30:21 +10:00

scripting

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

security levels

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00