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

..

devices

Refactors various item attack() implementations

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

robot

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

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

stacks

Merge branch 'master' into cleanupTwo

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

weapons

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

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

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Makes stasis bags better.

2016-02-08 17:19:38 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Mob inventory cleanup

2016-03-24 01:23:08 +03:00

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Fixes issues travis found

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

trash.dm

…