Ren Erthilo 4f48a518ab Merge fixes.

2012-04-26 18:35:15 +01:00

..

ATMOSPHERICS

TG: Changes to layering of underfloor stuff:

2012-04-22 20:09:46 +01:00

datums

TG: Fixed issue 281 . Rockdtben is working on a more comprehensive fix, but this will

2012-04-25 23:42:23 +01:00

defines

TG: Fixed issue 286 . DNA machines now have to recharge the injector when they're

2012-04-26 00:34:41 +01:00

FEA

Reverts ZAS

2012-04-10 17:38:44 +01:00

game

Merge fixes.

2012-04-26 18:35:15 +01:00

js

…

modules

Merge fixes.

2012-04-26 18:35:15 +01:00

unused

TG: - unticked module/mining/datum_processing_recipe.dm

2012-04-23 22:19:17 +01:00

WorkInProgress

TG: - Added a medsci headset to virology and genetics

2012-04-22 19:54:05 +01:00

ZAS

Unreverts ZAS fix.

2012-04-11 18:32:32 +01:00

names.dm

…

setup.dm

TG: Committing fixes to code for examining mobs. Burn damage wasn't showing properly

2012-04-25 02:06:30 +01:00

stylesheet.dm

Reverts sdisability vars, centcom uniform changes, removed nuke radio colour, command colour, job shuffling.

2012-04-25 19:10:30 +01:00