Cael_Aislinn 3e650e6d52 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme

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

2012-08-25 01:41:27 +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

datums

* Merged diagonal reaching.

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

defines

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

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

FEA

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

game

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

2012-08-25 01:41:27 +10:00

js

…

modules

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

2012-08-25 01:41:27 +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

Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues.

2012-08-24 16:20:50 +01:00

ZAS

Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues.

2012-08-24 16:20:50 +01: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

removed some obsolete tajaran stuff

2012-08-25 01:17:41 +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