Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 ...

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

2017-05-08 21:07:45 -04:00

..

Chemistry-Reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04: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 polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

…

Chemistry-Logging.dm

…

Chemistry-Machinery_vr.dm

…

Chemistry-Machinery.dm

Robots, cyborgs, etc can now use grinders in the kitchen and chemlab

2017-03-28 20:47:38 -05:00

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

…

Chemistry-Reagents_vr.dm

…

Chemistry-Reagents-Helpers.dm

…

Chemistry-Reagents.dm

Overdose is more dangerous, Bicaridine works again

2017-03-30 20:09:21 -05:00

Chemistry-Recipes_vr.dm

Adds Adranol

2017-05-01 16:03:11 -04:00

Chemistry-Recipes.dm

Stimm recipe changed

2017-04-21 22:05:14 -05:00

reagent_containers.dm

…

reagent_dispenser.dm

…