Cael_Aislinn 9f67811427 Merge remote-tracking branch 'remotes/git-svn' 4921 into bs12_with_tgport ...

Conflicts:
	code/game/machinery/computer/HolodeckControl.dm
	code/modules/mob/living/simple_animal/life.dm

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

2012-10-21 02:59:35 +10:00

..

ATMOSPHERICS

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

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

controllers

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

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

datums

mergefixes

2012-10-21 02:22:06 +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 remote-tracking branch 'remotes/git-svn' 4921 into bs12_with_tgport

2012-10-21 02:59:35 +10:00

js

…

modules

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

2012-10-21 02:59:35 +10:00

TriDimension

…

unused

various mergefixes

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

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

fix for internals spawning empty

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

names.dm

…

setup_3d.dm

…

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

…