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
Compile fix for a fix for legcuffs.
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
Merge pull request #4 from Baystation12/master

More things.