Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

Chemistry-Reagents

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

dispenser

Reverts the second mob clean up because of incomplete implementation.

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

reagent_containers

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -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

…

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_vr.dm

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

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

Chemistry-Recipes.dm

Semi-final stage of Xenobio2 Initial Implementation

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

reagent_containers.dm

Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent.

2016-04-22 04:58:25 -04:00

reagent_dispenser.dm

Fixes some punctuation

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