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 b104efadfebdb..0e9149c498a9f 100644 --- a/modular_doppler/modular_cosmetics/code/neck/collar.dm +++ b/modular_doppler/modular_cosmetics/code/neck/collar.dm @@ -92,6 +92,10 @@ greyscale_config_worn = /datum/greyscale_config/collar/bell/worn greyscale_colors = "#222222#C0C0C0" +/obj/item/clothing/neck/human_petcollar/locked/bell/Initialize(mapload) + . = ..() + AddComponent(/datum/component/item_equipped_movement_rustle, SFX_JINGLEBELL) + /obj/item/clothing/neck/human_petcollar/locked/choker name = "choker" desc = "Quite fashionable... if you're somebody who's just read their first BDSM-themed erotica novel." 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 diff --git a/sound/items/attributions.txt b/sound/items/attributions.txt index 7f1dcaabcc467..274f38f173213 100644 --- a/sound/items/attributions.txt +++ b/sound/items/attributions.txt @@ -62,3 +62,15 @@ glove_equip.ogg - LETHRCreak_Leather Belt Short Creak 01_PF_365 DAYS OF SOUND by lead_pipe_hit.ogg - jixaw-metal-pipe-falling-sound.mp3 by thenotcheeseman -- https://freesound.org/s/679206/ -- License: Creative Commons 0 lead_pipe_drop.ogg - jixaw-metal-pipe-falling-sound.mp3 by thenotcheeseman -- https://freesound.org/s/679206/ -- License: Creative Commons 0 lead_pipe_pickup.ogg - Metal pipe hitting the ground.flac by CGEffex -- https://freesound.org/s/93962/ -- License: Attribution 4.0 + +- collarbell1.ogg (originally collarbell1.ogg) +- collarbell2.ogg (originally collarbell2.ogg) +license: published without license +Made by Kevak +source: https://github.com/Rotwood-Vale/Ratwood-Keep/pull/1910 + +- collarbell3.ogg (originally jesterstep1.ogg) +- collarbell4.ogg (originally jesterstep2.ogg) +license: "CC-BY-SA-3.0" +Made and posted by GentleJester#8754 on the SS14 discord. +source: https://discord.com/channels/310555209753690112/311537926376783886/1097222920813674527 diff --git a/sound/items/collarbell1.ogg b/sound/items/collarbell1.ogg new file mode 100644 index 0000000000000..4a6a055fcf687 Binary files /dev/null and b/sound/items/collarbell1.ogg differ diff --git a/sound/items/collarbell2.ogg b/sound/items/collarbell2.ogg new file mode 100644 index 0000000000000..4b2591307205a Binary files /dev/null and b/sound/items/collarbell2.ogg differ diff --git a/sound/items/collarbell3.ogg b/sound/items/collarbell3.ogg new file mode 100644 index 0000000000000..0868c81990f78 Binary files /dev/null and b/sound/items/collarbell3.ogg differ diff --git a/sound/items/collarbell4.ogg b/sound/items/collarbell4.ogg new file mode 100644 index 0000000000000..f596209ccb485 Binary files /dev/null and b/sound/items/collarbell4.ogg differ