Massive Weapon Expansion - Use those Unused Sprites

code/__DEFINES/combat.dm

@@ -202,6 +202,7 @@
 #define AXE_GRTCHOP			/datum/intent/axe/chop/great //For polearm axes
 #define GREATAXE_CHOP		/datum/intent/axe/chop/greataxe
 #define DBLGREATAXE_CHOP	/datum/intent/axe/chop/greataxe/doublehead
+#define GREATAXE_CLEAVE	    /datum/intent/axe/chop/greataxe/slayeraxe
 
 #define POLEARM_THRUST		/datum/intent/polearm/thrust
 #define SPEAR_THRUST		/datum/intent/polearm/thrust/spear

code/game/objects/items/weapons/intents/axe_intents.dm

@@ -37,6 +37,18 @@
 	damfactor = 1.3 // Stronger
 	misscost = 18 // Costs more if you miss
 
+/datum/intent/axe/chop/greataxe/slayeraxe
+    name = "cleave"
+    icon_state = "incleave"
+    penfactor = AP_GREATAXE_CHOP + 10
+    clickcd = 30
+    chargetime = 5
+    swingdelay = 2.5
+    damfactor = 2
+    misscost = 80
+    no_early_release = TRUE
+    acc_bonus = -5 // Hard to swing it at a standing target
+
 // AXE CUT INTENTS //
 /datum/intent/axe/cut
 	name = "cut"

code/game/objects/items/weapons/melee/axes.dm

@@ -263,6 +263,25 @@
 			if("onbelt")
 				return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0)
 
+
+//------------------ Silver Axe ---------------//
+/obj/item/weapon/axe/steel/silver
+	name = "silver axe"
+	desc = "A silver axe, not as strong as steel but more effective against supernatural foes."
+	icon_state = "silveraxe"
+	max_blade_int = 200
+	max_integrity = INTEGRITY_STRONGEST * 0.8
+	minstr = 6
+	smeltresult = /obj/item/ingot/silver
+	sellprice = 80
+	axe_cut = 13
+	item_weight = 1.7 KILOGRAMS
+
+/obj/item/weapon/axe/steel/silver/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
+
+
 //.................. Bearded Axe ...............//
 /obj/item/weapon/axe/steel/atgervi
 	name = "bearded axe"
@@ -487,6 +506,18 @@
 	sellprice = 100
 	item_weight = 5.5 KILOGRAMS
 
+/obj/item/weapon/greataxe/steel/slayeraxe
+	name = "dragonslayer axe"
+	desc = "A mighty axe made of heavy, durable metal. The head alone is as big as a man, used to cleave headfs from beasts and men alike"
+	icon_state = "oath"
+	wbalance = EASY_TO_DODGE
+	possible_item_intents = list(AXE_CUT, AXE_CHOP, POLEARM_BASH)
+	gripped_intents = list(DBLGREATAXE_CUT, DBLGREATAXE_CHOP, POLEARM_BASH, GREATAXE_CLEAVE)
+	max_blade_int = 400
+	minstr = 13
+	max_integrity = INTEGRITY_STRONGEST * 1.25
+	item_weight = 12 KILOGRAMS
+
 /obj/item/weapon/greataxe/steel/doublehead/graggar
 	name = "vicious greataxe"
 	desc = "A greataxe who's edge thrums with the motive force, violence, oh, sweet violence!"

code/game/objects/items/weapons/melee/blunt.dm

@@ -655,6 +655,22 @@
 	melt_amount = 150
 	item_weight = 2.2 KILOGRAMS
 
+/obj/item/weapon/mace/warhammer/steel/silver
+	name = "silver warhammer"
+	desc = "A silver warhammer, made to fight nite-creachers. It makes a satisfying sound when paired with a skeleton's skull."
+	icon_state = "silverhammer"
+	wdefense = GOOD_PARRY
+	max_integrity = INTEGRITY_STRONGEST * 0.8
+	smeltresult = /obj/item/ingot/silver
+	melting_material = /datum/material/silver
+	melt_amount = 150
+	sellprice = 90
+	item_weight = 2.3 KILOGRAMS
+
+/obj/item/weapon/mace/warhammer/steel/silver/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
+
 //................ Elven Club  ............... //
 
 /obj/item/weapon/mace/elvenclub

code/game/objects/items/weapons/melee/flail.dm

@@ -89,6 +89,23 @@
 	icon_state = "necraflail"
 	item_weight = 1.4 KILOGRAMS
 
