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
Made the outside of the asteroid rock so its harder to mine through
Same with the station
The head quarters are now on different switches so they can turn off individually
This also fixed the head quarter lights starting off
Merge pull request #1 from CorruptComputer/headquarters

Headquarters