mwerezak 07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm

2015-10-15 07:08:16 -04:00

..

beekeeping

Hive dismantling, build timer, smoker sprite

2015-07-09 10:47:00 +03:00

spreading

Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob

2015-10-14 03:24:28 +03:00

trays

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -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

…

grown.dm

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

2015-09-09 13:58:45 -04:00

seed_controller.dm

…

seed_datums.dm

Xenomorph Queens can now infest victims.

2015-09-21 20:36:51 +09:30

seed_machines.dm

Fixes #9234

2015-05-15 13:53:01 +09:30

seed_mobs.dm

Fixes #10054, fixes some mushroom issues.

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

seed_packets.dm

…

seed_storage.dm

[BOTANY] Fixes plant storage nutrient check

2015-09-06 16:42:58 -04:00

seed.dm

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30