possible fix
fixed broken commits
moves emag effects from attackby() into atom proc emag_act()
Adds new undershirts, jeans and pants by WalterJe

Adds the undershirts by JStheguy

Ports some pants by JStheguy from NTstation

Ports the clothes vending machine from NTstation

Adds the clothesmate restock icon by WJohnston
You can now light someone's cigarette in his mouth with a lit match (just like with lighters or lit cigarettes)
Fixes not being able to get out of a wrapped closet by resisting as a monkey, borg, slime.
Fixes not being able to resist out of a /structure/closet that is loaded inside a mech.
Fixes various issues with Backpack Watertanks / Defibs by slapping NODROP on them
Changes all watertanks and the defib to use the Atmos watertank equip method
Fixes a runtime that could happen if someone melted the Atmos watertank off of you
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
Readds the x-mas trees to their traditional locations, the bar and church
Readds the Festivus Pole to the RD's office, since the break room is gone
Makes a wizard robe variation of the santa outfit without all the bonus effects (not spaceworthy, can't hold literally everything) so the crew can experience the joy of meeting and subsiquently killing santa claus

Fixes #6230 as a matter of course (someone needs to generalize it to just work for all maps at once)
Defib sounds plus Code

Defibt sounds added plus code edits to accept new defib sounds and new weapon sounds

Defib previews
https://dl.dropboxusercontent.com/u/9654207/def_saftyOff.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_charge.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_failed.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_ready.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_SaftyOn.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_success.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_zap.ogg
Ports the supermatter engine from /vg/

The SM was originally developed for bay12, but I ported the /vg/ fork.
Basically, it eats heat or atom/movables and generates radiation/power.
Everything that touches it turns to dust. If it overheats, it explodes.
Typical usage involves emitters and a cooling chamber.
Currently, these are only obtainable through cargo for 100 points.
The crate comes locked and requires CE access.
Adds a santa event where a dead player is spawned as Santa! HO HO HO!

Also adds a few more things to the random gifts.
Covers up traces of the coder conspiracy.
Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories

Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
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
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.