SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -04:00

..

Chemistry-Reagents

Removes adverse effects to Tajaran drinking coffee

2016-07-22 18:07:08 +01: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 item_state

2016-07-13 17:07:52 -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.dm

Ports GinjaNinja32's drinks rewrite from Bay

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

Chemistry-Recipes.dm

Adds new non-alcoholic drinks

2016-07-07 21:51:30 +01: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

changelog and span tags

2016-07-07 20:38:46 -04:00