From f0efa5dc3c8ee38f34cf27fc6d713bee4e4c13ae Mon Sep 17 00:00:00 2001 From: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com> Date: Sun, 23 Nov 2025 22:28:53 +0200 Subject: [PATCH] Balloons now float and slide smoothly. (#41102) * The balloons became airy * Attributions + Sound * Add BaseBalloon * Proto fixes --------- Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com> --- Resources/Audio/Effects/attributions.yml | 5 + Resources/Audio/Effects/balloon_hits.ogg | Bin 0 -> 6731 bytes .../Prototypes/Entities/Objects/Fun/toys.yml | 119 +++++++++--------- 3 files changed, 68 insertions(+), 56 deletions(-) create mode 100644 Resources/Audio/Effects/balloon_hits.ogg diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index efac498a3b..c7b55bf39e 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -261,3 +261,8 @@ copyright: 'created by Tao7891; perryprog (GitHub) downmixed to mono' license: CC0-1.0 source: https://github.com/space-wizards/space-station-14/pull/37363 + +- files: ["balloon_hits.ogg"] + copyright: "by brokendot(github)" + license: "CC0-1.0" + source: https://github.com/space-wizards/space-station-14/pull/41102 diff --git a/Resources/Audio/Effects/balloon_hits.ogg b/Resources/Audio/Effects/balloon_hits.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a94da00489693a9ca5c13bd846b71c0223522877 GIT binary patch literal 6731 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