possible fix
fixed broken commits
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
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.
Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.
I accidentally my .dme, hopefully this should fix it.
Adds one span class.
FRAG-12 + admins.txt

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

Moved /obj/item/projectile/bullet/frag12 from
code\modules\projectiles\projectile\bullets.dm to
code\modules\projectiles\projectile\special.dm
Description update

Changed the description of the FRAG-12.
The changeloggening

Added changelog file for the FRAG-12.
Fixes disappearing alien weeds overlays

I have no idea why this works.
Fixes #6326
Morgue update
Trying to stay in sync