Cael_Aislinn 6bda733e37 Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/inventory.dm

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

2012-10-30 23:53:42 +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

Made stronger EMP pulses have BIGGER chance of exploding robolimb. It was backwards for some reason, so weak pulses had higher chance of explosion.

2012-10-30 07:56:43 +04: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

Readded robolimbs and amputated limbs drawing properly.

2012-10-30 07:59:54 +04:00

js

…

modules

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

2012-10-30 23:53:42 +10:00

TriDimension

…

unused

various mergefixes

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

WorkInProgress

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

2012-10-30 23:53:42 +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

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

setup.dm

RIGs have heat resist.

2012-10-28 23:39:50 +00:00

stylesheet.dm

merge fixes

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

world.dm

Return of the moderator.

2012-10-29 07:12:02 +04:00

ZAS_defines.dm

…