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

..

beekeeping

Mob inventory cleanup

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

spreading

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

trays

Refactors various item attack() implementations

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

_hydro_setup.dm

Fixes #9620

2015-06-10 23:14:33 +09:30

grown_inedible.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

grown_predefined.dm

Readds predefined ambrosia items.

2015-02-13 05:53:45 +10:30

grown.dm

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

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

seed_controller.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

seed_datums.dm

Removed xenomorphs.

2016-02-20 11:50:18 +10:30

seed_machines.dm

Merge branch 'master' into cleanupTwo

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

seed_mobs.dm

Fixes #10054, fixes some mushroom issues.

2015-07-09 04:25:36 +09:30

seed_packets.dm

Fight me 2, fight me boogaloo.

2016-01-24 00:47:52 +00:00

seed_storage.dm

Mob inventory cleanup

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

seed.dm

Construction Update

2016-03-25 16:02:36 -04:00