Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm

2017-03-22 17:29:01 -05:00

..

Chemistry-Reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

dispenser

Fixes a tea related issue

2017-03-16 00:15:33 +00:00

reagent_containers

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Ports taste

2017-01-16 17:07:41 -06:00

Chemistry-Logging.dm

Moderator Logs

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

Chemistry-Machinery.dm

Adds ability to add food to the chem master because the condimaster is beyond broken

2017-03-10 17:00:31 +00:00

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

Fixes issues travis found

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

Chemistry-Reagents-Helpers.dm

More Circuit Ports by Psi

2016-09-29 23:49:34 -04:00

Chemistry-Reagents.dm

Ports taste

2017-01-16 17:07:41 -06:00

Chemistry-Recipes.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2

2017-03-22 17:29:01 -05:00

reagent_containers.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

reagent_dispenser.dm

Fixes water-cooler runtime.

2016-12-06 22:38:52 +00:00