From ff393fa51ccc491d3330fc8a9d49ee8a89a752b8 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 25 Jul 2026 08:59:59 -0400 Subject: [PATCH] Small Weapon Sounds Fix (#22912) This logic error turns into a runtime error when compiled in OpenDream, in addition to just not working at all. --- code/game/objects/items/weapons/material/material_weapons.dm | 2 +- html/changelogs/hellfirejag-small-weapon-fix.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/hellfirejag-small-weapon-fix.yml diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 3784e4dd4bb..fe5efa80480 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -66,7 +66,7 @@ if(use_material_name) name = "[material.display_name] [initial(name)]" if(use_material_sound) - if(sharp && !material.weapon_hitsound == 'sound/weapons/metalhit.ogg' || !sharp) + if(!sharp || material.weapon_hitsound == 'sound/weapons/metalhit.ogg') // wooden swords don't sound like metal swords. // metalhit check is so swords when metal use their regular slice sfx. hitsound = material.weapon_hitsound diff --git a/html/changelogs/hellfirejag-small-weapon-fix.yml b/html/changelogs/hellfirejag-small-weapon-fix.yml new file mode 100644 index 00000000000..737c89bc342 --- /dev/null +++ b/html/changelogs/hellfirejag-small-weapon-fix.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Fixed a small logic error in melee weapon sound effects."