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

..

ATMOSPHERICS

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

controllers

Merge tgstation13 r4570 into bs12_with_tgport

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

datums

Merge tgstation13 r4570 into bs12_with_tgport

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

defines

Merge tgstation13 r4570 into bs12_with_tgport

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

FEA

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

game

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

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

js

…

modules

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

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

TriDimension

…

unused

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

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

WorkInProgress

renamed the old scanner, reorganised and cleared up some WIP stuff of mine

2012-08-25 03:34:12 +10:00

ZAS

Merge tgstation13 r4570 into bs12_with_tgport

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

global.dm

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

names.dm

…

setup_3d.dm

…

setup.dm

Merge tgstation13 r4570 into bs12_with_tgport

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

stylesheet.dm

* Merged diagonal reaching.

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

ZAS_defines.dm

missing files

2012-08-22 20:58:12 +10:00