Spamcat 7183a7c3d3 Merge https://github.com/Baystation12/Baystation12

2012-10-23 17:56:00 +04: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

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

2012-10-22 19:35:03 +10:00

defines

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

2012-10-21 01:25:04 +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 https://github.com/Baystation12/Baystation12

2012-10-23 17:56:00 +04:00

js

…

modules

Merge https://github.com/Baystation12/Baystation12

2012-10-23 17:56:00 +04:00

TriDimension

…

unused

…

WorkInProgress

Added internal wound surgery.

2012-10-18 13:32:45 +02:00

ZAS

Readded welder fuel.

2012-10-18 21:25:24 +04:00

global.dm

mergefixes, misc

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

hub.dm

…

names.dm

…

setup_3d.dm

…

setup.dm

merge fixes

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

stylesheet.dm

merge fixes

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

world.dm

mergefixes, misc

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

ZAS_defines.dm

…