PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

dispenser

Fixes #8700

2015-04-01 07:47:15 +01:00

reagent_containers

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

Chemistry-Colours.dm

Cleaning up

2015-02-06 23:55:11 +01:00

Chemistry-Holder.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

Chemistry-Machinery.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

Replaces dummy reagent colours

2014-12-12 16:06:16 -05:00

Chemistry-Reagents.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

Chemistry-Recipes.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

reagent_containers.dm

Refactored nettles and sunflowers into regular plants.

2015-02-04 10:38:56 +10:30

reagent_dispenser.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00