Merge pull request #1169 from Kelenius/fixesOnly

Axes old wire, fixes costs in lathe

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

@@ -9,7 +9,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	matter = list(DEFAULT_WALL_MATERIAL = 1875)
+	matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2)
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -76,7 +76,7 @@
 	desc = "Those could work as a pretty decent throwing weapon" //why?
 	icon_state = "tile"
 	force = 6.0
-	matter = list(DEFAULT_WALL_MATERIAL = 937.5)
+	matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 4)
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
@@ -92,13 +92,13 @@
 	name = "steel floor tile"
 	singular_name = "steel floor tile"
 	icon_state = "tile_steel"
-	matter = list("plasteel" = 937.5)
+	matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
 
 /obj/item/stack/tile/floor_white
 	name = "white floor tile"
 	singular_name = "white floor tile"
 	icon_state = "tile_white"
-	matter = list("plastic" = 937.5)
+	matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
 
 /obj/item/stack/tile/floor_yellow
 	name = "yellow floor tile"
@@ -110,13 +110,13 @@
 	name = "dark floor tile"
 	singular_name = "dark floor tile"
 	icon_state = "fr_tile"
-	matter = list("plasteel" = 937.5)
+	matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
 
 /obj/item/stack/tile/floor_freezer
 	name = "freezer floor tile"
 	singular_name = "freezer floor tile"
 	icon_state = "tile_freezer"
-	matter = list("plastic" = 937.5)
+	matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
 
 /obj/item/stack/tile/floor/cyborg
 	name = "floor tile synthesizer"

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

@@ -1,18 +0,0 @@
-// WIRES
-
-/obj/item/weapon/wire/proc/update()
-	if (src.amount > 1)
-		src.icon_state = "spool_wire"
-		src.desc = text("This is just spool of regular insulated wire. It consists of about [] unit\s of wire.", src.amount)
-	else
-		src.icon_state = "item_wire"
-		src.desc = "This is just a simple piece of regular insulated wire."
-	return
-
-/obj/item/weapon/wire/attack_self(mob/user as mob)
-	if (src.laying)
-		src.laying = 0
-		user << "<span class='notice'>You're done laying wire!</span>"
-	else
-		user << "<span class='warning'>You are not using this to lay wire...</span>"
-	return