NikNakFlak fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife ...

Conflicts:
	code/modules/hydroponics/grown/citrus.dm

2016-08-23 17:08:36 -07:00

..

ambrosia.dm

Hydroponics changes

2016-06-17 10:46:55 -04:00

apple.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

banana.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

beans.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

berries.dm

Hydroponics changes

2016-06-17 10:46:55 -04:00

cannabis.dm

Misc Botany changes. (#19240)

2016-07-11 19:11:54 +12:00

cereals.dm

…

chili.dm

stop the pills (#18703)

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

citrus.dm

Merge remote-tracking branch 'upstream/master' into makelife

2016-08-23 17:08:36 -07:00

cocoa_vanilla.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

corn.dm

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

eggplant.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

flowers.dm

Merge pull request #18481 from phil235/PlantsGunsShit

2016-06-13 00:14:29 +12:00

grass_carpet.dm

…

kudzu.dm

…

melon.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

misc.dm

Makes cherry bombs auto-delete on explosion

2016-06-17 10:51:51 -04:00

mushrooms.dm

adds growth serum, puts it in fly amanita (#19654)

2016-08-05 11:58:19 +12:00

nettle.dm

…

potato.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

pumpkin.dm

Fixes grille/New() not calling ..()

2016-06-11 23:18:26 +02:00

replicapod.dm

More fixes

2016-06-13 12:43:25 +03:00

root.dm

Replace istype with is_sharp

2016-07-18 21:45:25 -07:00

tea_coffee.dm

…

tobacco.dm

…

tomato.dm

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

towercap.dm

Bonfires from Botany

2016-08-08 04:07:18 -07:00