Files
Alexis 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00

279 lines
7.4 KiB
Plaintext

/datum/crafting_recipe/stunprod
name = "Stunprod"
result = /obj/item/melee/baton/security/cattleprod
reqs = list(
/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
/obj/item/assembly/igniter = 1,
)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/teleprod
name = "Teleprod"
result = /obj/item/melee/baton/security/cattleprod/teleprod
reqs = list(
/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
/obj/item/assembly/igniter = 1,
/obj/item/stack/ore/bluespace_crystal = 1,
)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/telecrystalprod
name = "Snatcherprod"
result = /obj/item/melee/baton/security/cattleprod/telecrystalprod
reqs = list(
/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
/obj/item/assembly/igniter = 1,
/obj/item/stack/telecrystal = 1,
)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/stunsword
name = "\improper NT-20 'Excalibur' Stunsword"
result = /obj/item/melee/baton/security/stunsword
reqs = list(
/obj/item/claymore = 1,
/obj/item/melee/baton/security = 1
)
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/ceremonial,
/obj/item/claymore/highlander/robot
)
tool_behaviors = list(TOOL_WELDER)
time = 10 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/stunswordalt
name = "\improper NT-20 'Excalibur' Stunsword"
result = /obj/item/melee/baton/security/stunsword
reqs = list(
/obj/item/katana = 1,
/obj/item/melee/baton/security = 1,
)
tool_behaviors = list(TOOL_WELDER)
crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
time = 10 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/stunswordalt2
name = "\improper NT-20 'Excalibur' Stunsword"
result = /obj/item/melee/baton/security/stunsword
reqs = list(
/obj/item/melee/sabre = 1,
/obj/item/melee/baton/telescopic/contractor_baton = 1,
)
tool_behaviors = list(TOOL_WELDER)
crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
time = 10 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/tailclub
name = "Tail Club"
result = /obj/item/tailclub
reqs = list(
/obj/item/organ/tail/lizard = 1,
/obj/item/stack/sheet/iron = 1,
)
blacklist = list(/obj/item/organ/tail/lizard/fake)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/balloon_mallet
name = "Balloon Mallet"
result = /obj/item/balloon_mallet
reqs = list(
/obj/item/toy/balloon/long = 18,
)
time = 10 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/balloon_mallet/check_requirements(mob/user, list/collected_requirements)
return HAS_TRAIT(user, TRAIT_BALLOON_SUTRA)
/datum/crafting_recipe/tailwhip
name = "Liz O' Nine Tails"
result = /obj/item/melee/chainofcommand/tailwhip
reqs = list(
/obj/item/organ/tail/lizard = 1,
/obj/item/stack/cable_coil = 1,
)
blacklist = list(/obj/item/organ/tail/lizard/fake)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/catwhip
name = "Cat O' Nine Tails"
result = /obj/item/melee/chainofcommand/tailwhip/kitty
reqs = list(
/obj/item/organ/tail/cat = 1,
/obj/item/stack/cable_coil = 1,
)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/chainsaw
name = "Chainsaw"
result = /obj/item/chainsaw
reqs = list(
/obj/item/circular_saw = 1,
/obj/item/stack/cable_coil = 3,
/obj/item/stack/sheet/plasteel = 5,
)
tool_behaviors = list(TOOL_WELDER)
time = 5 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/spear
name = "Spear"
result = /obj/item/spear
reqs = list(
/obj/item/restraints/handcuffs/cable = 1,
/obj/item/shard = 1,
/obj/item/stack/rods = 1,
)
time = 4 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/wireprod
name = "Wireprod assembly"
result = /obj/item/wireprod
reqs = list(
/obj/item/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
)
time = 2 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/toysword
name = "Toy Sword"
reqs = list(
/obj/item/light/bulb = 1,
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/plastic = 4,
)
result = /obj/item/toy/sword
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/bonedagger
name = "Bone Dagger"
result = /obj/item/knife/combat/bone
time = 2 SECONDS
reqs = list(/obj/item/stack/sheet/bone = 2)
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/bonespear
name = "Bone Spear"
result = /obj/item/spear/bonespear
time = 3 SECONDS
reqs = list(
/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 1,
)
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/boneaxe
name = "Bone Axe"
result = /obj/item/fireaxe/boneaxe
time = 5 SECONDS
reqs = list(
/obj/item/stack/sheet/bone = 6,
/obj/item/stack/sheet/sinew = 3,
)
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/house_edge
name = "House Edge"
result = /obj/item/house_edge
tool_behaviors = list(TOOL_WRENCH, TOOL_SCREWDRIVER, TOOL_WELDER)
reqs = list(
/obj/item/v8_engine = 1,
/obj/item/weaponcrafting/receiver = 1,
/obj/item/assembly/igniter = 1,
/obj/item/stack/sheet/iron = 2,
/obj/item/knife = 1,
/obj/item/weldingtool = 1,
/obj/item/roulette_wheel_beacon = 1,
)
time = 10 SECONDS
category = CAT_WEAPON_MELEE
crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED
/datum/crafting_recipe/giant_wrench
name = "Big Slappy"
result = /obj/item/shovel/giant_wrench
tool_behaviors = list(TOOL_CROWBAR, TOOL_SCREWDRIVER, TOOL_WELDER)
reqs = list(
/obj/item/wrench = 4,
/obj/item/weaponcrafting/giant_wrench = 1,
/obj/item/stack/sheet/plasteel = 5,
/obj/item/stack/rods = 10,
/obj/item/pickaxe/drill = 1,
)
time = 10 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/singulo_hammer
name = "Singularity Hammer"
result = /obj/item/singularityhammer
reqs = list(
/obj/item/assembly/signaler/anomaly/pyro = 1,
/obj/item/assembly/signaler/anomaly/grav = 1,
/obj/item/assembly/signaler/anomaly/flux = 1,
/obj/item/assembly/signaler/anomaly/bluespace = 1,
/obj/item/assembly/signaler/anomaly/vortex = 1,
/obj/item/assembly/signaler/anomaly/bioscrambler = 1,
/obj/item/assembly/signaler/anomaly/hallucination = 1,
/obj/item/assembly/signaler/anomaly/dimensional = 1,
/obj/item/assembly/signaler/anomaly/ectoplasm = 1,
)
machinery = list(
/obj/machinery/power/supermatter_crystal = CRAFTING_MACHINERY_CONSUME,
)
time = 10 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/bambostaff
name = "Bamboo Bo Staff"
result = /obj/item/bambostaff
reqs = list(
/obj/item/stack/sheet/mineral/bamboo = 4,
/obj/item/grown/log/steel = 2,
)
time = 8 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/sm_sword
name = "Supermatter Sword"
result = /obj/item/melee/supermatter_sword
reqs = list(
/obj/item/assembly/signaler/anomaly/vortex = (MAX_CORES_VORTEX - 1),
)
machinery = list(
/obj/machinery/power/supermatter_crystal/small = CRAFTING_MACHINERY_CONSUME,
)
time = 120 SECONDS
category = CAT_WEAPON_MELEE
/datum/crafting_recipe/dragonator_spear_untreated
name = "Untreated Giant-Killer Spear"
result = /obj/item/spear/dragonator_untreated
reqs = list(
/obj/item/stack/sheet/plasteel = 15,
/obj/item/stack/sheet/mineral/titanium = 5,
/obj/item/knife = 7,
)
time = 5 SECONDS
category = CAT_WEAPON_MELEE