initial commit for nerfing ranged stuns
adds advanced taser
adds disablers to security lockers whoops
Reverts ebow stun nerf, buffs the range
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi
added range to the 40mm grenade
* Updated the autolathe to use the datum/designs system (new file
autolathe_designs.dm)
* Added categories sub-menus for the autolathe, circuit_printer and
protolathe
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	code/game/jobs/job/security.dm
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	tools/mapmerge/prepare_map.bat
Buff mech smg bullets a little, added changelog
Burst fire for automatic weapons
Fixes a couple missing var settings
Magic Mania 1.8: Summon Spells Rework and The Challenge System

Summon Guns and Summon Magic are no longer traditional spells.

When cast by the wizard, he gains a charge for his spell book but no antagonists are created, essentially making his life harder for more power. Both spells can only be cast once like this for a maximum of 2 extra charges.

When cast by very rare chance in summon events, no charages are gained, and there's a 10% chance of someone becoming a survivor, down from 25%. No charges are gained if this happens.

When cast by a badmin they will be given a choice of not creating antags, creating antags at the old chance, or just going in stupid and giving everyone antag.
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbye_my_children

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
dumb mistake made in conflict resolution haste
Adds select fire for burst fire weapons
initial commit for adding jitteriness for electrodes
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	icons/obj/gun.dmi
fixes everything, updates jitter amount
* Added a max_multiplier var instead of hardcoding the max stack size to 50 (one can now produce an incomplete max size sheet in one click)
* Fixes #6362