Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
Update preferences.dm

Fixing a merge error.
Improves status display examination feedback. Ensures output is properly sanitized.
A list of features created since the my last changelog addition.
Fixes some issues with new Hydro.
emergency HTML/JS injection fix.
sanitation of status display input was missing everywhere.
Merge pull request #6195 from Walter0o/injection_fix

emergency HTML/JS injection fix.
emergency HTML/JS injection fix MK2, the underping.

fixes a minor oversight in proc order after i shuffled them around.
Packages can now be labeled/titled with pens and have sprites to represent they've been labeled or tagged (with the destination tagger)
Added trim to text inputs
Merge pull request #6183 from comma/curtains

Added curatins.
Merge pull request #6184 from comma/detfix

Fixed copypaste derp resulting in runtime when you are naked sans gloves...
Merge pull request #6185 from comma/holodeck

Cleaned up holodeck controller a little.
Merge pull request #6186 from Kilakk/master

Fixes #6163
Merge pull request #6194 from PsiOmegaDelta/Changelog

Changelog additions
Merge pull request #6196 from Walter0o/injection_fix

emergency HTML/JS injection fix MK2, the underping.
Merge pull request #6199 from Zuhayr/dev-freeze

Merge with master, hydro fixes.
Fixes "Do not allow use of items" option doing nothing.
Probably was lost during move to new clicking system.
Merge pull request #6188 from Kelenius/OfWizardsAndOrbs

Adds a scrying orb for wizards
Scrying orb changelog