Merge pull request #167 from SoundScopes/master

Code repair
Merge pull request #168 from Aurorastation/development

Update
Woops

forgot 2 commit these
Merge pull request #14 from Aurorastation/master

Magical things
Map Update 13JUL2014

New bar design, reworked piping, new crushers/disposals area.
Intern Fix

Fixes the position and gives them an actual, servable purpose.
New Icons

Disposals, request terminals, ID Cards, firesuits.
Custom Items 13JUL2014

Meowy's gloves, Fortune's things, fix for Leo's thing.
Map Hotfix 13JUL2014

SPAWNS FOR THE SPAWNGOD
Merge pull request #171 from skull132/master

Interns, icons, map and yes.
Merge pull request #170 from SoundScopes/master

Bug Fixes & sign language conversion
Merge pull request #172 from Aurorastation/development

Update 13JUL2014
Merge pull request #173 from SoundScopes/master

Removed self debug
Merge pull request #174 from Aurorastation/development

Hotfix 13JUL2014
Trying to fix discrepancies between PCs

git sux
Merge branch 'master' of https://github.com/barryuhm/Aurora

Conflicts:
	Mocheeze/barrystransferspace.dmm
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mocheeze/barrystransferspace.dmm
Merge remote-tracking branch 'origin/master'
Dea Sprites + Civillian map fixes

Reshaping bar for gameplay uses and kitchen+botany for aesthetic. Also
includes some sprites Dea trialled with me.
Merge pull request #175 from barryuhm/master

Update my workfolder on the master drive