CaelAislinn 03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

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

2012-02-10 09:11:08 +10:00

..

ATMOSPHERICS

added 4-way manifold, t-valve (like a railroad switch)

2012-01-19 22:04:50 -05:00

datums

job titles

2012-02-08 20:43:04 -05:00

defines

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

2012-02-10 09:11:08 +10:00

FEA

turns out things broke from abi's runtime fix because that proc shouldn't ever be called here

2012-02-05 01:07:57 -05:00

game

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

2012-02-10 09:11:08 +10:00

js

…

modules

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

2012-02-10 09:11:08 +10:00

unused

Cleaned up parts of the code, no other changes

2012-02-07 20:05:42 +02:00

WorkInProgress

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

2012-02-10 09:11:08 +10:00

names.dm

…

setup.dm

Added a new slurring variable, and set it up in the right places

2011-12-10 14:25:49 +02:00

stylesheet.dm

Fixed some borkenness with guns, and tried making the command channel readable.

2012-01-22 23:50:58 -07:00