Merge pull request #252 from Regen1/Combat-borgs

Combat borgs + various tweaks

code/game/gamemodes/changeling/changeling_powers.dm

@@ -530,7 +530,7 @@
 	C.update_canmove()
 	C.remove_changeling_powers()
 
-	C.emote("gasp")
+	C.emote("deathgasp")
 	C.tod = worldtime2text()
 
 	spawn(rand(800,1200))

code/modules/organs/organ_external.dm

@@ -390,8 +390,7 @@ This function completely restores a damaged organ to perfect condition.
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
 		if(W.internal && !W.is_treated() && owner.bodytemperature >= 170)
 			var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
-			var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
-			if(!bicardose || !inaprovaline)	//bicaridine and inaprovaline stop internal wounds from growing bigger with time, and also stop bleeding
+			if(!bicardose)	//bicaridine stop internal wounds from growing bigger with time, and also stop bleeding, inaprovaline only helps against the oxyloss from bloodloss, and does no direct healing
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
 

code/modules/projectiles/guns/energy/laser.dm

@@ -56,8 +56,9 @@ obj/item/weapon/gun/energy/laser/retro
 	if(isrobot(src.loc))
 		var/mob/living/silicon/robot/R = src.loc
 		if(R && R.cell)
-			R.cell.use(100)
+			R.cell.use(500)
 			in_chamber = new/obj/item/projectile/beam(src)
+			fire_delay = 12
 			return 1
 	return 0