Tweaks/fixes and greyscale icons.

code/game/antagonist/station/highlander.dm

@@ -37,7 +37,7 @@ var/datum/antagonist/highlander/highlanders
 	player.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(player), slot_w_uniform)
 	player.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(player), slot_l_ear)
 	player.equip_to_slot_or_del(new /obj/item/clothing/head/beret(player), slot_head)
-	player.equip_to_slot_or_del(new /obj/item/weapon/claymore(player), slot_l_hand)
+	player.equip_to_slot_or_del(new /obj/item/weapon/material/claymore(player), slot_l_hand)
 	player.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(player), slot_shoes)
 	player.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(get_turf(player)), slot_l_store)
 

code/game/gamemodes/cult/cultify/obj.dm

@@ -21,7 +21,7 @@
 	new /obj/item/weapon/book/tome(loc)
 	..()
 
-/obj/item/weapon/claymore/cultify()
+/obj/item/weapon/material/claymore/cultify()
 	new /obj/item/weapon/melee/cultblade(loc)
 	..()
 

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

@@ -5,9 +5,9 @@
  * Utensils
  */
 /obj/item/weapon/material/kitchen/utensil
-	force = 5.0
+	force = 5
-	w_class = 1.0
+	w_class = 1
-	throwforce = 5.0
+	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
 	flags = CONDUCT
@@ -17,9 +17,9 @@
 	var/loaded      //Descriptive string for currently loaded food object.
 
 /obj/item/weapon/material/kitchen/utensil/New()
+	..()
 	if (prob(60))
 		src.pixel_y = rand(0, 4)
-
 	create_reagents(5)
 	return
 
@@ -38,13 +38,9 @@
 	if (reagents.total_volume > 0)
 		reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
 		if(M == user)
-			for(var/mob/O in viewers(M, null))
+			M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>")
-				O.show_message(text("\blue [] eats some [] from \the [].", user, loaded, src), 1)
-				M.reagents.add_reagent("nutriment", 1)
 		else
-			for(var/mob/O in viewers(M, null))
+			M.visible_message("<span class='notice'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>")
-				O.show_message(text("\blue [] feeds [] some [] from \the []", user, M, loaded, src), 1)
-				M.reagents.add_reagent("nutriment", 1)
 		playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
 		overlays.Cut()
 		return
@@ -80,7 +76,7 @@
 	sharp = 1
 	edge = 1
 
-	suicide_act(mob/user)
+/obj/item/weapon/material/kitchen/utensil/knife/suicide_act(mob/user)
 		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
 							"\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
 							"\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
@@ -119,6 +115,7 @@
 	throw_range = 7
 	w_class = 3.0
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway.
+	default_material = "wood"
 
 /obj/item/weapon/material/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))

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

@@ -13,7 +13,6 @@
 	throw_range = 4
 	throwforce = 7
 	attack_verb = list("patted", "tapped")
-	applies_material_colour = 1
 
 /obj/item/weapon/material/butterfly/update_force()
 	if(active)
@@ -70,7 +69,6 @@
 	origin_tech = "materials=1"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	unbreakable = 1
-	applies_material_colour = 1
 
 /obj/item/weapon/material/knife/suicide_act(mob/user)
 	viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
@@ -89,6 +87,7 @@
 	desc = "The unearthly energies that once powered this blade are now dormant."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "render"
+	applies_material_colour = 0
 
 /obj/item/weapon/material/knife/butch
 	name = "butcher's cleaver"

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

@@ -3,7 +3,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	gender = NEUTER
 
-	var/applies_material_colour
+	var/applies_material_colour = 1
 	var/unbreakable
 	var/damage_divisor = 0.5
 	var/default_material = DEFAULT_WALL_MATERIAL
@@ -23,7 +23,7 @@
 	if(!material)
 		qdel(src)
 	else
-		name = "[material.display_name] bat"
+		name = "[material.display_name] [initial(name)]"
 		health = round(material.integrity/10)
 		if(applies_material_colour)
 			color = material.icon_colour

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

@@ -102,7 +102,7 @@
 
 		var/obj/item/weapon/material/twohanded/offhand/O = new(user) ////Let's reserve his other hand~
 		O.name = "[base_name] - offhand"
-		O.desc = "Your second grip on the [base_name]"
+		O.desc = "Your second grip on the [base_name]."
 		user.put_in_inactive_hand(O)
 
 	if(istype(user,/mob/living/carbon/human))
@@ -143,6 +143,7 @@
 	slot_flags = SLOT_BACK
 	force_wielded = 30
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+	applies_material_colour = 0
 
 /obj/item/weapon/material/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
 	if(!proximity) return
@@ -173,6 +174,7 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharp = 1
 	edge = 1
+	applies_material_colour = 0
 
 /obj/item/weapon/material/twohanded/dualsaber/attack(target as mob, mob/living/user as mob)
 	..()

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -294,7 +294,7 @@
 			new_item.desc = ""
 		if(19)
 			apply_prefix = 0
-			new_item = new /obj/item/weapon/claymore(src.loc)
+			new_item = new /obj/item/weapon/material/claymore(src.loc)
 			new_item.force = 10
 			item_type = new_item.name
 		if(20)