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
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
Updating PR
Changeling deathgasp fix

Now it will look like you actually died from regenerative stasis
More PR fixes I guess
Fixes the vending machine bug?
Add the other shuttle controllers back in
Fixes janicart/segway
Mapfixes
Cart fixes
Hurrr
Made riot helmets and captains space helmet protect against facehuggers
Rusted walls, oh yes.
More Vox clothing. Head and eyes this time.

Conflicts:
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox/head.dmi
	icons/mob/species/vox/suit.dmi
First pass on ore distribution map and stationary drilling rig.
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
Ironed out some bugs. Everything should be working for testing purposes.
2nd mining overhaul commit. Fun KEPT.
3rd mining overhaul commit, fun KEPT.
Removed mythril/adamantine stuff from map