Removes NOSHIELD

code/game/objects/items/toys.dm

@@ -198,7 +198,6 @@
 	item_state = "sword0"
 	var/active = 0
 	w_class = 2
-	flags = NOSHIELD
 	attack_verb = list("attacked", "struck", "hit")
 	var/hacked = 0
 

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

@@ -32,7 +32,8 @@
 	throw_range = 5
 	w_class = 3
 	w_class_on = 5
-	flags = CONDUCT | NOSHIELD
+	flags = CONDUCT
+	armour_penetration = 100
 	origin_tech = "combat=3"
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	attack_verb_on = list()
@@ -53,7 +54,7 @@
 	sharpness = IS_SHARP
 	embed_chance = 75
 	embedded_impact_pain_multiplier = 10
-	flags = NOSHIELD
+	armour_penetration = 50
 	origin_tech = "magnets=3;syndicate=4"
 	block_chance = 50
 	var/hacked = 0
@@ -210,7 +211,6 @@
 	throw_speed = 3
 	throw_range = 1
 	w_class = 4//So you can't hide it in your pocket or some such.
-	flags = NOSHIELD
 	var/datum/effect_system/spark_spread/spark_system
 
 //Most of the other special functions are handled in their own files. aka special snowflake code so kewl

code/game/objects/items/weapons/twohanded.dm

@@ -208,7 +208,7 @@
 	wieldsound = 'sound/weapons/saberon.ogg'
 	unwieldsound = 'sound/weapons/saberoff.ogg'
 	hitsound = "swing_hit"
-	flags = NOSHIELD
+	armour_penetration = 75
 	origin_tech = "magnets=3;syndicate=4"
 	item_color = "green"
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -305,7 +305,7 @@
 	throwforce = 20
 	throw_speed = 4
 	embedded_impact_pain_multiplier = 3
-	flags = NOSHIELD
+	armour_penetration = 10
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	sharpness = IS_SHARP

code/game/objects/items/weapons/weaponry.dm

@@ -238,7 +238,7 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 2
-	flags = NOSHIELD
+	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
 	burn_state = FLAMMABLE
 
@@ -260,7 +260,6 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 2
-	flags = NOSHIELD
 
 /obj/item/weapon/ectoplasm
 	name = "ectoplasm"
@@ -303,4 +302,4 @@
 	desc = "A whip fashioned from the severed tails of lizards."
 	icon_state = "tailwhip"
 	origin_tech = "combat=1"
-	needs_permit = 0
+	needs_permit = 0