Pete Goodfellow 46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry ...

Conflicts:
	code/game/objects/items/weapons/tools.dm

2013-05-12 15:09:21 +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

Changes for all the different update icons procs of humans and monkeys, they now update their own sprite and hud icon (if it's a proc of a slot item) without having to call for update_icons().

2013-03-04 05:01:07 +00: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

…