phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm

2016-10-19 01:56:02 +02:00

..

beekeeping

stop the pills (#18703)

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

grown

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00

biogenerator.dm

Contents_explosion() tweaks (#20934)

2016-10-16 10:01:37 +13:00

gene_modder.dm

More istypes replaced with helpers (#20767)

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

grown.dm

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

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

growninedible.dm

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

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

hydroitemdefines.dm

Suicide now uses the pronoun helpers (#20973)

2016-10-18 14:36:38 +13:00

hydroponics.dm

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02: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

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

seeds.dm

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

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