From 4ae80fb2767e655bbc9e8e029027d2a60be69821 Mon Sep 17 00:00:00 2001 From: HighTechPuddle <131694215+HighTechPuddle@users.noreply.github.com> Date: Sat, 24 Jun 2023 14:06:33 +0200 Subject: [PATCH] Issue#15607-Audio/Ambience (#17327) --- .../Audio/Ambience/Antag/attributions.yml | 12 +- .../Audio/Ambience/Objects/attributions.yml | 52 ++++++- .../Audio/Ambience/Temporary/attributions.yml | 4 + Resources/Audio/Ambience/attributions.yml | 137 ++++++++++-------- 4 files changed, 140 insertions(+), 65 deletions(-) create mode 100644 Resources/Audio/Ambience/Temporary/attributions.yml diff --git a/Resources/Audio/Ambience/Antag/attributions.yml b/Resources/Audio/Ambience/Antag/attributions.yml index b600fc30b4..6f76d64d85 100644 --- a/Resources/Audio/Ambience/Antag/attributions.yml +++ b/Resources/Audio/Ambience/Antag/attributions.yml @@ -1,12 +1,12 @@ -- files: ["nukeops_start.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "Taken from TG station." - source: "https://github.com/tgstation/tgstation/commit/827967c9650c23af64280ad1491405fed8f644c5" +- files: ["nukeops_start.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from TG station" + source: "https://github.com/tgstation/tgstation/commit/827967c9650c23af64280ad1491405fed8f644c5#diff-6cc910b7cad9ac4333c8d0885fc844746066120b465d8d4ba8f7019169316574" - files: ["pirate_start.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Made by @MIXnikita#1474 (Discord) for SS14" - source: "https://github.com/SerbiaStrong-220/space-station-14/blob/master/Resources/Audio/Ambience/Antag/pirate_start.ogg" + source: "https://github.com/SerbiaStrong-220/space-station-14/commit/f33ce80db9d8ac962ec36eb5ae61afa8c0035d1a" - files: ["zombie_start.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Made by @MIXnikita#1474 (Discord) for SS14" - source: "https://github.com/SerbiaStrong-220/space-station-14/blob/master/Resources/Audio/Ambience/Antag/zombie_start.ogg" \ No newline at end of file + source: "https://github.com/SerbiaStrong-220/space-station-14/commit/f33ce80db9d8ac962ec36eb5ae61afa8c0035d1a" \ No newline at end of file diff --git a/Resources/Audio/Ambience/Objects/attributions.yml b/Resources/Audio/Ambience/Objects/attributions.yml index c084f551c7..e1dec23786 100644 --- a/Resources/Audio/Ambience/Objects/attributions.yml +++ b/Resources/Audio/Ambience/Objects/attributions.yml @@ -6,4 +6,54 @@ - files: ["crushing.ogg"] license: "CC-BY-4.0" copyright: "Created by juskiddink, converted Mono and .ogg by EmoGarbage" - source: "https://freesound.org/people/juskiddink/sounds/66956/" \ No newline at end of file + source: "https://freesound.org/people/juskiddink/sounds/66956/" + +- files: ["circular_saw.ogg"] + license: "CC0-1.0" + copyright: "Taken from source and clipped" + source: "https://freesound.org/people/derjuli/sounds/448133/" + +- files: ["gas_pump.ogg"] + license: "CC0-1.0" + copyright: "Taken from source" + source: "https://freesound.org/people/karinalarasart/sounds/441419/" + +- files: ["gas_hiss.ogg"] + license: "CC-BY-4.0" + copyright: "Taken from source" + source: "https://freesound.org/people/geodylabs/sounds/122803/" + +- files: ["gas_vent.ogg"] + license: "CC0-1.0" + copyright: "Taken from source" + source: "https://freesound.org/people/kyles/sounds/453642/" + +- files: ["flowing_water_open.ogg"] + license: "CC0-1.0" + copyright: "Taken from source" + source: "https://freesound.org/people/sterferny/sounds/382322/" + +- files: ["server_fans.ogg"] + license: "CC-BY-3.0" + copyright: "Taken from source" + source: "https://freesound.org/people/DeVern/sounds/610761/" + +- files: ["drain.ogg"] + license: "CC-BY-3.0" + copyright: "Taken from source" + source: "https://freesound.org/people/PhreaKsAccount/sounds/46266/" + +- files: ["portable_scrubber.ogg"] + license: "CC0-1.0" + copyright: "Taken from source" + source: "https://freesound.org/people/Beethovenboy/sounds/384335/" + +- files: ["alarm.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken and edited from source" + source: "https://github.com/Baystation12/Baystation12/commit/41c3cfd386b11aee101b3f89ab7fefe77a57a1ba#diff-07f56c449048fdb4cef954ea18c4111e53ccb92624a948f15879a74cdf5fc7fa" + +- files: ["reclaimer_ambience.ogg"] + license: "CC0-1.0" + copyright: "Taken from source" + source: "https://freesound.org/people/cmorris035/sounds/319152/" \ No newline at end of file diff --git a/Resources/Audio/Ambience/Temporary/attributions.yml b/Resources/Audio/Ambience/Temporary/attributions.yml new file mode 100644 index 0000000000..7560df72a8 --- /dev/null +++ b/Resources/Audio/Ambience/Temporary/attributions.yml @@ -0,0 +1,4 @@ +- files: ["flies.ogg"] + license: "CC0-1.0" + copyright: "Taken from source" + source: "https://freesound.org/people/telezon/sounds/321870/" \ No newline at end of file diff --git a/Resources/Audio/Ambience/attributions.yml b/Resources/Audio/Ambience/attributions.yml index b129339a71..7f72253ddf 100644 --- a/Resources/Audio/Ambience/attributions.yml +++ b/Resources/Audio/Ambience/attributions.yml @@ -3,63 +3,84 @@ copyright: "Created by Joao_Janz, edited and converted to Mono by EmoGarbage" source: "https://freesound.org/people/Joao_Janz/sounds/478472/" -- files: - - "ambiatmos.ogg" - - "ambiatmos2.ogg" - - "ambicave.ogg" - - "ambicha1.ogg" - - "ambicha2.ogg" - - "ambicha3.ogg" - - "ambicha4.ogg" - - "ambidanger.ogg" - - "ambidanger2.ogg" - - "ambigen1.ogg" - - "ambigen2.ogg" - - "ambigen3.ogg" - - "ambigen4.ogg" - - "ambigen5.ogg" - - "ambigen6.ogg" - - "ambigen7.ogg" - - "ambigen8.ogg" - - "ambigen9.ogg" - - "ambigen10.ogg" - - "ambigen11.ogg" - - "ambigen12.ogg" - - "ambigen13.ogg" - - "ambigen14.ogg" - - "ambigen15.ogg" - - "ambiholy.ogg" - - "ambiholy2.ogg" - - "ambiholy3.ogg" - - "ambilava1.ogg" - - "ambilava2.ogg" - - "ambilava3.ogg" - - "ambimaint1.ogg" - - "ambimaint2.ogg" - - "ambimaint3.ogg" - - "ambimaint4.ogg" - - "ambimaint5.ogg" - - "ambimine.ogg" - - "ambimo1.ogg" - - "ambimo2.ogg" - - "ambimystery.ogg" - - "ambinice.ogg" - - "ambiodd.ogg" - - "ambiruin.ogg" - - "ambiruin2.ogg" - - "ambiruin3.ogg" - - "ambiruin4.ogg" - - "ambiruin5.ogg" - - "ambiruin6.ogg" - - "ambiruin7.ogg" - - "ambisin1.ogg" - - "ambisin2.ogg" - - "ambisin3.ogg" - - "ambisin4.ogg" - - "ambitech.ogg" - - "ambitech2.ogg" - - "ambitech3.ogg" - - "maintambience.ogg" +- files: ["ambiatmos.ogg, + ambiatmos2.ogg, + ambicave.ogg, + ambicha1.ogg, + ambicha2.ogg, + ambicha3.ogg, + ambicha4.ogg, + ambidanger.ogg, + ambidanger2.ogg, + ambigen1.ogg, + ambigen2.ogg, + ambigen3.ogg, + ambigen4.ogg, + ambigen5.ogg, + ambigen6.ogg, + ambigen7.ogg, + ambigen8.ogg, + ambigen9.ogg, + ambigen10.ogg, + ambigen11.ogg, + ambigen12.ogg, + ambigen13.ogg, + ambigen14.ogg, + ambigen15.ogg, + ambiholy.ogg, + ambiholy2.ogg, + ambiholy3.ogg, + ambilava1.ogg, + ambilava2.ogg, + ambilava3.ogg, + ambimaint1.ogg, + ambimaint2.ogg, + ambimaint3.ogg, + ambimaint4.ogg, + ambimaint5.ogg, + ambimine.ogg, + ambimo1.ogg, + ambimo2.ogg, + ambimystery.ogg, + ambinice.ogg, + ambiodd.ogg, + ambireebe1.ogg, + ambireebe3.ogg, + ambiruin.ogg, + ambiruin2.ogg, + ambiruin3.ogg, + ambiruin4.ogg, + ambiruin5.ogg, + ambiruin6.ogg, + ambiruin7.ogg, + ambisin1.ogg, + ambisin2.ogg, + ambisin3.ogg, + ambisin4.ogg, + ambitech.ogg, + ambitech2.ogg, + ambitech3.ogg, + maintambience.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from tgstation" - source: "https://github.com/tgstation/tgstation/tree/ae9767664701396501af5dcef8e34c4b5add3d47/sound/ambience" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/tree/ae9767664701396501af5dcef8e34c4b5add3d47/sound/ambience" + +- files: ["shipambience.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from /tg/station (see source), which took it from CEV Eris (commit https://github.com/discordia-space/CEV-Eris/blob/e4e40d38424afe88c8a81cf0e3857d8af4ef077f/sound/ambience/shipambience.ogg)" + source: "https://github.com/tgstation/tgstation/blob/66a625e6df15eaa97e599248a2281c74238ce26e/sound/ambience/shipambience.ogg" + +- files: ["starlight.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from BeeStation" + source: "https://github.com/BeeStation/BeeStation-Hornet/commit/5228e20df942bb45e9469358022e2451bb9c0efe" + +- files: ["constellations.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from BeeStation" + source: "https://github.com/BeeStation/BeeStation-Hornet/commit/bdf79fbf44f776b7380ceec62a9f112a002b4121" + +- files: ["drifting.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from BeeStation" + source: "https://github.com/BeeStation/BeeStation-Hornet/commit/cf8c667dcca196c0e81af37ed0c27b9bdee9c888" \ No newline at end of file