Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
MAKESHIFT WEAPONS UPDATE
-Removes stungloves and all related code.
-Makeshift stun batons can be made in their stead, along with spears. Spears can be thrown or used one or two-handed.
-Major stun baton revamp. They now accept batteries, which can be removed and replaced.
-Fixes the bug where you could use TK to make a dualsaber from a single saber.
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
Commitin' the stuff that didn't merge
dear diary today i removeb stunglubs i'm a hero
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	html/changelog.html
Merge branch 'master' of https://github.com/tgstation/-tg-station
-Fixes the stuff Giacom pointed out.
-Updated some other items to use the hitsound var while I was at it.
-Actually fixes the issues with inhands not updating. Thanks to Aranclanos.
fixes my changelog eating giacom's changelog.
fixes my changelog typos

god damn it
-reverting the 3 lines that got messed up somehow when i was merging files.
-Fixes me not using the appropriate setter procs for cell charge.
-changes the deductcharge proc again to get rid of my silly hack.
Merge pull request #387 from Cheridan/DeathToStungloves

Makeshift Weapons Update