moves emag effects from attackby() into atom proc emag_act()
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
fixes whitespace
overrides attack
makes APC call parent
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

Conflicts:
	code/game/mecha/mech_fabricator.dm
Merge pull request #5966 from hornygranny/emagrefactor

emag refactor