Merge pull request #3748 from comma/dev

Merged dev-freeze into dev
Typo fix.
Typo fix.
Missing language.
Missing verb.
Examining fix.
Typecheck.
Fix for pockets.
Better check.
Merge pull request #3749 from Segrain/master

Smallfixes.
Postmerge mapfix.
New sprite.
Merge remote-tracking branch 'upstream/master' into dev
Merge pull request #3752 from Segrain/dev

Dev map.
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger