Merge branch 'master' of https://github.com/tgstation/-tg-station
Implement an preattack override for your self contained snowflake needs
Remove adjenct check from click,and move it after attack self
Fixed https://github.com/tgstation/-tg-station/issues/761
I finally realize what was causing the click issues,so now it works with proximity flag.
Merge branch 'master' of https://github.com/tgstation/-tg-station into attack_override

Conflicts:
	code/_onclick/item_attack.dm
Merge pull request #2438 from adrix89/attack_override

Attack override