+//................ Silver Flail ............... //
+/obj/item/weapon/flail/silflail
+	name = "silver flail"
+	desc = "A shining silver flail, bane of all who lurk in the night. Crush the skull of the nitebeast"
+	icon_state = "silverflail"
+	force = DAMAGE_GOOD_FLAIL - 1
+	max_integrity = INTEGRITY_STRONGEST * 0.8
+	minstr = 4
+	smeltresult = null
+	smeltresult = /obj/item/ingot/silver
+	sellprice = 90
+	item_weight = 1 KILOGRAMS
+
+/obj/item/weapon/flail/silflail/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
+
 //................ Psydon Flail ............... //
 /obj/item/weapon/flail/psydon
 	name = "psydonian flail"

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

@@ -186,7 +186,7 @@
 	desc = "A short blade that even the weakest of hands can aspire to do harm with."
 	icon_state = "combatknife"
 	throwforce = DAMAGE_KNIFE + 6
-	possible_item_intents = list(DAGGER_CUT, DAGGER_CHOP)
+	possible_item_intents = list(DAGGER_CUT, CLEAVER_CHOP) // Its a steel cleaver, plus it lets you use it with a meathook as both cleaver to chop the animal and a knife to skin it
 	max_integrity = INTEGRITY_STANDARD
 	melting_material = /datum/material/steel
 	wbalance = HARD_TO_DODGE

code/game/objects/items/weapons/melee/polearms.dm

@@ -106,6 +106,22 @@
 	melting_material = /datum/material/steel
 	melt_amount = 75
 
+/obj/item/weapon/polearm/woodstaff/quarterstaff/silver
+	name = "silver quarterstaff"
+	desc = "A quarterstaff with silver reinforcements, more effective against supernatural foes than a steel quarterstaff."
+	icon_state = "quarterstaff_silver"
+	force_wielded =  DAMAGE_STAFF_WIELD + 1
+	gripped_intents = list(POLEARM_BASH, MACE_SMASH)
+	max_integrity = INTEGRITY_STRONGEST * 0.8
+	minstr = 7
+	item_weight = 2.2 KILOGRAMS
+	smeltresult = null
+	melting_material = /datum/material/silver
+	melt_amount = 75
+
+/obj/item/weapon/polearm/woodstaff/quarterstaff/silver/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
 
 /obj/item/weapon/polearm/woodstaff/seer
 	name = "staff of the rous seer"
@@ -145,6 +161,47 @@
 				return list("shrink" = 0.6,"sx" = 5,"sy" = -3,"nx" = -5,"ny" = -2,"wx" = -5,"wy" = -1,"ex" = 3,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 7,"sturn" = -7,"wturn" = 16,"eturn" = -22,"nflip" = 8,"sflip" = 0,"wflip" = 8,"eflip" = 0)
 
 
+/obj/item/weapon/polearm/spear/steel
+	name = "steel spear"
+	desc = "A spear with a steel head, more durable and effective than a simple iron spear."
+	icon_state = "spear_sk"
+	force = DAMAGE_SPEARPLUS + 2
+	force_wielded = DAMAGE_SPEAR_WIELD + 2
+	wbalance = GREAT_PARRY
+	max_integrity = INTEGRITY_STRONGEST
+	max_blade_int = 200
+	smeltresult = /obj/item/ingot/steel_slag
+	sellprice = 40
+	item_weight = 2.7 KILOGRAMS
+
+/obj/item/weapon/polearm/spear/silver
+	name = "silver spear"
+	desc = "A spear with a silver head, more effective against supernatural foes than a steel spear."
+	icon_state = "silverspear"
+	force = DAMAGE_SPEARPLUS
+	force_wielded = DAMAGE_SPEAR_WIELD
+	wbalance = GREAT_PARRY
+	max_integrity = INTEGRITY_STRONGEST * 0.8
+	max_blade_int = 200
+	smeltresult = /obj/item/ingot/silver
+	sellprice = 60
+	item_weight = 2.7 KILOGRAMS
+
+/obj/item/weapon/polearm/spear/silver/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
+
+/obj/item/weapon/polearm/spear/partizan
+	name = "partizan"
+	desc = "A spear with a heavy steel head, deisgned for stabbing and chopping"
+	icon_state = "partizan"
+	force = DAMAGE_SPEARPLUS + 3
+	force_wielded = DAMAGE_SPEAR_WIELD + 3
+	max_blade_int = 300
+	max_integrity = INTEGRITY_STRONGEST * 1.25
+	minstr = 9
+	sellprice = 50
+
 /obj/item/weapon/polearm/spear/abyssor
 	name = "depthseeker"
 	desc = "An instrument of Abyssor's wrath to punish the ignorant."
