From 610ca114a79c25478c8121c942e5b619c372b352 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Wed, 9 Aug 2023 22:03:51 +0800 Subject: [PATCH 1/2] fixes equip/dequip noises from not playing --- code/game/objects/items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 7947aafaea..a776355ac6 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -361,7 +361,7 @@ user.position_hud_item(src,slot) if(user.client) user.client.screen |= src if(user.pulling == src) user.stop_pulling() - if((slot_flags & slot)) + if(("[slot]" in slot_flags_enumeration) && (slot_flags & slot_flags_enumeration["[slot]"])) if(equip_sound) playsound(src, equip_sound, 20) else From fca7912afac3e8f32c23bfe52cf632297e38a28b Mon Sep 17 00:00:00 2001 From: Seris02 Date: Tue, 15 Aug 2023 08:55:39 +0800 Subject: [PATCH 2/2] pref check --- code/game/objects/items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a776355ac6..fa4dc54452 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -363,9 +363,9 @@ if(user.pulling == src) user.stop_pulling() if(("[slot]" in slot_flags_enumeration) && (slot_flags & slot_flags_enumeration["[slot]"])) if(equip_sound) - playsound(src, equip_sound, 20) + playsound(src, equip_sound, 20, preference = /datum/client_preference/pickup_sounds) else - playsound(src, drop_sound, 20) + playsound(src, drop_sound, 20, preference = /datum/client_preference/pickup_sounds) else if(slot == slot_l_hand || slot == slot_r_hand) playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) return