Merge pull request #5293 from mwerezak/armour

Allows armour to turn sharp attacks into blunt attacks with some probability

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

@@ -91,7 +91,7 @@ emp_act
 
 	var/datum/organ/external/organ = get_organ(check_zone(def_zone))
 
-	var/armor = checkarmor(organ, "bullet")
+	var/armor = getarmor_organ(organ, "bullet")
 
 	if((P.embed && prob(20 + max(P.damage - armor, -10))) && P.damage_type == BRUTE)
 		var/obj/item/weapon/shard/shrapnel/SP = new()
@@ -113,19 +113,20 @@ emp_act
 
 	if(def_zone)
 		if(isorgan(def_zone))
-			return checkarmor(def_zone, type)
-		var/datum/organ/external/affecting = get_organ(ran_zone(def_zone))
-		return checkarmor(affecting, type)
+			return getarmor_organ(def_zone, type)
+		var/datum/organ/external/affecting = get_organ(def_zone)
+		return getarmor_organ(affecting, type)
 		//If a specific bodypart is targetted, check how that bodypart is protected and return the value.
 
 	//If you don't specify a bodypart, it checks ALL your bodyparts for protection, and averages out the values
 	for(var/datum/organ/external/organ in organs)
-		armorval += checkarmor(organ, type)
+		armorval += getarmor_organ(organ, type)
 		organnum++
 	return (armorval/max(organnum, 1))
 
 
-/mob/living/carbon/human/proc/checkarmor(var/datum/organ/external/def_zone, var/type)
+//this proc returns the armour value for a particular external organ.
+/mob/living/carbon/human/proc/getarmor_organ(var/datum/organ/external/def_zone, var/type)
 	if(!type)	return 0
 	var/protection = 0
 	var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform)
@@ -230,10 +231,16 @@ emp_act
 		visible_message("\red <B>[src] has been attacked in the [hit_area] with [I.name] by [user]!</B>")
 
 	var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].")
+	var/weapon_sharp = is_sharp(I)
+	var/weapon_edge = has_edge(I)
+	if ((weapon_sharp || weapon_edge) && prob(getarmor(def_zone, "melee")))
+		weapon_sharp = 0
+		weapon_edge = 0
+	
 	if(armor >= 2)	return 0
 	if(!I.force)	return 0
 
-	apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), has_edge(I), I)
+	apply_damage(I.force, I.damtype, affecting, armor , sharp=weapon_sharp, edge=weapon_edge, I)
 
 	var/bloody = 0
 	if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))

code/modules/mob/living/living_defense.dm

@@ -32,6 +32,7 @@
 	return 0
 
 
+//if null is passed for def_zone, then this should return something appropriate for all zones (e.g. area effect damage)
 /mob/living/proc/getarmor(var/def_zone, var/type)
 	return 0
 
@@ -53,8 +54,14 @@
 			signaler.signal()
 
 	var/absorb = run_armor_check(def_zone, P.flag)
+	var/proj_sharp = is_sharp(P)
+	var/proj_edge = has_edge(P)
+	if ((proj_sharp || proj_edge) && prob(getarmor(def_zone, P.flag)))
+		proj_sharp = 0
+		proj_edge = 0
+	
 	if(!P.nodamage)
-		apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=is_sharp(P), edge=has_edge(P))
+		apply_damage(P.damage, P.damage_type, def_zone, absorb, 0, P, sharp=proj_sharp, edge=proj_edge)
 	P.on_hit(src, absorb, def_zone)
 	return absorb
 

code/modules/reagents/reagent_containers/syringes.dm

@@ -236,7 +236,7 @@
 
 		if(istype(target, /mob/living/carbon/human))
 
-			var/target_zone = check_zone(user.zone_sel.selecting, target)
+			var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
 			var/datum/organ/external/affecting = target:get_organ(target_zone)
 
 			if (!affecting)