Neerti 95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync ...

Conflicts:
	polaris.dme

2015-08-03 22:13:18 -04:00

..

Chemistry-Reagents

Revert "Replaces gaseous reagents with organic chemistry ones."

2015-07-26 22:43:40 -04:00

dispenser

Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes.

2015-07-26 23:20:42 -04:00

reagent_containers

Chemical logging improvements

2015-07-29 07:55:30 +01:00

Chemistry-Colours.dm

Updates chemistry colors

2015-04-28 09:23:39 +03:00

Chemistry-Holder.dm

Chemical logging improvements

2015-07-29 07:55:30 +01:00

Chemistry-Logging.dm

Chemical logging improvements

2015-07-29 07:55:30 +01:00

Chemistry-Machinery.dm

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

2015-07-26 10:21:36 +02:00

Chemistry-Metabolism.dm

Moves metabolism to a holder subtype

2015-06-16 16:26:06 -04:00

Chemistry-Readme.dm

Adjusts usages of reagent transfer procs

2015-06-10 00:03:08 -04:00

Chemistry-Reagents.dm

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

2015-06-19 10:19:08 +02:00

Chemistry-Recipes.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync

2015-08-03 22:13:18 -04:00

reagent_containers.dm

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

2015-06-19 10:19:08 +02:00

reagent_dispenser.dm

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

2015-06-26 20:28:47 +02:00