@@ -279,7 +336,7 @@
 	item_weight = 1.8 KILOGRAMS
 
 /obj/item/weapon/polearm/spear/stone/copper
-	name = "javelin"
+	name = "copper javelin"
 	desc = "Made for throwing, long out of favor and using inferior metals, it still can kill when the aim is true."
 	icon_state = "cspear"
 	throwforce = DAMAGE_SPEAR_WIELD
@@ -303,6 +360,37 @@
 			if("wielded")
 				return list("shrink" = 0.7,"sx" = 5,"sy" = -3,"nx" = -5,"ny" = -2,"wx" = -5,"wy" = -1,"ex" = 3,"ey" = -2,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 7,"sturn" = -7,"wturn" = 16,"eturn" = -22,"nflip" = 8,"sflip" = 0,"wflip" = 8,"eflip" = 0)
 
+/obj/item/weapon/polearm/spear/stone/copper/iron
+	name = "iron javelin"
+	desc = "Heavier than acopper javelin, best suited for hunting beasts"
+	icon = 'icons/roguetown/weapons/ammo.dmi'
+	icon_state = "ijavelin"
+	throwforce = DAMAGE_SPEAR_WIELD + 2
+	max_blade_int = 80
+	max_integrity = INTEGRITY_STANDARD
+
+/obj/item/weapon/polearm/spear/stone/copper/steel
+	name = "steel javelin"
+	desc = "A sturdy javelin made from steel, suitable to hunt knightly foes."
+	icon = 'icons/roguetown/weapons/ammo.dmi'
+	icon_state = "javelin"
+	throwforce = DAMAGE_SPEAR_WIELD + 3
+	max_blade_int = 100
+	max_integrity = INTEGRITY_STANDARD * 1.25
+
+/obj/item/weapon/polearm/spear/stone/copper/silver
+	name = "silver javelin"
+	desc = "A sturdy javelin made from silver, suitable to hunt supernatural foes."
+	icon = 'icons/roguetown/weapons/ammo.dmi'
+	icon_state = "sjavelin"
+	throwforce = DAMAGE_SPEAR_WIELD + 3
+	max_blade_int = 100
+	max_integrity = INTEGRITY_STANDARD * 0.8
+
+/obj/item/weapon/polearm/spear/stone/copper/silver/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
+
 /obj/item/weapon/polearm/spear/bone
 	name = "bone javelin"
 	desc = "Made by the tribes of the wilds for hunting, this spear has will eventually kill your prey, if aim remains true."
@@ -381,6 +469,25 @@
 	sellprice = 90
 	item_weight = 3.5 KILOGRAMS
 
+/obj/item/weapon/polearm/halberd/silver
+	name = "silver halberd"
+	desc = "A halberd forged from silver, laying low the beasts of the nite."
+	icon = 'icons/roguetown/weapons/64/axes.dmi'
+	icon_state = "silverhalberd"
+	force = DAMAGE_SPEAR
+	force_wielded = DAMAGE_HALBERD_WIELD
+	wbalance = EASY_TO_DODGE
+	max_integrity = INTEGRITY_STRONGEST * 0.8
+	max_blade_int = 300
+	smeltresult = /obj/item/ingot/silver
+	melting_material = /datum/material/silver
+	melt_amount = 150
+	sellprice = 120
+
+/obj/item/weapon/polearm/halberd/silver/Initialize(mapload)
+	. = ..()
+	enchant(/datum/enchantment/silver)
+
 /obj/item/weapon/polearm/halberd/getonmobprop(tag)
 	. = ..()
 	if(tag)
@@ -546,6 +653,17 @@
 	melting_material = /datum/material/steel
 	item_weight = 3.5 KILOGRAMS
 
+/obj/item/weapon/polearm/halberd/bardiche/glaive
+	name = "steel glaive"
+	desc = "A uniquely designed polearm, modeled after Deliverance. Excellent for chopping down your foes."
+	icon_state = "glaive"
+	force = DAMAGE_AXE + 2
+	max_blade_int = 200
+	max_integrity = INTEGRITY_STRONGEST
+	smeltresult = /obj/item/ingot/steel_slag
+	melting_material = /datum/material/steel
+	melt_amount = 150
+
 //................ Eagle Beak ............... //
 /obj/item/weapon/polearm/eaglebeak
 	name = "eagle's beak"