cleanup the last

code/game/objects/items/devices/lightreplacer.dm

@@ -66,7 +66,7 @@
 		. += "It has [uses] lights remaining."
 
 /obj/item/lightreplacer/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/stack/material) && W.get_material_name() == "glass" || istype(W, /obj/item/stack/material/cyborg/glass))
+	if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_GLASS || istype(W, /obj/item/stack/material/cyborg/glass))
 		var/obj/item/stack/G = W
 		if(uses >= max_uses)
 			to_chat(user, span_warning("[src.name] is full."))

code/game/objects/items/stacks/sandbags.dm

@@ -19,7 +19,7 @@
 
 	pass_color = TRUE
 
-	var/bag_material = "cloth"
+	var/bag_material = MAT_CLOTH
 
 /obj/item/stack/sandbags/cyborg
 	name = "sandbag synthesizer"
@@ -130,7 +130,7 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \
 
 	pass_color = TRUE
 
-	var/bag_material = "cloth"
+	var/bag_material = MAT_CLOTH
 
 /obj/item/stack/emptysandbag/Initialize(var/ml, var/amt, var/bag_mat)
 	. = ..(ml, amt)

code/game/objects/items/weapons/circuitboards/frame.dm

@@ -85,7 +85,7 @@
 	name = T_BOARD("electrochromic button")
 	build_path = /obj/machinery/button/windowtint
 	board_type = new /datum/frame/frame_types/button
-	matter = list(MAT_STEEL = 50, "glass" = 50)
+	matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
 
 //Computer
 

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

@@ -95,10 +95,10 @@ var/global/list/ashtray_cache = list()
 	return ..()
 
 /obj/item/material/ashtray/plastic/New(var/newloc)
-	..(newloc, "plastic")
+	..(newloc, MAT_PLASTIC)
 
 /obj/item/material/ashtray/bronze/New(var/newloc)
-	..(newloc, "bronze")
+	..(newloc, MAT_BRONZE)
 
 /obj/item/material/ashtray/glass/New(var/newloc)
-	..(newloc, "glass")
+	..(newloc,MAT_GLASS)

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

@@ -6,7 +6,7 @@
 	throwforce = 7
 	attack_verb = list("smashed", "beaten", "slammed", "smacked", "struck", "battered", "bonked")
 	hitsound = 'sound/weapons/genhit3.ogg'
-	default_material = "wood"
+	default_material = MAT_WOOD
 	force_divisor = 1.1           // 22 when wielded with weight 20 (steel)
 	unwielded_force_divisor = 0.7 // 15 when unwielded based on above.
 	dulled_divisor = 0.75		  // A "dull" bat is still gonna hurt

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

@@ -143,7 +143,7 @@
 	edge = FALSE
 
 /obj/item/material/kitchen/utensil/fork/plastic
-	default_material = "plastic"
+	default_material = MAT_PLASTIC
 
 /obj/item/material/kitchen/utensil/foon
 	name = "foon"
@@ -153,7 +153,7 @@
 	edge = FALSE
 
 /obj/item/material/kitchen/utensil/foon/plastic
-	default_material = "plastic"
+	default_material = MAT_PLASTIC
 
 /obj/item/material/kitchen/utensil/spork
 	name = "spork"
@@ -163,7 +163,7 @@
 	edge = FALSE
 
 /obj/item/material/kitchen/utensil/spork/plastic
-	default_material = "plastic"
+	default_material = MAT_PLASTIC
 
 /obj/item/material/kitchen/utensil/spoon
 	name = "spoon"
@@ -175,7 +175,7 @@
 	force_divisor = 0.1 //2 when wielded with weight 20 (steel)
 
 /obj/item/material/kitchen/utensil/spoon/plastic
-	default_material = "plastic"
+	default_material = MAT_PLASTIC
 
 /*
  * Knives
@@ -190,7 +190,7 @@
 	return ..()
 */
 /obj/item/material/knife/plastic
-	default_material = "plastic"
+	default_material = MAT_PLASTIC
 
 /*
  * Rolling Pins
@@ -201,7 +201,7 @@
 	desc = "Used to knock out the " + JOB_BARTENDER+ "."
 	icon_state = "rolling_pin"
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	default_material = "wood"
+	default_material = MAT_WOOD
 	force_divisor = 0.7 // 10 when wielded with weight 15 (wood)
 	dulled_divisor = 0.75	// Still a club
 	thrown_force_divisor = 1 // as above

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

@@ -126,7 +126,7 @@
 	force_divisor = 0.1
 
 /obj/item/material/knife/table/plastic
-	default_material = "plastic"
+	default_material = MAT_PLASTIC
 
 /obj/item/material/knife/butch
 	name = "butcher's cleaver"
@@ -143,7 +143,7 @@
 	attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
 	can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
 	slot_flags = SLOT_BELT
-	default_material = "plasteel" //VOREStation Edit
+	default_material = MAT_PLASTEEL //VOREStation Edit
 
 /obj/item/material/knife/machete/cyborg
 	name = "integrated machete"
@@ -157,7 +157,7 @@
 	icon_state = "survivalknife"
 	item_state = "knife"
 	applies_material_colour = FALSE
-	default_material = "plasteel" //VOREStation Edit
+	default_material = MAT_PLASTEEL //VOREStation Edit
 	toolspeed = 2 // Use a real axe if you want to chop logs.
 
 /obj/item/material/knife/stone

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

@@ -271,10 +271,10 @@ Protectiveness | Armor %
 	material_slowdown_multiplier = 0.4
 
 /obj/item/clothing/suit/armor/material/makeshift/durasteel
-	default_material = "durasteel"
+	default_material = MAT_DURASTEEL
 
 /obj/item/clothing/suit/armor/material/makeshift/glass
-	default_material = "glass"
+	default_material = MAT_GLASS
 
 // Used to craft sheet armor, and possibly other things in the Future(tm).
 /obj/item/material/armor_plating
@@ -363,7 +363,7 @@ Protectiveness | Armor %
 
 	if(istype(O, /obj/item/stack/material))
 		var/obj/item/stack/material/S = O
-		if(S.material == get_material_by_name("leather"))
+		if(S.material == get_material_by_name(MAT_LEATHER))
 			if(S.use(2))
 				to_chat(user, span_notice("You curve the plate inwards, and add a strap for adjustment."))
 				user.drop_from_inventory(src)
@@ -411,4 +411,4 @@ Protectiveness | Armor %
 	icon_state = "material_armor_makeshift"
 
 /obj/item/clothing/head/helmet/material/makeshift/durasteel
-	default_material = "durasteel"
+	default_material = MAT_DURASTEEL

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

@@ -13,7 +13,7 @@
 	thrown_force_divisor = 0.5
 	item_state = "shard-glass"
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
-	default_material = "glass"
+	default_material = MAT_GLASS
 	unbreakable = 1 //It's already broken.
 	drops_debris = 0
 
@@ -144,7 +144,7 @@
 
 // Preset types - left here for the code that uses them
 /obj/item/material/shard/shrapnel/New(loc)
-	..(loc, "steel")
+	..(loc, MAT_STEEL)
 
 /obj/item/material/shard/phoron/New(loc)
-	..(loc, "borosilicate glass")
+	..(loc, MAT_PGLASS)

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

@@ -157,7 +157,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	mob_throw_hit_sound =  'sound/weapons/pierce.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
-	default_material = "glass"
+	default_material = MAT_GLASS
 	applies_material_colour = 0
 	fragile = 1	//It's a haphazard thing of glass, wire, and steel
 	reach = 2 // Spears are long.