PsiOmega 7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm

2015-03-20 08:44:52 +01:00

..

dispenser

Remove medicine crate and medicine cartridge crates

2015-03-16 21:24:30 +00:00

reagent_containers

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

2015-03-20 08:44:52 +01:00

Chemistry-Colours.dm

Cleaning up

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

Chemistry-Holder.dm

Mixing of paint

2015-02-01 22:54:18 +01:00

Chemistry-Machinery.dm

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

2015-03-20 08:44:52 +01:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

Replaces dummy reagent colours

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

Chemistry-Reagents.dm

Merge pull request #8317 from Baystation12/master

2015-02-28 17:01:42 +10:30

Chemistry-Recipes.dm

Numerous kitchen changes in tandem with prior commit. Removed processor.

2015-02-21 22:24:01 +10:30

reagent_containers.dm

Refactored nettles and sunflowers into regular plants.

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

reagent_dispenser.dm

Gear again

2015-02-18 15:35:37 -05:00