Mervill 3f68bd7202 Merge branch 'master' into a_intent ...

Conflicts:
	code/modules/mob/mob_defines.dm

2016-12-04 00:38:37 -08:00

..

beekeeping

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

grown

Merge pull request #21888 from XDTM/VineCodeScaresMe

2016-12-03 21:26:17 +04:00

biogenerator.dm

a_intent now uses defines

2016-12-02 22:27:30 -08:00

gene_modder.dm

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

grown.dm

Snack trash generation rework

2016-11-27 22:01:00 -08:00

growninedible.dm

Allows dice to be rigged and adds microwave_act() (#21545)

2016-11-16 13:14:36 +13:00

hydroitemdefines.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

hydroponics.dm

fix (#21894)

2016-12-03 17:25:05 -05:00

plant_genes.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

sample.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

seed_extractor.dm

a_intent now uses defines

2016-12-02 22:27:30 -08:00

seeds.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00