]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Converted weapons license.txts to attributions.ymls (#21444)
authorRieBi <42877671+RieBi@users.noreply.github.com>
Mon, 6 Nov 2023 00:36:05 +0000 (02:36 +0200)
committerGitHub <noreply@github.com>
Mon, 6 Nov 2023 00:36:05 +0000 (17:36 -0700)
* converted weapons license.txts to attributions.ymls

* Update Resources/Audio/Weapons/Xeno/attributions.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update attributions.yml

* Update Resources/Audio/Weapons/attributions.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update attributions.yml

* Delete sonniss attributions

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
12 files changed:
Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
Resources/Audio/Weapons/Guns/Gunshots/license.txt [deleted file]
Resources/Audio/Weapons/Guns/Hits/attributions.yml [new file with mode: 0644]
Resources/Audio/Weapons/Guns/Hits/licenses.txt [deleted file]
Resources/Audio/Weapons/Guns/Misc/attributions.yml
Resources/Audio/Weapons/Guns/Misc/licenses.txt [deleted file]
Resources/Audio/Weapons/Guns/Miss/attributions.yml [new file with mode: 0644]
Resources/Audio/Weapons/Guns/Miss/licenses.txt [deleted file]
Resources/Audio/Weapons/Xeno/attributions.yml [new file with mode: 0644]
Resources/Audio/Weapons/Xeno/license.txt [deleted file]
Resources/Audio/Weapons/attributions.yml
Resources/Audio/Weapons/licenses.txt [deleted file]

index 4864ba4f82d4627f6c7cd5da65750ff0c7f2f9c8..9431ededc2dedc5cc45010c40c9db444096bc070 100644 (file)
   license: "CC0-1.0"
   copyright: "Grappling hook by 16bitstudios. Converted to .OGG and MONO by metalgearsloth"
   source: "https://freesound.org/people/16bitstudios/sounds/541975/"
+
+- files: ["atreides.ogg", "c-20r.ogg", "flaregun.ogg", "mateba.ogg", "minigun.ogg", "mk58.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from CM-SS13"
+  source: "https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons"
+
+- files: ["rocket-launcher.ogg", "taser2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac"
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Gunshots/license.txt b/Resources/Audio/Weapons/Guns/Gunshots/license.txt
deleted file mode 100644 (file)
index 6487f71..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-atreides.ogg, c-20r.ogg, flaregun.ogg, mateba.ogg, minigun.ogg, mk58.ogg were taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons
-They are licensed under CC-BY-SA 3.0
-
-rocket_launcher.ogg and taser2.ogg and kinetic_accel.ogg were taken from https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac
-It is licensed under CC-BY-SA 3.0
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Hits/attributions.yml b/Resources/Audio/Weapons/Guns/Hits/attributions.yml
new file mode 100644 (file)
index 0000000..297fc9d
--- /dev/null
@@ -0,0 +1,9 @@
+- files: ["bullet_meat1.ogg", "bullet_meat2.ogg", "bullet_meat3.ogg", "bullet_meat4.ogg", "energy_meat1.ogg", "energy_meat2.ogg", "energy_metal1.ogg", "energy_metal2.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from Citadel Station 13. Remixed to mono where it was stereo by metalgearsloth"
+  source: "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/tree/cc701aedb633d83eae8339a8b3712ad8ad99cca0/sound"
+
+- files: ["ric1.ogg", "ric2.ogg", "ric3.ogg", "ric3.ogg", "ric5.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/tree/7501504b0ea029d2cf1c0336d09db5c0959aa412/sound/weapons/effects"
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Hits/licenses.txt b/Resources/Audio/Weapons/Guns/Hits/licenses.txt
deleted file mode 100644 (file)
index a7a335f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Taken from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/tree/cc701aedb633d83eae8339a8b3712ad8ad99cca0/sound licensed under CC BY-SA 3.0. Remixed to mono where it was stereo by metalgearsloth:
-- bullet_meat1.ogg
-- bullet_meat2.ogg
-- bullet_meat3.ogg
-- bullet_meat4.ogg
-- energy_meat1.ogg
-- energy_meat2.ogg
-- energy_metal1.ogg
-- energy_metal2.ogg
-
-Taken from https://github.com/tgstation/tgstation/tree/7501504b0ea029d2cf1c0336d09db5c0959aa412/sound/weapons/effects CC BY-SA 3.0.
-- ric1.ogg
-- ric2.ogg
-- ric3.ogg
-- ric4.ogg
-- ric5.ogg
\ No newline at end of file
index 066c26206e5289792de59fda83195295deb6193d..dab5384b8d8ca1ffc3360f9cceae77741587f12b 100644 (file)
@@ -1,4 +1,9 @@
 - files: ["arrow_nock.ogg"]
   license: "CC-BY-NC-4.0"
   copyright: "Created by LiamG_SFX, converted to ogg by mirrorcult"
-  source: "https://freesound.org/people/LiamG_SFX/sounds/322224/"
\ No newline at end of file
+  source: "https://freesound.org/people/LiamG_SFX/sounds/322224/"
+
+- files: ["selector.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Misc/licenses.txt b/Resources/Audio/Weapons/Guns/Misc/licenses.txt
deleted file mode 100644 (file)
index 3eecf46..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Taken from https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg under CC-BY-NC-SA 3.0 
-- selector.ogg
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Miss/attributions.yml b/Resources/Audio/Weapons/Guns/Miss/attributions.yml
new file mode 100644 (file)
index 0000000..7fd804b
--- /dev/null
@@ -0,0 +1,9 @@
+- files: ["bullet_miss1.ogg", "bullet_miss2.ogg", "bullet_miss3.ogg", "bullet_miss4.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from CM-SS13"
+  source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets"
+
+- files: ["energy_miss1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from CM-SS13"
+  source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets"
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Guns/Miss/licenses.txt b/Resources/Audio/Weapons/Guns/Miss/licenses.txt
deleted file mode 100644 (file)
index 1f6cdc1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bullet_miss oggs taken from https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets under CC BY-SA 3.0
-energy_miss ogg taken from  https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets under CC BY-SA 3.0
\ No newline at end of file
diff --git a/Resources/Audio/Weapons/Xeno/attributions.yml b/Resources/Audio/Weapons/Xeno/attributions.yml
new file mode 100644 (file)
index 0000000..a027105
--- /dev/null
@@ -0,0 +1,9 @@
+- files: ["alien_claw_flesh1.ogg", "alien_claw_flesh2.ogg", "alien_claw_flesh3.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from CM-SS13"
+  source: "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/sound/weapons"
+
+- files: ["alien_spitacid.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/233891d0e19a002d8307299bfe15206591172784/sound/voice/alien_spitacid.ogg"
diff --git a/Resources/Audio/Weapons/Xeno/license.txt b/Resources/Audio/Weapons/Xeno/license.txt
deleted file mode 100644 (file)
index bb082c7..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-alien_claw_flesh1, alien_claw_flesh2, alien_claw_flesh3 were taken from: https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/sound/weapons
-alien_spitacid was taken from: https://github.com/tgstation/TerraGov-Marine-Corps/blob/233891d0e19a002d8307299bfe15206591172784/sound/voice/alien_spitacid.ogg
\ No newline at end of file
index a1e728b5d584a481d0975baa2724a02225266cde..02b1c13d530a1777e1afd9139b1ed9ff321a992e 100644 (file)
   license: "CC-BY-SA-3.0"
   copyright: "User Nimfar11 on GitHub."
   source: "https://github.com/Nimfar11"
+
+- files: ["dodgeball.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/blob/5d264fbea0124e5af511af3fed24203e196d108b/sound/items/dodgeball.ogg"
+
+- files: ["grille_hit.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/blob/803ca4537df35cf252b056d8460d510be8a4f353/sound/effects/grillehit.ogg"
+
+- files: ["slash.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/blob/5d264fbea0124e5af511af3fed24203e196d108b/sound/weapons/slash.ogg"
+
+- files: ["tap.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/blob/803ca4537df35cf252b056d8460d510be8a4f353/sound/weapons/tap.ogg"
+
+- files: ["boxingpunch1.ogg", "boxingpunch2.ogg", "boxingpunch3.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Taken from Ryan Conway on freesound.org"
+  source: "https://freesound.org/people/ryanconway/sounds/260739/"
+
+- files: ["boxingbell.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from Herkules92 on freesound.org"
+  source: "https://freesound.org/people/Herkules92/sounds/520998/"
+
+- files: ["block_metal1.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from Citadel Station 13"
+  source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/31c5996a5db8cce0cb431cb1dc20d99cac83f268"
+
+- files: ["pierce.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation"
+  source: "https://github.com/tgstation/tgstation/commit/106cd26fc00851a51dd362f3131120318d848a53"
+
+- files: ["rubberhammer.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from ScreamStudio on freesound.org"
+  source: "https://freesound.org/people/ScreamStudio/sounds/392617/"
diff --git a/Resources/Audio/Weapons/licenses.txt b/Resources/Audio/Weapons/licenses.txt
deleted file mode 100644 (file)
index 2485a85..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-dodgeball.ogg taken from https://github.com/tgstation/tgstation/blob/5d264fbea0124e5af511af3fed24203e196d108b/sound/items/dodgeball.ogg under CC BY-SA 3.0
-
-grille_hit.ogg taken from https://github.com/tgstation/tgstation/blob/803ca4537df35cf252b056d8460d510be8a4f353/sound/effects/grillehit.ogg under CC BY-SA 3.0
-
-slash.ogg taken from https://github.com/tgstation/tgstation/blob/5d264fbea0124e5af511af3fed24203e196d108b/sound/weapons/slash.ogg  under CC BY-SA 3.0
-
-tap.ogg taken from https://github.com/tgstation/tgstation/blob/803ca4537df35cf252b056d8460d510be8a4f353/sound/weapons/tap.ogg under CC BY-SA 3.0
-
-BoxingPunch 1, 2, and 3 taken from Ryan Conway at https://freesound.org/people/ryanconway/sounds/260739/ under CC BY 3.0
-
-boxingbell.ogg taken from Herkules92 at https://freesound.org/people/Herkules92/sounds/520998/ under CC0 1.0
-
-block_metal1.ogg taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/31c5996a5db8cce0cb431cb1dc20d99cac83f268 under CC BY-SA 3.0
-
-pierce.ogg taken from: https://github.com/tgstation/tgstation/commit/106cd26fc00851a51dd362f3131120318d848a53
-
-rubberhammer.ogg taken from https://freesound.org/people/ScreamStudio/sounds/392617/ under CC0 1.0
-
-- files: ["weoweo.ogg"]
-  license: "SONNISS #GAMEAUDIOGDC BUNDLE LICENSING"
-  copyright: "Taken from Sonniss.com - GDC 2023 - Systematic Sound - TonalElements Obscurum - Dark Drones"
-
-- files: ["soup.ogg"]
-  license: "SONNISS #GAMEAUDIOGDC BUNDLE LICENSING"
-  copyright: "Taken from Sonniss.com - GDC 2023 - 344 AUdio - Epic Impacts Vol. 1"