Datraen 349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 ...

# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi

2016-05-25 15:09:23 -04:00

..

Chemistry-Reagents

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

2016-05-25 15:09:23 -04:00

dispenser

Reverts the second mob clean up because of incomplete implementation.

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

reagent_containers

Merge pull request #1710 from Yoshax/fitnessvendor

2016-05-21 12:11:29 -04:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Fix reagent handling, magic numbers, other errors.

2016-04-21 13:39:52 -04:00

Chemistry-Logging.dm

Moderator Logs

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

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

Fixes issues travis found

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

Chemistry-Reagents.dm

Fixes #11520

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

Chemistry-Recipes.dm

Semi-final stage of Xenobio2 Initial Implementation

2016-05-25 03:50:23 -04:00

reagent_containers.dm

Added several mobsize and Teshari checks to reagent processing.

2016-02-08 20:21:04 +10:30

reagent_dispenser.dm

Fixes some punctuation

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