Merge pull request #554 from KoboldCommando/sharpmop

We can now sharpen mops
Monkestation · Nov 24, 2023 · 836262d · 836262d
2 parents cea1863 + 3baf73b
commit 836262d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/code/datums/components/crafting/melee_weapon.dm b/code/datums/components/crafting/melee_weapon.dm
@@ -142,3 +142,12 @@
 	)
 	time = 10 SECONDS
 	category = CAT_WEAPON_MELEE
+
+/datum/crafting_recipe/sharpmop
+	name = "Sharpened Mop"
+	result = /obj/item/mop/sharp
+	time = 30
+	reqs = list(/obj/item/mop = 1,
+				/obj/item/shard = 1)
+	category = CAT_WEAPON_MELEE
+	tool_behaviors = list(TOOL_WIRECUTTER)
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
@@ -158,3 +158,18 @@
 
 /obj/item/mop/advanced/cyborg
 	insertable = FALSE
+
+/obj/item/mop/sharp //Basically a slightly worse spear.
+	desc = "A mop with a sharpened handle. Careful!"
+	name = "sharpened mop"
+	force = 10
+	throwforce = 18
+	throw_speed = 4
+	demolition_mod = 0.75
+	embedding = list("impact_pain_mult" = 2, "remove_pain_mult" = 4, "jostle_chance" = 2.5)
+	armour_penetration = 10
+	attack_verb_continuous = list("mops", "stabs", "shanks", "jousts")
+	attack_verb_simple = list("mop", "stab", "shank", "joust")
+	sharpness = SHARP_EDGED //spears aren't pointy either.  Just assume it's carved into a naginata-style blade
+	wound_bonus = -15
+	bare_wound_bonus = 15