PsiOmegaDelta 2c8c9df9d2 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	html/changelogs/.all_changelog.yml

2015-06-02 13:35:02 +02:00

..

Chemistry-Reagents

Dev-freeze into dev merge.

2015-05-30 00:31:12 +09:30

dispenser

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

2015-06-02 13:35:02 +02:00

reagent_containers

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

2015-06-02 13:35:02 +02:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Merge remote-tracking branch 'upstream/dev' into chem-kinetics

2015-05-30 17:25:57 -04:00

Chemistry-Machinery.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

Chemistry-Readme.dm

Updates Chemistry-Readme.dm

2015-05-21 12:43:28 +03:00

Chemistry-Reagents.dm

Merge remote-tracking branch 'upstream/dev' into chem-kinetics

2015-05-30 17:25:57 -04:00

Chemistry-Recipes.dm

Merge remote-tracking branch 'upstream/dev' into chem-kinetics

2015-05-30 17:25:57 -04:00

reagent_containers.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

reagent_dispenser.dm

…