From 83e568b4be13f07b43f9022d9b6d6062dd092ba1 Mon Sep 17 00:00:00 2001 From: Lamrr <96937466+Lamrr@users.noreply.github.com> Date: Thu, 27 Jan 2022 04:27:03 +1100 Subject: [PATCH] Adds red phone. (#6318) --- Resources/Audio/Items/license.txt | 2 +- Resources/Audio/Items/ring.ogg | Bin 0 -> 11621 bytes .../Entities/Objects/Fun/instruments.yml | 16 ++++++++++++++++ .../Instruments/otherinstruments.rsi/meta.json | 5 ++++- .../otherinstruments.rsi/red_phone.png | Bin 0 -> 399 bytes 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 Resources/Audio/Items/ring.ogg create mode 100644 Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/red_phone.png diff --git a/Resources/Audio/Items/license.txt b/Resources/Audio/Items/license.txt index 4032a1d4b5..0bccb3cac2 100644 --- a/Resources/Audio/Items/license.txt +++ b/Resources/Audio/Items/license.txt @@ -1 +1 @@ -pill.ogg contains audio from '437480__ruanza__swallowing.wav' by user RuanZA, used under CC BY-NC 3.0 (https://freesound.org/people/RuanZA/sounds/437480/), as well as part of '330657__diniunicorn__popping-pills.wav' by user diniunicorn, used under CC0 1.0 (https://freesound.org/people/diniunicorn/sounds/330657/). \ No newline at end of file +pill.ogg contains audio from '437480__ruanza__swallowing.wav' by user RuanZA, used under CC BY-NC 3.0 (https://freesound.org/people/RuanZA/sounds/437480/), as well as part of '330657__diniunicorn__popping-pills.wav' by user diniunicorn, used under CC0 1.0 (https://freesound.org/people/diniunicorn/sounds/330657/). ring.ogg used udner CC-BY-SA-3.0, taken from /tg/station commit https://github.com/tgstation/tgstation/commit/c61c452d78425d89920b41ed5f95fd190e733a3c. diff --git a/Resources/Audio/Items/ring.ogg b/Resources/Audio/Items/ring.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c134a0077ac9b3b8addd46b6fd99e02513f733b1 GIT binary patch literal 11621 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 literal 0 HcmV?d00001