compilies/??

code/modules/smithing/smithed_items.dm

@@ -1,10 +1,24 @@
 /obj/item/smithing
 	name = "base class /obj/item/smithing"
-	desc = "A [src]. Hit it with a [finishingitem] to create a [finalitem]."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "unfinished"
+	material_flags = MATERIAL_COLOR | MATERIAL_ADD_PREFIX
 	var/quality = 0 //quality. Changed by the smithing process.
 	var/obj/item/finishingitem = /obj/item/stick //What this item needs to be hit by to create finalitem
-	var/obj/item/finalitem = /obj/item
+	var/obj/item/finalitem = /obj/item/melee/smith
 
+/obj/item/ingot
+	name = "ingot"
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "unfinished"
+	material_flags = MATERIAL_COLOR | MATERIAL_ADD_PREFIX
+	var/workability = "shapeable"
+
+/obj/item/ingot/iron
+	custom_materials = list(/datum/material/iron=12000)
+
+/obj/item/smithing/Initialize()
+	desc = "A [src]. Hit it with a [finishingitem] to create a [finalitem]."
 /obj/item/smithing/attackby(obj/item/I, mob/user)
 	if(istype(I, finishingitem))
 		to_chat(user, "You finish the [src].")
@@ -16,12 +30,37 @@
 
 /obj/item/smithing/proc/dofinish()
 	var/turf/T = get_turf(src)
-	new finalitem(T)
+	. = new finalitem(T)
+	finalitem.set_custom_materials(custom_materials)
+	var/qualname
+	switch(quality)
+		if(-1000 to -5)
+			qualname = "awful"
+		if(-1000 to -2)
+			qualname = "shoddy"
+		if(-1000 to 0)
+			qualname =  "poor"
+		if(0)
+			qualname = "normal"
+		if(10 to INFINITY)
+			qualname = "legendary"
+		if(8,9)
+			qualname = "masterwork"
+		if(6,7)
+			qualname = "excellent"
+		if(4,5)
+			qualname = "good"
+		if(1,2,3)
+			qualname = "above-average"
+	var/datum/material/mat = custom_materials[1]
+	mat = mat.name
+	finalitem.name = "[qualname] [mat] [finalitem.name]."
 	qdel(src)
+	return
 
 /obj/item/smithing/axehead
 	name = "smithed axe head"
-	finalitem = /obj/item/hatchet/smithed
+	finalitem = /obj/item/melee/smith/axe
 
 /obj/item/smithing/axehead/dofinish()
 	finalitem.force += quality
@@ -29,11 +68,12 @@
 
 /obj/item/smithing/hammerhead
 	name = "smithed hammer head"
-	finalitem = /obj/item/melee/hammer
+	var/obj/item/melee/smith/hammer/finalforreal = /obj/item/melee/smith/hammer
 
 /obj/item/smithing/hammerhead/dofinish()
-	finalitem.force += quality/2
-	finalitem.qualitymod = quality/4
+	finalforreal.force += quality/2
+	finalforreal.qualitymod = quality/4
+	finalitem = finalforreal
 	..()
 
 /obj/item/smithing/scytheblade
@@ -55,7 +95,7 @@
 
 /obj/item/smithing/cogheadclubhead
 	name = "smithed coghead club head"
-	finalitem = /obj/item/melee/cleric_mace/cogheadclub
+	finalitem = /obj/item/melee/smith/cogheadclub
 
 /obj/item/smithing/cogheadclubhead/dofinish()
 	finalitem.force += quality
@@ -63,7 +103,7 @@
 
 /obj/item/smithing/javelinhead
 	name = "smithed javelin head"
-	finalitem = /obj/item/spear/javelin
+	finalitem = /obj/item/melee/smith/javelin
 
 /obj/item/smithing/javelinhead/dofinish()
 	finalitem.force += quality
@@ -71,20 +111,29 @@
 
 /obj/item/smithing/pickaxehead
 	name = "smithed pickaxe head"
-	finalitem = /obj/item/pickaxe/smithed
+	var/obj/item/pickaxe/smithed/finalforreal = /obj/item/pickaxe/smithed
 
 /obj/item/smithing/pickaxehead/dofinish()
-	finalitem.force += quality/2
-	finalitem.toolspeed /= quality
+	finalforreal.force += quality/2
+	finalforreal.toolspeed /= quality
+	switch(quality)
+		if(10 to INFINITY)
+			finalforreal.digrange = 4
+		if(5 to 9)
+			finalforreal.digrange = 3
+		if(3,4)
+			finalforreal.digrange = 2
+	finalitem = finalforreal
 	..()
 
 /obj/item/smithing/prospectingpickhead
 	name = "smithed prospector's pickaxe head"
-	finalitem = /obj/item/mining_scanner/prospector
+	var/obj/item/mining_scanner/prospector/finalforreal = /obj/item/mining_scanner/prospector
 
 /obj/item/smithing/prospectingpickhead/dofinish()
-	finalitem.range = 2 + quality
-	finalitem.cooldown = 50/quality
+	finalforreal.range = 2 + quality
+	finalforreal.cooldown = 100/quality
+	finalitem = finalforreal
 	..()
 
 /obj/item/smithing/shortswordblade
@@ -108,7 +157,7 @@
 /obj/item/smithing/broadblade
 	name = "smithed broadsword blade"
 	finishingitem = /obj/item/swordhandle
-	finalitem = /obj/item/melee/smith/broadsword
+	finalitem = /obj/item/melee/smith/shortsword
 
 /obj/item/smithing/broadblade/dofinish()
 	finalitem.force += quality
@@ -116,8 +165,21 @@
 
 /obj/item/smithing/halberdhead
 	name = "smithed halberd head"
-	finalitem = /obj/item/spear/halberd
+	finalitem = /obj/item/melee/smith/halberd
 
 /obj/item/smithing/halberdhead/dofinish()
 	finalitem.force += quality
 	..()
+
+/obj/item/stick
+	name = "wooden rod"
+	desc = "It's a rod, suitable for use of a handle of a tool. Also could serve as a weapon, in a pinch."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "stick"
+	force = 7
+
+/obj/item/swordhandle
+	name = "sword handle"
+	desc = "It's a rod, suitable for use of a handle of a tool. Also could serve as a weapon, in a pinch."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "stick"