From 10c7363fc4dd6ef0ed5e92e53795256fdbe3dbf0 Mon Sep 17 00:00:00 2001 From: RieBi <42877671+RieBi@users.noreply.github.com> Date: Mon, 6 Nov 2023 02:25:54 +0200 Subject: [PATCH] Convert license.txt to attributions.yml in Items folder (#21466) * convert main folder file * convert items/medical * convert items/handcuffs * change items/attributions.yml * fix items/handcuffs/attributions.yml --- Resources/Audio/Items/Handcuffs/attributions.yml | 4 ++++ Resources/Audio/Items/Handcuffs/license.txt | 1 - Resources/Audio/Items/Medical/attributions.yml | 4 ++++ Resources/Audio/Items/Medical/license.txt | 11 ----------- Resources/Audio/Items/attributions.yml | 12 +++++++++++- Resources/Audio/Items/license.txt | 2 -- 6 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 Resources/Audio/Items/Handcuffs/attributions.yml delete mode 100644 Resources/Audio/Items/Handcuffs/license.txt create mode 100644 Resources/Audio/Items/Medical/attributions.yml delete mode 100644 Resources/Audio/Items/Medical/license.txt delete mode 100644 Resources/Audio/Items/license.txt diff --git a/Resources/Audio/Items/Handcuffs/attributions.yml b/Resources/Audio/Items/Handcuffs/attributions.yml new file mode 100644 index 0000000000..7ba93e57cd --- /dev/null +++ b/Resources/Audio/Items/Handcuffs/attributions.yml @@ -0,0 +1,4 @@ +- files: ["ziptie_end.ogg"] + license: "CC-BY-3.0" + copyright: "Taken from cable tie.wav by THE_bizniss on Freesound.org" + source: "https://freesound.org/people/THE_bizniss/sounds/39318/" \ No newline at end of file diff --git a/Resources/Audio/Items/Handcuffs/license.txt b/Resources/Audio/Items/Handcuffs/license.txt deleted file mode 100644 index 92b4438027..0000000000 --- a/Resources/Audio/Items/Handcuffs/license.txt +++ /dev/null @@ -1 +0,0 @@ -ziptie_end.ogg taken from "cable tie.wav" by THE_bizniss of Freesound.org at https://freesound.org/people/THE_bizniss/sounds/39318/ under CC BY 3.0. \ No newline at end of file diff --git a/Resources/Audio/Items/Medical/attributions.yml b/Resources/Audio/Items/Medical/attributions.yml new file mode 100644 index 0000000000..a6b352ef22 --- /dev/null +++ b/Resources/Audio/Items/Medical/attributions.yml @@ -0,0 +1,4 @@ +- files: ["healthscanner.ogg"] + license: "CC-BY-4.0" + copyright: "Taken from FM Synthesis on freesound.org" + source: "https://freesound.org/people/FreqMan/sounds/32683/" \ No newline at end of file diff --git a/Resources/Audio/Items/Medical/license.txt b/Resources/Audio/Items/Medical/license.txt deleted file mode 100644 index e9385756eb..0000000000 --- a/Resources/Audio/Items/Medical/license.txt +++ /dev/null @@ -1,11 +0,0 @@ -The following sounds were used from freesound: - -herbertboland - heavyskirtmovement.wav - CC BY 3.0 -vinrax - cloth-sounds.mp3 - CC BY-NC 3.0 -lordvanye - skintouching.wav - CC0 1.0 -FM Synthesis - healthscanner.ogg - CC BY 4.0 - -Additional sound effects from https://www.zapsplat.com - -foley-cloth-denim-rip-003.mp3 - -zapsplat_food_bottle_golden_syrup_cap_open_then_close.mp3 diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml index cb945bd5ca..7822272424 100644 --- a/Resources/Audio/Items/attributions.yml +++ b/Resources/Audio/Items/attributions.yml @@ -71,4 +71,14 @@ - files: ["candle_blowing.ogg"] license: "CC-BY-NC-3.0" copyright: "Created by Bee09, converted to OGG, cropped and converted to mono by TheShuEd" - source: "https://freesound.org/people/Bee09/sounds/326561/" \ No newline at end of file + source: "https://freesound.org/people/Bee09/sounds/326561/" + +- files: ["pill.ogg"] + license: "CC-BY-NC-3.0" + copyright: "Combined from '437480__ruanza__swallowing.wav' by user RuanZA and part from '330657__diniunicorn__popping-pills.wav' by user diniunicorn. Sources are https://freesound.org/people/RuanZA/sounds/437480/ and https://freesound.org/people/diniunicorn/sounds/330657/ respectively" + source: "https://freesound.org/" + +- files: ["ring.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from /tg/station" + source: "https://github.com/tgstation/tgstation/commit/c61c452d78425d89920b41ed5f95fd190e733a3c" \ No newline at end of file diff --git a/Resources/Audio/Items/license.txt b/Resources/Audio/Items/license.txt deleted file mode 100644 index d23148322c..0000000000 --- a/Resources/Audio/Items/license.txt +++ /dev/null @@ -1,2 +0,0 @@ -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 under CC-BY-SA-3.0, taken from /tg/station commit https://github.com/tgstation/tgstation/commit/c61c452d78425d89920b41ed5f95fd190e733a3c. - -- 2.51.2