Hydroponics tray is now a machine that can be upgraded with bigger matter bins for more water and nutriment capacity.
Tray icons will now only update when necessary.
Added cream, plant bag and mining satchel to biogenerator.
Biogenerator's messages are now shown on top of the menu, instead of a separate screen.
Examining the tray now tells you the name of the plant.
Hydroponics trays start without nutriment, more E-Z-Nutriment added to vendor to compensate
Seed vending machine's contents are now sorted.
Less snowflake-y
Update2
Readded kitty ears

Not on the map yet, gonna do that next I suppose.
Merge branch 'master' of https://github.com/tgstation/-tg-station into revenge_of_kitty_ears

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

Fucking laser tag helmets were conflicting. Lucky me!
A lot of Stuff From: #2849

https://github.com/tgstation/-tg-station/pull/2849
fix
boom - will redo
Map
Fixed #2899
Fixes NODROP not playing nice with tables.
(thx for submitting bug reports guise)
rip in peace more parems
Removes radio from pAI
Conflicts:
	code/modules/hydroponics/hydroponics.dm
Fixed, hopefully
Fixed entertainment monitor's incorrect icon path and missing sprite.
Merge pull request #2903 from hornygranny/harmyeller

Removes pAI radio
Boop
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
Fixes conflicts
Merge pull request #2917 from Cheridan/master

Conflict fixes of #2857