Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Hydroponics Plant Size Scaling!

Plants now get resized, based on their potency!
(Except for logs and sunflowers because they're snowflakes)

screenshot:
http://puu.sh/5iJws.png
fixes server-breaking lagloops of disposal tiles.
unshittied the code as much as i can
unshittied it finally and hopefully actually finally today.
i am a master coder
Merge pull request #2317 from Miauw62/honk

fixes server-breaking lagloops of disposal tiles.
i missed exactly one
Merge pull request #2369 from sirbayer/srsbsns-panicmeleedoesntwork

Fixes humans not taking melee damage.
updated my journal... and yours as well.
Merge pull request #2372 from dumpdavidson/emplog

Changelog for emp kit upgrade and emp fix
Merge pull request #2138 from Cheridan/hydro

[501] Hydroponics Plant Size Scaling
Merge branch 'master' of https://github.com/tgstation/-tg-station into 501
Fixed the .dme