SkyMarshal fd646824ec Merge pull request #921 from Erthilo/master ...

Fixes Special Ops shuttle return bug

2012-04-25 16:54:08 -07:00

..

ATMOSPHERICS

TG: Changes to layering of underfloor stuff:

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

datums

TG: Adds a option to config.txt called PROTECT_ROLES_FROM_ANTAGONIST.

2012-04-25 00:59:01 +01:00

defines

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-25 18:57:20 +01:00

FEA

Reverts ZAS

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

game

Merge pull request #921 from Erthilo/master

2012-04-25 16:54:08 -07:00

js

…

modules

Removed an anti-adminimpostor warning from receiving telepathy messages (we really shouldn't need it), and made subtlemessage be thinking like on oldcode.

2012-04-26 08:46:32 +09:30

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