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

Conflicts:
	code/unused/toilets.dm
	maps/tgstation.2.0.8.dmm

2012-02-04 22:36:42 +10:00

..

ATMOSPHERICS

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

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

datums

Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.

2012-02-02 00:35:48 -07:00

defines

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

2012-02-03 20:29:16 +10:30

FEA

Fix for an atmos runtime error.

2012-02-04 11:38:26 +02:00

game

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

2012-02-04 22:36:42 +10:00

js

…

modules

Merge pull request #352 from Hawk-v3/master

2012-02-03 18:25:27 -08:00

unused

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

2012-02-04 22:36:42 +10:00

WorkInProgress

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

2012-02-04 22:36:42 +10:00

names.dm

…

setup.dm

…

stylesheet.dm

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

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