Merge pull request #2922 from Miauw62/morestuff

Arm blades update onmobs properly
Merge pull request #2927 from AlexanderUlanH/alium

Buffed Lamarr at laser tag
Merge pull request #2928 from Incoming5643/sadstuckinwall

No more getting stuck in the wall
Merge pull request #2932 from Miauw62/honkhonkhonkhonk

Mutagen is less fuck you deadly.
Merge pull request #2942 from GinjaNinja32/chemistry-fix

Make constructible dispenser use same order as standard
Merge pull request #2954 from Incoming5643/yabbamyicing

Modifies how far a corpse has to be from a blob for zombies to occur.
Merge pull request #2955 from Aranclanos/ChangelingConfiguration

Changeling scaling coefficient configuration
More suits, and more fixes.

More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
Merge pull request #2891 from RobRichards1997/23/02/2014-BurnBabyBurnFueltankInferno

Gives fuel tanks a fire_act()
Automerge fix
Fixing the conflicts preventing an automerge.
Autodrobe fix

/me gives fleure a long, 1000 yard stare
Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes
Also fixed some weird autodrobe runtime on startup
Removed autodrobe fix
Merge pull request #2918 from Ergovisavi/ore_redemp_fixes

[MAP] Various mining tweaks and twerks
Hydro fix
Merge conflicts fix
Smartfridge sorting stuff
Some changes to Linda, self_compare() removed and added N2O to the air group merge.
Once the air group gets to the 20 ticks with no big changes, it will dismantle itself with no compares. At the 10 ticks the group will still merge itself.
Rename equip_to_slot_or_qdel() -> del()
Still qdel()'s them, just naming the proc back.
Should hopefully reduce the number of lines different in the pr.
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel

Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm