Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'master' of https://github.com/DJSnapshot/Baystation12-Luna
Merge pull request #3751 from Baystation12/dev

Staging [Do not merge]
Merge remote-tracking branch 'upstream/master' into dev-freeze
Sprite fix.
Smallfix.
Quickfix.
Balance fix.
Fix for #3804.
Merge pull request #3812 from Segrain/dev-freeze

Dev-freeze bugfixes.
Fixes #3801, C4 will no longer destroy the analyzer it's inside of

Committed to dev-freeze because the fix doesn't work with the click code on master
Small fix so voting isn't always shouting at you for not being an admin or mod.
Merge pull request #3822 from Kilakk/dev-freeze

Fixes #3801, C4 will no longer destroy the analyzer it's inside of
Merge branch 'master' of https://github.com/Baystation12/Baystation12
(hopefully) Final fix for ZAS for 0.1.4.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3824 from DJSnapshot/dev-freeze

small fix to autotransfer voting
Merge pull request #3827 from Mloc/weirdair

(hopefully) Final fix for ZAS for 0.1.4.
Hopefully.  Hopefully was the key word.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3828 from Mloc/zas

Hopefully.  Hopefully was the key word.
Merge remote-tracking branch 'upstream/master' into dev-freeze