possible fix
fixed broken commits
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
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
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
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.
I accidentally my .dme, hopefully this should fix it.
Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
initial commit for better security clothing
small adjustment to security jumpsuits
lockers for boxes
HoS jumpsuit adjustments
FRAG-12 + admins.txt

+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt