Qustinnus 2312ff09be Fixing conflicts

2017-07-19 11:19:52 +02:00

..

beekeeping

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

grown

Fixing conflicts

2017-07-19 11:19:52 +02:00

biogenerator.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

gene_modder.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

grown.dm

Plants now react with turfs on squash() (#26752)

2017-05-01 16:34:29 -06:00

growninedible.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

hydroitemdefines.dm

Fixes some null.add_reagents runtimes

2017-04-29 16:09:57 -04:00

hydroponics.dm

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

plant_genes.dm

Lavaland mushrooms and plants can now be cultivated. (#28533)

2017-06-20 20:05:31 -03:00

sample.dm

Replaces /image with /mutable_appearance, where appropriate (#26518)

2017-04-25 12:15:16 +02:00

seed_extractor.dm

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

seeds.dm

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00