Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

Chemistry-Reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

dispenser

Take two. New drinks (#4259)

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

reagent_containers

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

work

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

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

Band-aids three runtimes (#4591)

2018-01-20 13:28:51 -06:00

Chemistry-Recipes_vr.dm

Lowers slime jelly cost, ups nutriment cost.

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

Chemistry-Recipes.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05: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