Merge pull request #5878 from Trilbyspaceclone/hammer_pool_thing

Hammer pole thing

code/datums/autolathe/biomatter.dm

@@ -213,6 +213,10 @@
 	name = "NT Halberd"
 	build_path = /obj/item/tool/spear/halberd
 
+/datum/design/autolathe/sword/nt_polehammer
+	name = "NT Polehammer"
+	build_path = /obj/item/tool/spear/polehammer
+
 /datum/design/autolathe/sword/nt_spear
 	name = "NT Spear"
 	build_path = /obj/item/tool/sword/nt/spear

code/game/objects/items/weapons/autolathe_disk/absolute_disks.dm

@@ -106,6 +106,7 @@
 		/datum/design/autolathe/sword/nt_longsword,
 		/datum/design/autolathe/sword/nt_dagger,
 		/datum/design/autolathe/sword/nt_halberd,
+		/datum/design/autolathe/sword/nt_polehammer,
 		/datum/design/autolathe/sword/nt_scourge,
 		/datum/design/autolathe/sword/nt_spear,
 		/datum/design/autolathe/sword/nt_warhammer,
@@ -165,6 +166,7 @@
 		/datum/design/autolathe/sword/nt_longsword,
 		/datum/design/autolathe/sword/nt_dagger,
 		/datum/design/autolathe/sword/nt_halberd,
+		/datum/design/autolathe/sword/nt_polehammer,
 		/datum/design/autolathe/sword/nt_scourge,
 		/datum/design/autolathe/sword/nt_spear,
 		/datum/design/autolathe/nt/shield/nt_buckler,

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

@@ -79,6 +79,27 @@
 	price_tag = 600
 	matter = list(MATERIAL_BIOMATTER = 60, MATERIAL_STEEL = 8, MATERIAL_WOOD = 10, MATERIAL_PLASTEEL = 2)
 
+/obj/item/tool/spear/polehammer
+	name = "polehammer"
+	desc = "This weapon of ancient design appears to be a spear-hammer hybrid. \
+	A close relative to the halberd with focus on penetrating armor more easily. \
+	This polehammer is the Church's adaption to ever stronger power shells and thicker furs from mutations on Amethyn. \
+	It bears a tau cross marking it as produced by the Church of the Absolute's New Testament weapons division."
+	icon = 'icons/obj/nt_melee.dmi'
+	icon_state = "nt_polehammer"
+	item_state = "nt_polehammer"
+	wielded_icon = "nt_polehammer"
+	force = WEAPON_FORCE_NORMAL
+	armor_divisor = ARMOR_PEN_MAX
+	max_upgrades = 3
+	w_class = ITEM_SIZE_HUGE
+	slot_flags = SLOT_BACK
+	extended_reach = TRUE
+	forced_broad_strike = TRUE
+	price_tag = 600
+	tool_qualities = list(QUALITY_HAMMERING = 15) //Able to help make baracades and hammer out cracks.
+	matter = list(MATERIAL_BIOMATTER = 50, MATERIAL_STEEL = 6, MATERIAL_WOOD = 12, MATERIAL_PLASTEEL = 4)
+
 /obj/item/tool/sword/nt/scourge
 	name = "scourge"
 	desc = "A saintly looking whip sword, extreme punishment in handheld form. Can be extended to inflict even more pain. \

code/modules/core_implant/cruciform/rituals/path.dm

@@ -986,7 +986,7 @@
 			/obj/item/tool/sword/crusader,
 			/obj/item/storage/firstaid/nt,
 			/obj/item/stack/medical/bruise_pack/advanced/nt,
-			/obj/item/stack/medical/ointment/advanced/nt)
+			/obj/item/stack/medical/ointment/advanced/nt,)
 
 		can_magnet += typesof(/obj/item/tool/sword/nt) - /obj/item/tool/sword/nt/longsword/implant
 		can_magnet += typesof(/obj/item/tool/knife/neotritual) - /obj/item/tool/knife/neotritual/implant