Jesus Christ it compiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets

Conflicts:
	code/modules/projectiles/guns/magic/wand.dm
Scattershot ho!
Syringe guns can suck it.
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets

Conflicts:
	code/modules/projectiles/guns/magic.dm
Mysterious compile errors gone.
Unless it's spontaneously generated more problems, we done here.
Fixed revolver/shotgun dual loading messages, fixed e-gun and automatic display issues.
rechargestation.dm has some real colon cancer, man.
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets
who added a damn cyborg crossbow jesus
Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets

Gun Revamp 2: Gun Harder: Director's Cut
Updated the changelog.
Merge pull request #2361 from Giacom/changelog_6

Updated the changelog. Insta-merge please.