Cael_Aislinn 2b44f0cd93 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/modules/clothing/gimmick.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi

removed dresses etc, will reapply manually

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-08-28 20:26:58 +10:00

..

admin

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

assembly

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10: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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-08-28 20:26:58 +10: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

…

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

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

mob

Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

2012-08-28 20:22:22 +10:00

paperwork

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

power

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

projectiles

Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

2012-08-28 20:22:22 +10:00

reagents

Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

2012-08-28 20:22:22 +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