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

Conflicts:
	code/WorkInProgress/Cael_Aislinn/MultiZ.dm

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

2012-02-06 02:51:49 +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 git://github.com/Baystation12/Baystation12

2012-02-06 02:51:49 +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-06 02:51:49 +10:00

js

…

modules

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

2012-02-06 02:51:49 +10: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-06 02:51:49 +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