Merge pull request #13853 from KorPhaeron/NOSHIELD

Removes NOSHIELD flag, gives NOSHIELD items armour penetration

code/modules/holodeck/items.dm

@@ -20,7 +20,7 @@
 	throwforce = 0
 	w_class = 2.0
 	hitsound = "swing_hit"
-	flags = NOSHIELD
+	armour_penetration = 50
 	var/active = 0
 
 /obj/item/weapon/holo/esword/green

code/modules/hydroponics/hydroitemdefines.dm

@@ -103,7 +103,8 @@
 	throw_speed = 2
 	throw_range = 3
 	w_class = 4
-	flags = CONDUCT | NOSHIELD
+	flags = CONDUCT
+	armour_penetration = 20
 	slot_flags = SLOT_BACK
 	origin_tech = "materials=2;combat=2"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")

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

@@ -72,9 +72,7 @@
 
 /mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", atom/movable/AM, attack_type = MELEE_ATTACK, armour_penetration = 0)
 	var/block_chance_modifier = round(damage / -3)
-	if(AM)
-		if(AM.flags & NOSHIELD) //weapon ignores shields altogether
-			return 0
+
 	if(l_hand && !istype(l_hand, /obj/item/clothing))
 		var/final_block_chance = l_hand.block_chance - (Clamp((armour_penetration-l_hand.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
 		if(l_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type))

code/modules/projectiles/projectile/magic.dm

@@ -4,7 +4,7 @@
 	damage = 0
 	damage_type = OXY
 	nodamage = 1
-	flags = NOSHIELD
+	armour_penetration = 100
 	flag = "magic"
 
 /obj/item/projectile/magic/death