Albert Iordache 0d19e9c7b3 Merge pull request #434 from Miniature/master ...

Added a thing to select pill and bottle sprites to the chemmaster

2012-02-16 08:21:13 -08: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 pull request #432 from Tastyfish/master

2012-02-15 19:11:30 -08:00

FEA

Merge remote-tracking branch 'upstream/master'

2012-02-13 01:12:13 -05:00

game

Merge pull request #432 from Tastyfish/master

2012-02-15 19:11:30 -08:00

js

…

modules

Merge pull request #434 from Miniature/master

2012-02-16 08:21:13 -08:00

unused

Cleaned up parts of the code, no other changes

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

WorkInProgress

Merge remote-tracking branch 'upstream/master'

2012-02-14 12:01:14 -05: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