PsiOmegaDelta f74d9e6862 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm

2015-11-22 11:48:00 +01:00

..

beekeeping

Hive dismantling, build timer, smoker sprite

2015-07-09 10:47:00 +03:00

spreading

Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob

2015-10-14 03:24:28 +03:00

trays

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

_hydro_setup.dm

Fixes #9620

2015-06-10 23:14:33 +09:30

grown_inedible.dm

…

grown_predefined.dm

…

grown.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-11-22 11:48:00 +01:00

seed_controller.dm

…

seed_datums.dm

Tweaks plant traits to specified values.http://baystation12.net/forums/threads/suggestion-more-various-needs-for-station-based-plants.665/ Source of the suggestions.

2015-10-23 17:45:02 -04:00

seed_machines.dm

…

seed_mobs.dm

Fixes #10054, fixes some mushroom issues.

2015-07-09 04:25:36 +09:30

seed_packets.dm

…

seed_storage.dm

[BOTANY] Fixes plant storage nutrient check

2015-09-06 16:42:58 -04:00

seed.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-11-22 11:48:00 +01:00