Merge pull request #3382 from Zuhayr/feature

ANOTHER VOX SHUTTLE MAPFIX plus tweaks. (Probably won't break everything! [maybe])
Fixes a bug with heat transfer.
Merge pull request #3384 from SkyMarshal/airfixes

Fixes a bug with heat transfer.
Fix for #3337.
Conflict fix?
Merge pull request #3386 from Segrain/dev-freeze

Dev-freeze bugfix.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
Taser and examine fixes.