Merge pull request #6393 from Nalarac/Conductivity

Adds NOCONDUCT to Some Items

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

@@ -10,6 +10,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/weapon/mop)
 	throw_speed = 5
 	throw_range = 10
 	w_class = ITEMSIZE_NORMAL
+	flags = NOCONDUCT
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
 	var/mopping = 0
 	var/mopcount = 0

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

@@ -9,6 +9,7 @@
 	sharp = 0
 	edge = 0
 	throwforce = 7
+	flags = NOCONDUCT
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 2)
 	attack_verb = list("beaten")