Miauw is annoying
Merge pull request #4648 from Firecage/mineralfloors

Mineral floors
Consistent welding sounds

Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg

Closets and airlocks were backwards.
Fixes Map Merge Conflicts (hopefully)
Merge pull request #4698 from Ikarrus/roundendreportbugs

Fixes Round-End report bugs
Merge pull request #4692 from Ikarrus/destroyscale

Destroy Objective Probability scales with population
Merge pull request #4686 from Miauw62/idfix

Worn ID won't display on station-bounced broadcasts.
Merge pull request #4682 from Menshin/reagents_consumption_fix

Fixes reagents extra consumption + some cleanup
Merge pull request #4657 from Ikarrus/betterantagscaling

Improved Antagonist Scaling
Merge pull request #4675 from Aranclanos/ninjamask

Removes ninja mask modes.
Merge pull request #4635 from Jordie0608/petitiontobanaranfromaranfrommakingmemos

Logging to add/remove memo
Merge pull request #4701 from phil235/goldschlagerfix

fixing the icon of goldschlager glass
Merge pull request #4700 from Ikarrus/syndicatecrate

Adds high-end Syndicate crate to cargo
Merge pull request #4711 from Ikarrus/consistentwelds

Consistent welding sounds
Merge pull request #4703 from Ikarrus/beepboopiamthelaw

Securitrons will only arrest unidentifiable persons when ID check is on
Merge pull request #4630 from Ikarrus/nukeopsetup

Nuke Ops Update
Merge pull request #4600 from Menshin/2Spooky5Playing

Fixes skeletons unable to play xylophone on their ribcage
Changelog update for recent merges
Merge branch 'master' of https://github.com/tgstation/-tg-station into hivemindpaygate

Resolved Conflicts:
	code/modules/mob/living/say.dm
Nazis