Cael_Aislinn 6fc9aab4f6 some merge fixes ...

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

2012-10-12 18:21:50 +10:00

..

ATMOSPHERICS

various mergefixes

2012-10-09 22:49:38 +10:00

controllers

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

2012-10-05 22:21:26 +10:00

datums

Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport

2012-10-09 23:07:41 +10:00

defines

Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

2012-10-12 17:53:17 +10:00

FEA

cart.dm: Removed a useless line in my commit from r2436.

2012-09-25 10:08:49 +00:00

game

some merge fixes

2012-10-12 18:21:50 +10:00

js

…

modules

some merge fixes

2012-10-12 18:21:50 +10:00

TriDimension

…

unused

various mergefixes

2012-09-22 21:37:42 +10:00

WorkInProgress

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

2012-10-05 22:21:26 +10:00

ZAS

various mergefixes

2012-09-22 21:37:42 +10:00

global.dm

tweaks to game start / admins, fixe for adjacent reaching not working

2012-10-10 00:41:50 +10:00

hub.dm

fix for internals spawning empty

2012-09-22 22:46:02 +10:00

names.dm

…

setup_3d.dm

…

setup.dm

various mergefixes

2012-10-09 22:49:38 +10:00

stylesheet.dm

Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

2012-10-12 17:53:17 +10:00

world.dm

fix for moderators not being loaded correctly

2012-10-12 13:44:23 +10:00

ZAS_defines.dm

…