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

Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

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

2012-10-29 02:19:28 +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 pull request #1821 from comma/master

2012-10-23 08:47:30 -07:00

defines

Reverted clown coords changes on Cael's request, he has something for that in his pull request.

2012-10-23 12:45:08 +04: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 pull request #1848 from Hawk-v3/master

2012-10-28 03:31:39 -07:00

js

…

modules

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

2012-10-29 02:19:28 +10:00

TriDimension

…

unused

various mergefixes

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

WorkInProgress

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

2012-10-29 02:19:28 +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

fix for internals spawning empty

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

names.dm

…

setup_3d.dm

…

setup.dm

made fire extinguishers not freeze everything

2012-10-27 19:20:51 +10:00

stylesheet.dm

merge fixes

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

world.dm

Commented out end-round sounds, and banging donks.

2012-10-23 00:14:17 -04:00

ZAS_defines.dm

…