Merge pull request #5206 from mwerezak/shoe-cuffs

Fixes #5190
Merge pull request #5211 from Ccomp5950/mentor_change

Mentor permissions fixes and such.
Merge pull request #5212 from faerindel/hydro_refactor

Hydroponics refactor, part 1: Files.
Merge remote-tracking branch 'upstream/dev' into SecVents
Merge with dev.
Reapplying some changes.
Turns a scrubber manifold into straight line in bridge maintenance.

Relocates a camera in virology that was attached to air instead of a wall.
Turns the floor under a door in the Research outpost from plating to proper floor tile.
Additional air alarm in prison permabrig.
Merge pull request #5210 from PsiOmegaDelta/SecVents

Security vents + more
Compile fix for a fix for legcuffs.
Merge pull request #5217 from comma/master

Compile fix for a fix for legcuffs.
Fixes RD alt suit and 'Lilian's dress' having no _s in icon_state in uniform.dmi
Merge pull request #5207 from mwerezak/get_turf_loc-cleanup

Cleans up get_turf_loc()
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
Merge pull request #5219 from Zuhayr/autolathe

Autolathe rewrite.
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 remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/__HELPERS/unsorted.dm
Fixes #5227

Fixes #5229
Fixes #5231