Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 ...

# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm

2018-01-15 13:27:39 -05:00

..

Chemistry-Reagents

Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10

2018-01-15 13:27:39 -05:00

dispenser

Take two. New drinks (#4259)

2017-12-09 16:25:06 -06:00

reagent_containers

vegitables

2018-01-11 22:37:23 -05:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

…

Chemistry-Logging.dm

…

Chemistry-Machinery_vr.dm

…

Chemistry-Machinery.dm

Grind up some more stuff! (#4423)

2017-12-17 13:43:10 -08:00

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

…

Chemistry-Reagents_vr.dm

Advanced NIF Repair Tool

2018-01-08 17:14:56 -05:00

Chemistry-Reagents-Helpers.dm

…

Chemistry-Reagents.dm

Adds a Trait system (#4048)

2017-10-13 01:17:39 -05:00

Chemistry-Recipes_vr.dm

Lowers slime jelly cost, ups nutriment cost.

2018-01-07 00:35:30 -05:00

Chemistry-Recipes.dm

Dropper and bloodpack improvements (#4453)

2017-12-31 11:49:20 -08:00

reagent_containers.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

reagent_dispenser.dm

Fixes High Cap water tanks, lets drones move tanks again.

2017-12-04 17:43:57 -06:00