Snowflake garbage removed
tray hit restored to glory
Merge pull request #3721 from hornygranny/meltingsnow

Snowflake garbage removed
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays

Conflicts:
	code/game/objects/items/weapons/kitchen.dm (Resolved, we were both removing snowflakey tray code)