diff --git a/code/__DEFINES/~doppler_defines/sound.dm b/code/__DEFINES/~doppler_defines/sound.dm index b125bb5460ac7..2c8e08e95718f 100644 --- a/code/__DEFINES/~doppler_defines/sound.dm +++ b/code/__DEFINES/~doppler_defines/sound.dm @@ -4,3 +4,4 @@ #define SFX_BRICK_DROP "brick_drop" #define SFX_BRICK_PICKUP "brick_pickup" +#define SFX_JINGLEBELL "jingle_bell" diff --git a/modular_doppler/modular_cosmetics/code/neck/collar.dm b/modular_doppler/modular_cosmetics/code/neck/collar.dm index ff9c91576342f..0e9149c498a9f 100644 --- a/modular_doppler/modular_cosmetics/code/neck/collar.dm +++ b/modular_doppler/modular_cosmetics/code/neck/collar.dm @@ -92,14 +92,9 @@ greyscale_config_worn = /datum/greyscale_config/collar/bell/worn greyscale_colors = "#222222#C0C0C0" -/obj/item/clothing/neck/human_petcollar/locked/bell/Initialize() +/obj/item/clothing/neck/human_petcollar/locked/bell/Initialize(mapload) . = ..() - AddComponent(/datum/component/squeak, list( - 'sound/items/collarbell1.ogg' = 1, - 'sound/items/collarbell2.ogg' = 1, - 'sound/items/collarbell3.ogg' = 1, - 'sound/items/collarbell4.ogg' = 1, - ), 100) + AddComponent(/datum/component/item_equipped_movement_rustle, SFX_JINGLEBELL) /obj/item/clothing/neck/human_petcollar/locked/choker name = "choker" diff --git a/modular_doppler/modular_sounds/code/sounds.dm b/modular_doppler/modular_sounds/code/sounds.dm index 928086d6280b6..eebca2f919488 100644 --- a/modular_doppler/modular_sounds/code/sounds.dm +++ b/modular_doppler/modular_sounds/code/sounds.dm @@ -12,5 +12,12 @@ 'modular_doppler/modular_sounds/sound/bricks/brick_pick_up_1.ogg', 'modular_doppler/modular_sounds/sound/bricks/brick_pick_up_2.ogg', ) + if(SFX_JINGLEBELL) + soundin = pick( + 'sound/items/collarbell1.ogg', + 'sound/items/collarbell2.ogg', + 'sound/items/collarbell3.ogg', + 'sound/items/collarbell4.ogg', + ) return soundin