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

Conflicts:
	code/game/vote.dm

Because I did it derpily.

2011-12-03 19:30:28 +10:30

..

Chemistry-Holder.dm

New chem dispenser interface, by Tobba. Some sanity checking in power.dm, by Tobba.

2011-11-20 10:24:17 +02:00

Chemistry-Machinery.dm

Added vending charges, removed clown/mime from main joblist, sec belts fixed

2011-11-30 18:34:43 -05:00

Chemistry-Readme.dm

Just some general cleanup

2011-07-31 21:31:00 +00:00

Chemistry-Reagents.dm

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

2011-12-03 19:30:28 +10:30

Chemistry-Recipes.dm

Small bugfixes including a fix for skinhead hair.

2011-10-21 23:03:04 +00:00

Chemistry-Tools.dm

Fixed issue 222.

2011-12-01 20:02:43 +00:00