Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev-freeze
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev-freeze
Fixed accidental rename during Phoron project
Fix to breathing in bad air.
Clarifies comment wording

Small things
Merge pull request #5092 from Ravensdale/dev-freeze

Fixes accidental renames during Phoron project
Merge pull request #5217 from comma/master

Compile fix for a fix for legcuffs.
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge
Merge pull request #5222 from Ravensdale/freeze-master-merge

Re-PR of phoron oversight fix
repo: make changelog easier to merge

The changelog now uses union merges to reduce conflicts.
Changed the EOL in changelog.html to CRLF to help even more.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
tools: fix EOL handling in AddToChangelog.exe

AddToChangelog.exe was using a mix of \r\n and \n EOLs.
Fully uses \r\n now.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #5226 from Mloc/bs12-changelogmerge

fix changelog merging
Fixes #5227

Fixes #5229
Fixes #5231
More fixing of #5227

Details. The port side of the station is properly connected on dev but not master.
Corrects this by adding pipes in EVA maintenance between security dorms and EVA itself.
Fixes #5230

Virology areas were a bit of a mess, probably from all the relocations back and forth.
Attempts to arrange the setup as intended and adds missing APC.
Bugfix:  Humans will no longer send the same message twice when talking on binary.

Also:  Removed the beep boop boop from showing up if you are the src of the communication.
Merge pull request #5218 from comma/master

Fixes RD alt suit and 'Lilian's dress' having no _s in icon_state in uni...
Merge pull request #5233 from PsiOmegaDelta/DevFixesToMaster

APC and distribution fixes
Fixes #5246
Fixes #5243