Merge pull request #3211 from misterbook/bleeding-edge-freeze

Pulling the teeth from bees, lowering halloss regen

code/modules/mob/living/carbon/human/human_defense.dm

@@ -23,6 +23,8 @@ emp_act
 				if(C.body_parts_covered & select_area.body_part) // Is that body part being targeted covered?
 					P.agony=P.agony*C.siemens_coefficient
 		apply_effect(P.agony,AGONY,0)
+		flash_pain()
+		src <<"\red You have been shot!"
 		del P
 					/* Commenting out new-old taser nerf.
 					if(C.siemens_coefficient == 0) //If so, is that clothing shock proof?
@@ -41,7 +43,7 @@ emp_act
 // END TASER NERF
 
 	if(wear_suit && istype(wear_suit, /obj/item/clothing/suit/armor/laserproof))
-		if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
+		if(istype(P, /obj/item/projectile/energy) || !(istype(P, /obj/item/projectile/energy/electrode)) || istype(P, /obj/item/projectile/beam))
 			var/reflectchance = 40 - round(P.damage/3)
 			if(!(def_zone in list("chest", "groin")))
 				reflectchance /= 2

code/modules/mob/living/carbon/human/life.dm

@@ -978,10 +978,10 @@
 				blinded = 1
 				stat = UNCONSCIOUS
 				if(halloss > 0)
-					adjustHalLoss(-6)
+					adjustHalLoss(-3)
 			else if(sleeping)
 				handle_dreams()
-				adjustHalLoss(-6)
+				adjustHalLoss(-3)
 				if (mind)
 					if((mind.active && client != null) || immune_to_ssd) //This also checks whether a client is connected, if not, sleep is not reduced.
 						sleeping = max(sleeping-1, 0)
@@ -992,12 +992,12 @@
 						emote("snore")
 			else if(resting)
 				if(halloss > 0)
-					adjustHalLoss(-6)
+					adjustHalLoss(-3)
 			//CONSCIOUS
 			else
 				stat = CONSCIOUS
 				if(halloss > 0)
-					adjustHalLoss(-2)
+					adjustHalLoss(-1)
 
 			//Eyes
 			if(sdisabilities & BLIND)	//disabled-blind, doesn't get better on its own

code/modules/mob/living/carbon/monkey/life.dm

@@ -450,10 +450,10 @@
 				blinded = 1
 				stat = UNCONSCIOUS
 				if(halloss > 0)
-					adjustHalLoss(-6)
+					adjustHalLoss(-3)
 			else if(sleeping)
 				handle_dreams()
-				adjustHalLoss(-6)
+				adjustHalLoss(-3)
 				sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS
@@ -462,12 +462,12 @@
 						emote("snore")
 			else if(resting)
 				if(halloss > 0)
-					adjustHalLoss(-6)
+					adjustHalLoss(-3)
 			//CONSCIOUS
 			else
 				stat = CONSCIOUS
 				if(halloss > 0)
-					adjustHalLoss(-2)
+					adjustHalLoss(-1)
 
 			//Eyes
 			if(sdisabilities & BLIND)	//disabled-blind, doesn't get better on its own