Merge pull request #2 from ZomgPonies/master

updating my fork
Map squish

Squished cargo, moved tool storage to dorms.
Merge pull request #3 from ZomgPonies/master

updating my fork
Permanent brain exposure fix

A fix too the permanent brain exposure glitch, now brain exposure can be
fixed by setting the skull
Merge pull request #283 from Bram961/master

Permanent brain exposure bugfix
Fixes #5351

Multi-shuttle origin was being assigned a path, not an actual area.
Fixes missing announcements, bad returned() check

Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
Fixes airlocks being stuck if they run out of air
Adds multi-airlock docking controller

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
Fixing other people's fuckuups
Fix for long_jumps never leaving transition area

The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
Adds escape shuttle docking controllers

Conflicts:
	maps/tgstation2.dmm
Improves simple docking controller UI
Improves multi-airlock docking UI
Adds escape pod docking controller type

Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.

Also fixes emergency shuttle arrival announcement having the wrong ETD.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	maps/tgstation2.dmm
Adds escape pod docking controllers

Conflicts:
	maps/tgstation2.dmm
Fixes shuttle consoles not checking access

Generalizes machine access.
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Merge pull request #258 from ZomgPonies/master

26/06/14 - 2