Weapon, pickaxe and shield resprite (and a bunch of other stuff) (#6776)

this resprites some weapons,

namely the butterfly knife and switchblade to not be comically oversized
(you know, they're...concealable.)
tweaks some other sprites too, like the handles of polearms and the stunbaton
this doesn't change how they look from afar, they're practically the same in glance value
riot shield taken from Eris (and tactical shield is a modified version of that)
made ebarrier use same colors as eshield (this makes more sense, honestly)

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

@@ -1,7 +1,7 @@
 /obj/item/weapon/material/butterflyconstruction
 	name = "unfinished concealed knife"
 	desc = "An unfinished concealed knife, it looks like the screws need to be tightened."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "butterflystep1"
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -16,7 +16,7 @@
 /obj/item/weapon/material/butterflyblade
 	name = "knife blade"
 	desc = "A knife blade. Unusable as a weapon without a grip."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "butterfly2"
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -24,7 +24,7 @@
 /obj/item/weapon/material/butterflyhandle
 	name = "concealed knife grip"
 	desc = "A plasteel grip with screw fittings for a blade."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "butterfly1"
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -74,6 +74,7 @@
 /obj/item/weapon/material/shaft
 	name = "shaft"
 	desc = "A large stick, you could probably attach something to it."
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "shaft"
 	item_state = "rods"
 	force = 5
@@ -103,6 +104,7 @@
 /obj/item/weapon/material/spearhead
 	name = "spearhead"
 	desc = "A pointy spearhead, not really useful without a shaft."
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "spearhead"
 	force = 5
 	throwforce = 5
@@ -149,7 +151,7 @@
 /obj/item/woodcirclet
 	name = "wood circlet"
 	desc = "A small wood circlet for making a flower crown."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "woodcirclet"
 	item_state = "woodcirclet"
 	w_class = ITEMSIZE_SMALL

code/game/objects/items/weapons/material/knives.dm

@@ -30,6 +30,7 @@
 	desc = "The unearthly energies that once powered this blade are now dormant."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "render"
+	item_state = "knife"
 	applies_material_colour = 0
 
 /obj/item/weapon/material/knife/bayonet

code/game/objects/items/weapons/material/misc.dm

@@ -60,7 +60,7 @@
 	attack_verb = list("slashed", "sliced", "cut", "clawed")
 
 /obj/item/weapon/material/scythe
-	icon_state = "scythe0"
+	icon_state = "scythe"
 	name = "scythe"
 	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
 	force_divisor = 0.275 // 16 with hardness 60 (steel)

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

@@ -48,8 +48,10 @@
 /obj/item/weapon/mop/update_icon()
 	if(reagents.total_volume < 1)
 		icon_state = "mop"
+		item_state = "mop"
 	if(reagents.total_volume > 1)
 		icon_state = "mop_wet"
+		item_state = "mop_wet"
 
 /obj/item/weapon/mop/on_reagent_change()
 	update_icon()

code/game/objects/items/weapons/storage/bible.dm

@@ -2,6 +2,7 @@
 	name = "bible"
 	desc = "Apply to head repeatedly."
 	icon_state ="bible"
+	icon = 'icons/obj/library.dmi'
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
@@ -51,29 +52,29 @@
 		name = book_name
 		SSticker.Bible_name = book_name
 
-	var/new_book_style = input(user,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Atheist", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")
+	var/new_book_style = input(user,"Which bible style would you like?") in list("Bible", "Quran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Atheist", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")
 	switch(new_book_style)
-		if("Koran")
-			icon_state = "koran"
-			item_state = "koran"
+		if("Quran")
+			icon_state = "quran"
+			item_state = "quran"
 		if("Scrapbook")
 			icon_state = "scrapbook"
 			item_state = "scrapbook"
 		if("Creeper")
 			icon_state = "creeper"
-			item_state = "syringe_kit"
+			item_state = "creeper"
 		if("White Bible")
 			icon_state = "white"
-			item_state = "syringe_kit"
+			item_state = "white"
 		if("Holy Light")
 			icon_state = "holylight"
-			item_state = "syringe_kit"
+			item_state = "holylight"
 		if("Atheist")
-			icon_state = "athiest"
-			item_state = "syringe_kit"
+			icon_state = "atheist"
+			item_state = "atheist"
 		if("Tome")
 			icon_state = "tome"
-			item_state = "syringe_kit"
+			item_state = "tome"
 		if("The King in Yellow")
 			icon_state = "kingyellow"
 			item_state = "kingyellow"

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

@@ -138,7 +138,7 @@
 
 /obj/item/weapon/reagent_containers/spray/aspergillum
 	name = "aspergillum"
-	desc = "A ceremonial item for sprinkling holy water, or other liquids, on a subject. It has two sacred bells attached."
+	desc = "A ceremonial item for sprinkling holy water, or other liquids, on a subject."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "aspergillum"
 	item_state = "aspergillum"