mwerezak deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status. ...

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm

2016-04-22 04:57:23 -04:00

..

Chemistry-Reagents

Fixes #1171

2016-03-21 14:22:44 +03:00

dispenser

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

reagent_containers

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

2016-04-22 04:57:23 -04:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Fixes chemical explosions

2016-03-14 12:21:35 +03:00

Chemistry-Logging.dm

Moderator Logs

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

Chemistry-Machinery.dm

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03: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

Amends gargle blaster recipe

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

reagent_containers.dm

Refactors various item attack() implementations

2016-04-22 04:57:22 -04:00

reagent_dispenser.dm

Fixes some punctuation

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