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
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
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	icons/obj/gun.dmi
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
adds advanced tasers as default
fixed compile errors
fixes inconsistent advanced taser icon_state
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
Merge pull request #6293 from paprka/deathtoezmode

Reworks ranged stuns / Adds advanced taser