Map Fixes

Corrects a merge conflict.
Makes it possible for the CE to unbolt the engine core hatches.
Adds 'me' hotkey, updates hotkeys-help

It bothered me that there was no hotkey for emote that wasn't on the
function row. Y is now me. Activate-held-item is now only Z instead of Z
and Y.

The hotkeys-help verb in OOC tab is changed to include the changes
above, and the previously unmentioned function row hotkeys that are
pertinent to players. (Admin verbs are unmentioned)
Filled PAPs

There now exists pre-filled portable airpumps, mainly to be used by the ERT.
Merge remote-tracking branch 'upstream/dev' into PAP

Fixes #6844.
Scrubber Icons

Gives online scrubbers a slightly more appropriate icon while viewed in the map.
Merge pull request #7024 from sabiram/dev

Adds 'me' hotkey, updates hotkeys-help
Merge pull request #7027 from PsiOmegaDelta/PAP

Pre-filled PAPs
Merge pull request #7032 from PsiOmegaDelta/Scrubbers

Scrubber Icons
Merge pull request #7019 from PsiOmegaDelta/MapFix

Map Fixes
Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into spaceninjas