Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

Chemistry-Reagents

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

dispenser

Take two. New drinks (#4259)

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

reagent_containers

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

work

2017-09-04 21:52:47 -04:00

Chemistry-Logging.dm

Moderator Logs

2015-11-29 13:34:00 -05:00

Chemistry-Machinery_vr.dm

Fixes the pixels.

2017-02-01 01:27:13 -05:00

Chemistry-Machinery.dm

Grind up some more stuff! (#4423)

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

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

Fixes issues travis found

2016-03-11 11:59:51 +03:00

Chemistry-Reagents_vr.dm

Allows acquisition of mutation toxin

2017-10-07 16:01:02 -04:00

Chemistry-Reagents-Helpers.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

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