PsiOmega 710abd0921 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/spells/mind_transfer.dm

2015-03-29 16:23:06 +02: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-29 16:23:06 +02: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

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

Chemistry-Readme.dm

…

Chemistry-Reagents-Antidepressants.dm

…

Chemistry-Reagents.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +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