Revert "Merge branch 'master' into Yeehaw"

This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.

code/game/objects/items/melee/energy.dm

@@ -374,7 +374,7 @@
 			It appears to have a wooden grip and a shaved down guard."
 	icon_state = "cxsword_hilt_traitor"
 	force_on = 30
-	armour_penetration = 35
+	armour_penetration = 50
 	embedding = list("embedded_pain_multiplier" = 10, "embed_chance" = 75, "embedded_fall_chance" = 0, "embedded_impact_pain_multiplier" = 10)
 	block_chance = 50
 	hitsound_on = 'sound/weapons/blade1.ogg'

code/game/objects/items/melee/misc.dm

@@ -216,11 +216,10 @@
 			return
 	else
 		if(last_hit < world.time)
-			if(target.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
-				playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
-				return
 			if(ishuman(target))
 				var/mob/living/carbon/human/H = target
+				if (H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK))
+					return
 				if(check_martial_counter(H, user))
 					return
 			playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)