Cael_Aislinn 739e965b5f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme ...

Conflicts:
	baystation12.dme

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

2012-11-03 12:21:54 +10:00

..

ATMOSPHERICS

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

2012-10-22 20:15: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

Added warning messages before vomiting.

2012-10-31 14:36:09 +04:00

defines

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme

2012-11-03 12:21:54 +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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme

2012-11-03 12:21:54 +10:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme

2012-11-03 12:21:54 +10:00

TriDimension

…

unused

…

WorkInProgress

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

2012-10-30 23:53:42 +10:00

ZAS

some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug

2012-10-27 23:39:17 +10:00

global.dm

mergefixes, misc

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

hub.dm

…

names.dm

…

setup_3d.dm

…

setup.dm

RIGs have heat resist.

2012-10-28 23:39:50 +00:00

stylesheet.dm

merge fixes

2012-10-22 20:25:27 +10:00

world.dm

Return of the moderator.

2012-10-29 07:12:02 +04:00

ZAS_defines.dm

…