Aurora.3

mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00

Files

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

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

…

game

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

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

…

modules

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

2012-08-24 16:35:18 +01: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

Compile fix

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