Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

Chemistry-Reagents

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

2016-06-13 13:12:40 -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

2016-07-03 16:21:21 -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

Fixes runtimes resulting in chem masters not filling bottles when sprite is never changed.

2016-07-01 12:51:10 -04:00

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

Fixes issues travis found

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

Chemistry-Reagents_vr.dm

Adds in "slime core" reactions to xenobiology

2016-06-08 02:15:10 -04:00

Chemistry-Reagents.dm

Ports GinjaNinja32's drinks rewrite from Bay

2016-06-06 20:33:11 +01:00

Chemistry-Recipes_vr.dm

Update Chemistry-Recipes_vr.dm

2016-06-08 19:02:27 -04:00

Chemistry-Recipes.dm

510 Improved Overlays

2016-06-18 15:50:10 -03: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