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

Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

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

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

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 remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-22 20:15:05 +10:00

js

…

modules

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

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

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

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' into bs12_with_tgport

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

missing files

2012-08-22 20:58:12 +10:00