LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2018-05-20 23:11:16 -05:00

..

beekeeping

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

grown

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

biogenerator.dm

Fixed stacks sometimes having the wrong amount if created on another stack

2018-05-11 17:30:32 -05:00

gene_modder.dm

Adds swapping disks to the plantmanipulator (#37765)

2018-05-13 16:52:27 -05:00

grown.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

growninedible.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

hydroitemdefines.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

hydroponics.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

plant_genes.dm

It started in a tavern on the edge of Macke town (#37362)

2018-04-23 07:35:09 -05:00

sample.dm

modules - E to L

2018-01-04 00:53:38 -05:00

seed_extractor.dm

Refactors and fixes RPEDs

2018-04-27 13:13:37 -05:00

seeds.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00