Unnerf security's non-lethals, revert pain decay changes. (#11305)

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

@@ -117,7 +117,7 @@ emp_act
 	if (!def_zone)
 		return 1.0
 
-	var/siemens_coefficient = species.siemens_coefficient
+	var/siemens_coefficient = max(species.siemens_coefficient, 0)
 
 	var/list/clothing_items = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking?
 	for(var/obj/item/clothing/C in clothing_items)

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

@@ -730,7 +730,7 @@
 		if(hallucination && !(species.flags & (NO_POISON|IS_PLANT)))
 			handle_hallucinations()
 
-		if(get_shock() >= (species.total_health * 0.75))
+		if(get_shock() >= (species.total_health * 0.6))
 			if(!stat)
 				to_chat(src, "<span class='warning'>[species.halloss_message_self]</span>")
 				src.visible_message("<B>[src]</B> [species.halloss_message]")
@@ -741,7 +741,7 @@
 			if(sleeping)
 				stat = UNCONSCIOUS
 
-			adjustHalLoss(-7)
+			adjustHalLoss(-5)
 			if (species.tail)
 				animate_tail_reset()
 			if(prob(2) && is_asystole() && isSynthetic())
@@ -777,11 +777,11 @@
 		if(resting)
 			dizziness = max(0, dizziness - 15)
 			jitteriness = max(0, jitteriness - 15)
-			adjustHalLoss(-5)
+			adjustHalLoss(-3)
 		else
 			dizziness = max(0, dizziness - 3)
 			jitteriness = max(0, jitteriness - 3)
-			adjustHalLoss(-3)
+			adjustHalLoss(-1)
 
 		//Other
 		handle_statuses()

code/modules/mob/living/living_defense.dm

@@ -37,13 +37,6 @@
 			src.visible_message("<span class='warning'>[src] triggers their deadman's switch!</span>")
 			signaler.signal()
 
-	//Stun Beams
-	if(P.taser_effect)
-		stun_effect_act(0, P.agony, def_zone, P)
-		to_chat(src, "<span class='warning'>You have been hit by [P]!</span>")
-		qdel(P)
-		return
-
 	//Armor
 	var/damage = P.damage
 	var/flags = P.damage_flags()

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -193,8 +193,7 @@
 /obj/item/projectile/beam/hivebot
 	name = "electrical discharge"
 	damage = 10
-	damage_type = PAIN
-	taser_effect = 1
+	damage_type = BURN
 	agony = 30
 	armor_penetration = 40
 	muzzle_type = /obj/effect/projectile/muzzle/stun
@@ -205,7 +204,6 @@
 	name = "harmless electrical discharge"
 	damage = 0
 	damage_type = PAIN
-	taser_effect = TRUE
 	agony = 0
 
 /obj/item/projectile/beam/hivebot/incendiary
@@ -213,7 +211,6 @@
 	damage_type = BURN
 	damage = 20
 	incinerate = 5
-	taser_effect = 0
 	muzzle_type = /obj/effect/projectile/muzzle/laser/blue
 	tracer_type = /obj/effect/projectile/tracer/laser/blue
 	impact_type = /obj/effect/projectile/impact/laser/blue

code/modules/mob/living/simple_animal/hostile/sarlacc.dm

@@ -361,8 +361,7 @@
 /obj/item/projectile/energy/thoughtbubble
 	name = "psionic blast"
 	icon_state = "ion"
-	nodamage = 1
-	taser_effect = 1
+	nodamage = TRUE
 	agony = 20
 	check_armor = "energy"
 	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE

code/modules/mob/mob_grab_specials.dm

@@ -55,10 +55,10 @@
 		return
 
 	attacker.visible_message("<span class='danger'>[attacker] [pick("bent", "twisted")] [target]'s [organ.name] into a jointlock!</span>")
-	var/armor = 100 * target.get_blocked_ratio(target, BRUTE, damage = 30)
+	var/armor = 100 * affecting.get_blocked_ratio(target, BRUTE, damage = 30)
 	if(armor < 70)
 		to_chat(target, "<span class='danger'>You feel extreme pain!</span>")
-		affecting.adjustHalLoss(Clamp(0, 60-affecting.getHalLoss(), 30)) //up to 60 halloss
+		affecting.adjustHalLoss(Clamp(0, 60 - affecting.getHalLoss(), 30)) //up to 60 halloss
 
 /obj/item/grab/proc/attack_eye(mob/living/carbon/human/target, mob/living/carbon/human/attacker)
 	if(!istype(attacker))