TESTMERGE TIME?

code/modules/smithing/anvil.dm

@@ -11,8 +11,11 @@
 
 #define RECIPE_SMALLKNIFE "sdd" //shrink draw draw
 #define RECIPE_SHORTSWORD "dff" //draw fold fold
+#define RECIPE_WAKI "dfsf" //draw shrink fold
 #define RECIPE_SCIMITAR "dfb" //draw fold bend
-#define RECIPE_BROADSWORD "dfufd" //draw fold upset fold draw
+#define RECIPE_SABRE "ddsf" //draw draw shrink fold
+#define RECIPE_RAPIER "sddf" //shrink draw draw fold
+#define RECIPE_BROADSWORD "dfuf" //draw fold upset fold
 #define RECIPE_ZWEIHANDER "udfsf" //upset draw fold shrink fold
 #define RECIPE_KATANA "fffff" //fold fold fold fold fold
 
@@ -50,6 +53,9 @@
 	RECIPE_SMALLPICK = /obj/item/smithing/prospectingpickhead,
 	RECIPE_SHORTSWORD = /obj/item/smithing/shortswordblade,
 	RECIPE_SCIMITAR = /obj/item/smithing/scimitarblade,
+	RECIPE_WAKI = /obj/item/smithing/wakiblade,
+	RECIPE_RAPIER = /obj/item/smithing/rapierblade,
+	RECIPE_SABRE = /obj/item/smithing/sabreblade,
 	RECIPE_SMALLKNIFE = /obj/item/smithing/knifeblade,
 	RECIPE_BROADSWORD = /obj/item/smithing/broadblade,
 	RECIPE_ZWEIHANDER = /obj/item/smithing/zweiblade,

code/modules/smithing/finished_items.dm

@@ -9,7 +9,7 @@
 	total_mass = TOTAL_MASS_MEDIEVAL_WEAPON //yeah ok
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
-	force = 10
+	force = 6
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	var/quality
@@ -31,6 +31,8 @@
 
 /obj/item/melee/smith/twohand
 	item_flags = NEEDS_PERMIT //it's a bigass sword/spear. beepsky is going to give you shit for it.
+	sharpness = SHARP_EDGED
+	force = 5
 	wielded_mult = 1.75
 	w_class = WEIGHT_CLASS_BULKY
 
@@ -49,6 +51,7 @@
 	desc = "A pickaxe that can sound rocks to find mineral deposits and stop gibtonite detonations."
 	icon = 'icons/obj/smith.dmi'
 	icon_state = "pickaxe" //todo:sprite
+	sharpness = SHARP_POINTY//it doesnt have a blade it has a point
 
 /obj/item/mining_scanner/prospector/Initialize()
 	..()
@@ -65,6 +68,7 @@
 	desc = "A pickaxe."
 	icon = 'icons/obj/smith.dmi'
 	icon_state = "pickaxe"
+	sharpness = SHARP_POINTY
 
 /obj/item/pickaxe/smithed/Initialize()
 	..()
@@ -81,6 +85,7 @@
 	desc = "A shovel."
 	icon = 'icons/obj/smith.dmi'
 	icon_state = "shovel"
+	sharpness = SHARP_EDGED //it cuts through the earth
 
 /obj/item/shovel/smithed/Initialize()
 	..()
@@ -101,6 +106,7 @@
 /obj/item/melee/smith/twohand/halberd
 	name = "halberd"
 	icon_state = "halberd"
+	w_class = WEIGHT_CLASS_HUGE
 	overlay_state = "spearhandle"
 	slot_flags = ITEM_SLOT_BACK
 
@@ -114,6 +120,7 @@
 	overlay_state = "longhandle"
 	wielded_mult = 1.5
 	slot_flags = ITEM_SLOT_BACK
+	sharpness = SHARP_POINTY
 
 
 /obj/item/melee/smith/twohand/javelin/ComponentInitialize()
@@ -134,9 +141,11 @@
 /obj/item/melee/smith/twohand/pike
 	name = "pike"
 	icon_state = "pike"
+	w_class = WEIGHT_CLASS_HUGE
 	overlay_state = "longhandle"
 	reach = 2 //yeah ok
 	slot_flags = ITEM_SLOT_BACK
+	sharpness = SHARP_POINTY
 
 //////////////////////////
 //      Other Melee     //
@@ -162,16 +171,19 @@
 /obj/item/melee/smith/shortsword
 	name = "gladius"
 	item_flags = NEEDS_PERMIT
+	sharpness = SHARP_EDGED
 	icon_state = "gladius"
 	overlay_state = "gladiushilt"
 
 /obj/item/melee/smith/shortsword/scimitar
 	name = "scimitar"
+	sharpness = SHARP_EDGED
 	icon_state = "scimitar"
 	overlay_state = "scimitarhilt"
 
 /obj/item/melee/smith/wakizashi
 	name = "wakizashi"
+	sharpness = SHARP_EDGED
 	item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
 	icon_state = "waki"
 	overlay_state = "wakihilt"
@@ -217,6 +229,7 @@
 /obj/item/melee/smith/sabre
 	name = "sabre"
 	icon_state = "sabre"
+	sharpness = SHARP_EDGED
 	overlay_state = "sabrehilt"
 	armour_penetration = 15
 	force = 9
@@ -227,8 +240,10 @@
 /obj/item/melee/smith/sabre/rapier
 	name = "rapier"
 	icon_state = "rapier"
+	sharpness = SHARP_EDGED
 	overlay_state = "rapierhilt"
 	force = 6 //less force, stronger parry
+	sharpness = SHARP_POINTY
 	armour_penetration = 30
 	block_parry_data = /datum/block_parry_data/smithrapier
 

code/modules/smithing/smithed_items.dm

@@ -256,6 +256,38 @@
 	finalitem.force += quality
 	..()
 
+/obj/item/smithing/wakiblade
+	name = "smithed wakizashi blade"
+	finishingitem = /obj/item/swordhandle
+	finalitem = /obj/item/melee/smith/wakizashi
+	icon_state = "waki"
+
+/obj/item/smithing/wakiblade/startfinish()
+	finalitem = new /obj/item/melee/smith/wakizashi(src)
+	finalitem.force += quality
+	..()
+
+/obj/item/smithing/sabreblade
+	name = "smithed sabre blade"
+	finishingitem = /obj/item/swordhandle
+	finalitem = /obj/item/melee/smith/sabre
+	icon_state = "sabre"
+
+/obj/item/smithing/sabrerblade/startfinish()
+	finalitem = new /obj/item/melee/smith/sabre(src)
+	finalitem.force += quality
+	..()
+
+/obj/item/smithing/rapierblade
+	name = "smithed rapier blade"
+	finishingitem = /obj/item/swordhandle
+	finalitem = /obj/item/melee/smith/sabre/rapier
+	icon_state = "rapier"
+
+/obj/item/smithing/rapierblade/startfinish()
+	finalitem = new /obj/item/melee/smith/sabre/rapier(src)
+	finalitem.force += quality
+	..()
 
 /obj/item/smithing/knifeblade
 	name = "smithed knife blade"