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

..

ambrosia.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

apple.dm

[MIRROR] Remove poisoned apple (#5640)

2018-02-21 19:47:15 -06:00

banana.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

beans.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

berries.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

cannabis.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

cereals.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

chili.dm

things with stuff (#6233)

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

citrus.dm

…

cocoa_vanilla.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

corn.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

eggplant.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

flowers.dm

Uppercases slot defines.

2018-04-27 20:14:39 -05:00

grass_carpet.dm

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

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

kudzu.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

melon.dm

Refactors anti-magic into a component

2018-02-25 14:45:51 -06:00

misc.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

mushrooms.dm

Mushroom people, revived!

2018-03-07 21:47:42 -06:00

nettle.dm

[MIRROR] Converts several species traits into generic traits (#5710)

2018-03-05 12:34:01 -06:00

onion.dm

Merge pull request #35606 from coiax/hydroponic-foods-taste

2018-02-15 14:52:26 -06:00

pineapple.dm

Merge pull request #37513 from ShizCalev/pineapple-memes

2018-04-30 13:02:05 -05:00

potato.dm

Fixes plant juicing (#33896)

2017-12-29 02:56:22 -06:00

pumpkin.dm

[MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)

2018-02-04 22:07:17 -06:00

random.dm

modules - E to L

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

replicapod.dm

Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code

2018-05-06 16:37:13 -05:00

root.dm

…

tea_coffee.dm

…

tobacco.dm

…

tomato.dm

[MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)

2018-02-04 22:07:17 -06:00

towercap.dm

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

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