diff --git a/Resources/Audio/Items/Toys/ToyFall1.ogg b/Resources/Audio/Items/Toys/ToyFall1.ogg new file mode 100644 index 0000000000..b0bec4d35d Binary files /dev/null and b/Resources/Audio/Items/Toys/ToyFall1.ogg differ diff --git a/Resources/Audio/Items/Toys/ToyFall2.ogg b/Resources/Audio/Items/Toys/ToyFall2.ogg new file mode 100644 index 0000000000..5cbc3171a3 Binary files /dev/null and b/Resources/Audio/Items/Toys/ToyFall2.ogg differ diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml index 1ebbf8311f..695cb183fa 100644 --- a/Resources/Audio/Items/attributions.yml +++ b/Resources/Audio/Items/attributions.yml @@ -37,3 +37,8 @@ license: "CC-BY-SA-3.0" copyright: "Created by SamKolber, shortened and converted to OGG and mono" source: "https://freesound.org/people/SamKolber/sounds/210022/" + +- files: ["Toys/toyfall1.ogg, Toys/toyfall2.ogg"] + license: "CC0-1.0" + copyright: "Created by HighTechPuddle" + source: "https://github.com/HighTechPuddle/space-station-14" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index a4caaa105f..f1f84f5796 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -11,12 +11,15 @@ - type: EmitSoundOnUse sound: collection: ToySqueak - - type: EmitSoundOnLand - sound: - collection: ToySqueak - type: EmitSoundOnActivate sound: collection: ToySqueak + - type: EmitSoundOnCollide + sound: + collection: ToySqueak + - type: EmitSoundOnLand + sound: + collection: ToyFall - type: ItemCooldown - type: UseDelay delay: 1.0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/sound_collections.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/sound_collections.yml index 625d4d6d2d..71123ddb2c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/sound_collections.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/sound_collections.yml @@ -8,4 +8,10 @@ - type: soundCollection id: ShellEject files: - - "/Audio/Weapons/Guns/Casings/shotgun_fall.ogg" \ No newline at end of file + - "/Audio/Weapons/Guns/Casings/shotgun_fall.ogg" + +- type: soundCollection + id: ToyFall + files: + - "/Audio/Items/Toys/ToyFall1.ogg" + - "/Audio/Items/Toys/ToyFall2.ogg" \ No newline at end of file