Preferences fixes
Machine people have no internal organs
Fix powerarmor slowdown situation
Removed inaprovaline fixing Internal bleeding

Because Inaprovaline has never had any healing effects, and seems to
only artificially give the body oxygen, as a replacement for not being
able to breathe, or so it seems, since vox takes toxin damage from it
Donator fluff item

Flagbearer's rebel outfit.
Merge remote-tracking branch 'zomgponies/master' into Combat-borgs
Nerfed combat borgs

Made the cell charge it costs to use the laser 500 instead of 100, since
it gave borgs WAAAY to many shots before they have to even consider
going back to charge
Fire delay also doubled, because we don't want them to waste everything
in two seconds, and it was way quick before, still considerabily fast,
though
Recommits storage
New arrivals
Merge pull request #221 from GhostAA12/master

Adds Rapid Part Exchange Device
Updating PR
Sec, Cargo, Arrivals overhauls

Massive overhaul.
Merge remote-tracking branch 'origin/master'

Conflicts:
	maps/cyberiad.dmm
Changeling deathgasp fix

Now it will look like you actually died from regenerative stasis
Fixes a bunch more hurt -> harm checks
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
I've got no idea why but when I downloaded the map it was corrupted to fuck. Here's the right version
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.

Conflicts:
	baystation12.dme
	code/modules/mining/mine_items.dm
	code/modules/research/research_shuttle.dm
Some cleanup stuff for prior commits.
Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/admin/admin.dm