diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 244da1dda81..71d4cc2e296 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -286,6 +286,8 @@ GLOBAL_LIST_EMPTY(sfx_datum_by_key) #define SFX_CIG_PACK_RUSTLE "cig_pack_rustle" #define SFX_CIG_PACK_THROW_DROP "cig_pack_throw_drop" #define SFX_RORO_WARBLE "roro_warble" +#define SFX_POTTED_PLANT_PICKUP "potted_plant_pickup" +#define SFX_POTTED_PLANT_DROP "potted_plant_drop" // Standard is 44.1khz #define MIN_EMOTE_PITCH 40000 diff --git a/code/game/objects/items/kirby_plants/kirbyplants.dm b/code/game/objects/items/kirby_plants/kirbyplants.dm index d0d5b179adc..1f665499601 100644 --- a/code/game/objects/items/kirby_plants/kirbyplants.dm +++ b/code/game/objects/items/kirby_plants/kirbyplants.dm @@ -11,6 +11,8 @@ throw_speed = 2 throw_range = 4 item_flags = NO_PIXEL_RANDOM_DROP + drop_sound = SFX_POTTED_PLANT_DROP + pickup_sound = SFX_POTTED_PLANT_PICKUP /// Can this plant be trimmed by someone with TRAIT_BONSAI var/trimmable = TRUE diff --git a/code/game/sound/sound_keys/sound_keys.dm b/code/game/sound/sound_keys/sound_keys.dm index 971f50c3872..eba327a7360 100644 --- a/code/game/sound/sound_keys/sound_keys.dm +++ b/code/game/sound/sound_keys/sound_keys.dm @@ -847,3 +847,24 @@ key = SFX_RORO_WARBLE file_paths = list( 'sound/mobs/non-humanoids/roro/roro_warble.ogg') + +/datum/sound_effect/potted_plant_drop + key = SFX_POTTED_PLANT_DROP + file_paths = list( + 'sound/items/potted_plant/potted_plant_drop1.ogg', + 'sound/items/potted_plant/potted_plant_drop2.ogg', + 'sound/items/potted_plant/potted_plant_drop3.ogg', + 'sound/items/potted_plant/potted_plant_drop4.ogg', + 'sound/items/potted_plant/potted_plant_drop5.ogg', + ) + +/datum/sound_effect/potted_plant_pickup + key = SFX_POTTED_PLANT_PICKUP + file_paths = list( + 'sound/items/potted_plant/potted_plant_pickup1.ogg', + 'sound/items/potted_plant/potted_plant_pickup2.ogg', + 'sound/items/potted_plant/potted_plant_pickup3.ogg', + 'sound/items/potted_plant/potted_plant_pickup4.ogg', + 'sound/items/potted_plant/potted_plant_pickup5.ogg', + + ) diff --git a/sound/items/potted_plant/attribution.txt b/sound/items/potted_plant/attribution.txt new file mode 100644 index 00000000000..ded8cc3105d --- /dev/null +++ b/sound/items/potted_plant/attribution.txt @@ -0,0 +1 @@ +potted_plant sounds made by grungussuss, license: CC-BY-SA \ No newline at end of file diff --git a/sound/items/potted_plant/potted_plant_drop1.ogg b/sound/items/potted_plant/potted_plant_drop1.ogg new file mode 100644 index 00000000000..2d8df05a504 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_drop1.ogg differ diff --git a/sound/items/potted_plant/potted_plant_drop2.ogg b/sound/items/potted_plant/potted_plant_drop2.ogg new file mode 100644 index 00000000000..a2fa1fb0c67 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_drop2.ogg differ diff --git a/sound/items/potted_plant/potted_plant_drop3.ogg b/sound/items/potted_plant/potted_plant_drop3.ogg new file mode 100644 index 00000000000..38dc4da08f3 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_drop3.ogg differ diff --git a/sound/items/potted_plant/potted_plant_drop4.ogg b/sound/items/potted_plant/potted_plant_drop4.ogg new file mode 100644 index 00000000000..0f2172e8fa7 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_drop4.ogg differ diff --git a/sound/items/potted_plant/potted_plant_drop5.ogg b/sound/items/potted_plant/potted_plant_drop5.ogg new file mode 100644 index 00000000000..c85c29a1d04 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_drop5.ogg differ diff --git a/sound/items/potted_plant/potted_plant_pickup1.ogg b/sound/items/potted_plant/potted_plant_pickup1.ogg new file mode 100644 index 00000000000..cdbdbbd462f Binary files /dev/null and b/sound/items/potted_plant/potted_plant_pickup1.ogg differ diff --git a/sound/items/potted_plant/potted_plant_pickup2.ogg b/sound/items/potted_plant/potted_plant_pickup2.ogg new file mode 100644 index 00000000000..30092f90845 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_pickup2.ogg differ diff --git a/sound/items/potted_plant/potted_plant_pickup3.ogg b/sound/items/potted_plant/potted_plant_pickup3.ogg new file mode 100644 index 00000000000..eb988e7bc0a Binary files /dev/null and b/sound/items/potted_plant/potted_plant_pickup3.ogg differ diff --git a/sound/items/potted_plant/potted_plant_pickup4.ogg b/sound/items/potted_plant/potted_plant_pickup4.ogg new file mode 100644 index 00000000000..b0c54529f90 Binary files /dev/null and b/sound/items/potted_plant/potted_plant_pickup4.ogg differ diff --git a/sound/items/potted_plant/potted_plant_pickup5.ogg b/sound/items/potted_plant/potted_plant_pickup5.ogg new file mode 100644 index 00000000000..0cb9622355b Binary files /dev/null and b/sound/items/potted_plant/potted_plant_pickup5.ogg differ