]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Convert license.txt to attributions.yml in Items folder (#21466)
authorRieBi <42877671+RieBi@users.noreply.github.com>
Mon, 6 Nov 2023 00:25:54 +0000 (02:25 +0200)
committerGitHub <noreply@github.com>
Mon, 6 Nov 2023 00:25:54 +0000 (17:25 -0700)
* 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 [new file with mode: 0644]
Resources/Audio/Items/Handcuffs/license.txt [deleted file]
Resources/Audio/Items/Medical/attributions.yml [new file with mode: 0644]
Resources/Audio/Items/Medical/license.txt [deleted file]
Resources/Audio/Items/attributions.yml
Resources/Audio/Items/license.txt [deleted file]

diff --git a/Resources/Audio/Items/Handcuffs/attributions.yml b/Resources/Audio/Items/Handcuffs/attributions.yml
new file mode 100644 (file)
index 0000000..7ba93e5
--- /dev/null
@@ -0,0 +1,4 @@
+- files: ["ziptie_end.ogg"]\r
+  license: "CC-BY-3.0"\r
+  copyright: "Taken from cable tie.wav by THE_bizniss on Freesound.org"\r
+  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 (file)
index 92b4438..0000000
+++ /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 (file)
index 0000000..a6b352e
--- /dev/null
@@ -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 (file)
index e938575..0000000
+++ /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
index cb945bd5cae681b091095f84299be28d426ba4ef..7822272424bac3e2bf126fc33acd1401ae86579d 100644 (file)
 - 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 (file)
index d231483..0000000
+++ /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.
-