Cael_Aislinn 2a07ba0f6e mergefixes ...

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

2012-10-21 01:04:37 +10:00

..

ATMOSPHERICS

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

2012-10-21 00:25:05 +10:00

controllers

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

2012-10-21 00:25:05 +10:00

datums

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

2012-10-21 00:25:05 +10:00

defines

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

2012-10-21 00:25:05 +10:00

FEA

Fix for borked atmos on away missions. This may still need some further tweaking, but it definitely fixes the issue. I looked at the powernet issue too, but I couldn't reproduce it anymore. Maybe it's fixed.

2012-10-16 02:08:51 +00:00

game

mergefixes

2012-10-21 01:04:37 +10:00

js

…

modules

mergefixes

2012-10-21 01:04:37 +10:00

TriDimension

…

unused

various mergefixes

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

WorkInProgress

Added a new surgery system.

2012-10-12 11:09:21 -07:00

ZAS

various mergefixes

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

global.dm

mergefixes, misc

2012-10-21 00:11:01 +10:00

hub.dm

fix for internals spawning empty

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

names.dm

…

setup_3d.dm

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

setup.dm

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

2012-10-21 00:25:05 +10:00

stylesheet.dm

Fixed Moderator text color in OOC + Mods no longer see admin logs

2012-10-13 03:39:33 -07:00

world.dm

mergefixes, misc

2012-10-21 00:11:01 +10:00

ZAS_defines.dm

…