Cael_Aislinn 66b8f4719d Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport ...

Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/machinery/teleporter.dm

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

2012-08-22 04:21:53 +10: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

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

2012-08-22 04:21:53 +10:00

defines

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

2012-08-22 04:21:53 +10:00

FEA

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

game

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

2012-08-22 04:21:53 +10:00

js

…

modules

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

2012-08-22 04:21:53 +10:00

TriDimension

Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...

2012-08-12 18:41:27 -07:00

unused

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

WorkInProgress

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport. May have overwritten some tweaks from Sky here.

2012-08-22 04:19:23 +10:00

ZAS

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport. May have overwritten some tweaks from Sky here.

2012-08-22 04:19:23 +10:00

access_defines.dm

…

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

Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...

2012-08-12 18:41:27 -07:00

setup.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport. May have overwritten some tweaks from Sky here.

2012-08-22 04:19:23 +10:00

stylesheet.dm

…