Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

beekeeping

Hive dismantling, build timer, smoker sprite

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

spreading

Mob size tweaks.

2015-09-20 17:12:07 +02:00

trays

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

_hydro_setup.dm

Fixes #9620

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

grown_inedible.dm

…

grown_predefined.dm

…

grown.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

seed_controller.dm

…

seed_datums.dm

Fixes #9777

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

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 branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00