phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

beekeeping

Removes ishuman() check for beekeeping

2016-04-21 17:54:17 +01:00

grown

Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment

2016-05-05 21:57:10 +02:00

biogenerator.dm

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

gene_modder.dm

Nerfs Potency gene extraction

2016-04-25 11:53:08 +03:00

grown.dm

Nerfs botany slippery-everything

2016-04-27 06:34:11 +03:00

growninedible.dm

Nerfs botany slippery-everything

2016-04-27 06:34:11 +03:00

hydroitemdefines.dm

Added hatchet datum to autolathe_designs.dm, formatting in autolathe_designs.dm and hydroitemdefines.dm

2016-04-04 21:20:03 +01:00

hydroponics.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

plant_genes.dm

Nerfs botany slippery-everything

2016-04-27 06:34:11 +03:00

sample.dm

Adds Plant Samples for future use

2016-03-15 04:29:36 +03:00

seed_extractor.dm

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

seeds.dm

Nerfs botany slippery-everything

2016-04-27 06:34:11 +03:00