Arokha Sieyes 76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync ...

# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).

2016-05-26 09:59:18 -04:00

..

Chemistry-Reagents

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

2016-05-26 09:59:18 -04:00

dispenser

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

reagent_containers

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

2016-05-26 09:59:18 -04:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

…

Chemistry-Logging.dm

…

Chemistry-Machinery.dm

Change chemmaster custom preset to 15 and adds options for 30 and 60 units (#1548)

2016-05-04 23:23:59 -04:00

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

Fixes #11520

2016-04-18 15:16:31 +01:00

Chemistry-Recipes_vr.dm

Issue #4 - Porting resize (micro/macro) systems.

2016-05-08 23:11:03 -04:00

Chemistry-Recipes.dm

Amends gargle blaster recipe

2016-03-16 17:56:02 +01:00

reagent_containers.dm

…

reagent_dispenser.dm

Fixes some punctuation

2016-04-15 01:01:58 -04:00