From c12d3aaaa62181f04fd8ebfb2129304f9dc411a2 Mon Sep 17 00:00:00 2001 From: Ssalty <65713506+KazooBard@users.noreply.github.com> Date: Fri, 31 Oct 2025 23:01:09 +0100 Subject: [PATCH] Stunswords cannot be crafted with cargo sabres, renfair claymores and bone swords (#4865) ## About The Pull Request Upstream PR blacklisted almost all non-true variants, including a lot of unique ones - this is a very powerful weapon reserved for rare instances, NOT FOR MASS PRODUCTION. And with them not having all of the items this PR targets, it slipped by for us. They (items) shouldn't have been allowed to do this to begin with. Scream at me for formatting change on the override. ## Changelog :cl: fix: Stunswords cannot be crafted with cargo sabres/bone swords/renfair swords /:cl: --- .../modular_items/code/recipes_misc.dm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modular_zubbers/code/modules/modular_items/code/recipes_misc.dm b/modular_zubbers/code/modules/modular_items/code/recipes_misc.dm index 5f073e50c63..ed0097cb8cb 100644 --- a/modular_zubbers/code/modules/modular_items/code/recipes_misc.dm +++ b/modular_zubbers/code/modules/modular_items/code/recipes_misc.dm @@ -51,3 +51,22 @@ /obj/item/stack/sheet/cloth = 2) time = 80 category = CAT_MISC + +/datum/crafting_recipe/stunsword + blacklist = list( + /obj/item/claymore/cutlass, + /obj/item/claymore/cutlass/old, + /obj/item/claymore/carrot, + /obj/item/claymore/shortsword, + /obj/item/claymore/highlander, + /obj/item/claymore/weak, + /obj/item/claymore/weak/weaker, + /obj/item/claymore/weak/ceremonial, + /obj/item/claymore/highlander/robot, + /obj/item/claymore/bone + ) + +/datum/crafting_recipe/stunswordalt2 + blacklist = list( + /obj/item/melee/sabre/cargo + )