Cael_Aislinn 6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress ...

Conflicts:
	code/modules/customitems/item_defines.dm

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

2012-12-03 13:08:47 +10:00

..

ATMOSPHERICS

antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

2012-12-01 17:49:34 +10:00

controllers

Fix the issue with time not counting down before game start.

2012-11-24 19:13:15 +01:00

datums

Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle.

2012-12-02 00:02:43 +04:00

defines

WIP stuff for skin styles sprite accessory

2012-12-01 18:07:02 +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 branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress

2012-12-03 13:08:47 +10:00

js

…

modules

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

2012-12-03 13:08:47 +10:00

TriDimension

…

unused

various mergefixes

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

WorkInProgress

antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

2012-12-01 17:49:34 +10:00

ZAS

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

2012-11-17 00:20:23 +04:00

global.dm

updated DNA code to have more mutations

2012-11-10 14:12:25 +04: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

Possible fix for air tanks running out too quickly.

2012-11-27 12:36:52 +01:00

stylesheet.dm

Changed Command Channel color to more visible one.

2012-11-06 21:23:58 +04:00

world.dm

Hopeful fix for NT status.

2012-11-21 21:51:51 +00:00

ZAS_defines.dm

…