deathride58 1f6b3ce629 Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

..

beekeeping

Makes drinking glasses smash when thrown

2017-11-20 02:45:22 -06:00

grown

Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482

2017-11-15 11:13:56 -06:00

biogenerator.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

gene_modder.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

grown.dm

Fixes grown runtime spam

2017-10-01 15:20:07 -05:00

growninedible.dm

Update growninedible.dm

2017-10-01 22:38:55 -05:00

hydroitemdefines.dm

Removes hardcoded "full bottle" icons from several pre-filled reagent bottles

2017-10-16 00:00:52 -05:00

hydroponics.dm

Fixes hydroponics not properly dealing with fluorine (#32813)

2017-11-17 12:50:11 -06:00

plant_genes.dm

Fixes inconsistencies w/ energy descriptions

2017-11-18 14:18:14 -06:00

sample.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

seed_extractor.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

seeds.dm

JSON feedback

2017-11-17 01:44:12 -06:00