carnie 3a70153d01 Merge branch 'master' of github.com:tgstation/-tg-station into DNAfix ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

2013-05-20 00:33:42 +01:00

..

biogenerator.dm

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

grown.dm

-Recodes glowshrooms.

2013-03-17 19:24:51 -05:00

growninedible.dm

Replaced most reagent initialisations with the helper proc create_reagents().

2013-04-15 15:40:33 +01:00

hydroitemcode.dm

update_icons.dm changes for humans. This ties in with the dna changes and the changes to skin_tone and hair colours

2013-05-10 18:41:08 +01:00

hydroitemdefines.dm

-Soap can clean microwaves too now!

2013-02-25 09:36:35 +00:00

hydroponics.dm

Resolves #283

2013-04-24 09:37:30 +01:00

seed_extractor.dm

-Moves the biogen and sextractor code into the hydroponics module folder, moves the optable code into /structures.

2013-02-24 00:23:31 +00:00

seeds.dm

…