]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
added a bunch more fox noises (#27578)
authornao fujiwara <awkwarddryad@gmail.com>
Thu, 2 May 2024 12:35:10 +0000 (08:35 -0400)
committerGitHub <noreply@github.com>
Thu, 2 May 2024 12:35:10 +0000 (14:35 +0200)
* fuck it we ball

* added recommended copyright information

* revised copyright license

* revised copyright license x2

* finalized the fops

# reduced the number of audio clips
# adjusted the volume of all fox sounds to be consistent with each other

* added new sounds to the overall fox parent mob because we forgot oopsie

18 files changed:
Resources/Audio/Animals/attributions.yml
Resources/Audio/Animals/fox1.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox10.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox11.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox12.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox13.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox14.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox2.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox3.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox4.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox5.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox6.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox7.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox8.ogg [new file with mode: 0644]
Resources/Audio/Animals/fox9.ogg [new file with mode: 0644]
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Resources/Prototypes/SoundCollections/fox.yml [new file with mode: 0644]

index c34832a807a786074b148aea6d06f5ad2c3bc26a..7fd7e8b2e7b1b6209040b84d956dc97759f90b95 100644 (file)
@@ -7,7 +7,7 @@
   license: "CC-BY-3.0"
   copyright: "Modified from 'Meow 4.wav' by freesound user 'TRNGLE. The original audio was trimmed, split to mono, and converted from WAV to OGG format"
   source: "https://freesound.org/people/TRNGLE/sounds/368006/"
-  
+
 - files: ["cat_meow2.ogg"]
   license: "CC-BY-3.0"
   copyright: "Created by freesound user 'TRNGLE. The original audio split to mono, and converted from WAV to OGG format"
   license: "CC-BY-4.0"
   copyright: "Audio is recorded/created by Pfranzen 'FreeSound.org'. The original audio was trimmed and renamed"
   source: "https://freesound.org/people/pfranzen/sounds/322744/"
-  
+
 - files: ["dog_bark1.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
-  source: "https://freesound.org/people/KFerentchak/sounds/235912/"  
-  
+  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
+
 - files: ["dog_bark2.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
-  source: "https://freesound.org/people/KFerentchak/sounds/235912/"  
-  
+  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
+
 - files: ["dog_bark3.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
   source: "https://freesound.org/people/KFerentchak/sounds/235912/"
-  
+
 - files: ["nymph_chirp.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from ParadiseSS13"
   source: "https://github.com/ParadiseSS13/Paradise/commit/a34f1054cef5a44a67fdac3b67b811137c6071dd"
-  
\ No newline at end of file
+
+- files:
+    - fox1.ogg
+    - fox2.ogg
+    - fox3.ogg
+    - fox4.ogg
+    - fox5.ogg
+    - fox6.ogg
+    - fox7.ogg
+    - fox8.ogg
+    - fox9.ogg
+    - fox10.ogg
+    - fox11.ogg
+    - fox12.ogg
+    - fox13.ogg
+    - fox14.ogg
+  copyright: "Created by fujiwaranao"
+  license: "CC-BY-NC-SA-4.0"
+  source: "https://github.com/space-wizards/space-station-14/pull/27578"
diff --git a/Resources/Audio/Animals/fox1.ogg b/Resources/Audio/Animals/fox1.ogg
new file mode 100644 (file)
index 0000000..40fe16c
Binary files /dev/null and b/Resources/Audio/Animals/fox1.ogg differ
diff --git a/Resources/Audio/Animals/fox10.ogg b/Resources/Audio/Animals/fox10.ogg
new file mode 100644 (file)
index 0000000..2a9e156
Binary files /dev/null and b/Resources/Audio/Animals/fox10.ogg differ
diff --git a/Resources/Audio/Animals/fox11.ogg b/Resources/Audio/Animals/fox11.ogg
new file mode 100644 (file)
index 0000000..d294137
Binary files /dev/null and b/Resources/Audio/Animals/fox11.ogg differ
diff --git a/Resources/Audio/Animals/fox12.ogg b/Resources/Audio/Animals/fox12.ogg
new file mode 100644 (file)
index 0000000..c413af8
Binary files /dev/null and b/Resources/Audio/Animals/fox12.ogg differ
diff --git a/Resources/Audio/Animals/fox13.ogg b/Resources/Audio/Animals/fox13.ogg
new file mode 100644 (file)
index 0000000..197a9e4
Binary files /dev/null and b/Resources/Audio/Animals/fox13.ogg differ
diff --git a/Resources/Audio/Animals/fox14.ogg b/Resources/Audio/Animals/fox14.ogg
new file mode 100644 (file)
index 0000000..1d9c998
Binary files /dev/null and b/Resources/Audio/Animals/fox14.ogg differ
diff --git a/Resources/Audio/Animals/fox2.ogg b/Resources/Audio/Animals/fox2.ogg
new file mode 100644 (file)
index 0000000..7aeb7da
Binary files /dev/null and b/Resources/Audio/Animals/fox2.ogg differ
diff --git a/Resources/Audio/Animals/fox3.ogg b/Resources/Audio/Animals/fox3.ogg
new file mode 100644 (file)
index 0000000..561b313
Binary files /dev/null and b/Resources/Audio/Animals/fox3.ogg differ
diff --git a/Resources/Audio/Animals/fox4.ogg b/Resources/Audio/Animals/fox4.ogg
new file mode 100644 (file)
index 0000000..6805d0e
Binary files /dev/null and b/Resources/Audio/Animals/fox4.ogg differ
diff --git a/Resources/Audio/Animals/fox5.ogg b/Resources/Audio/Animals/fox5.ogg
new file mode 100644 (file)
index 0000000..5aefa93
Binary files /dev/null and b/Resources/Audio/Animals/fox5.ogg differ
diff --git a/Resources/Audio/Animals/fox6.ogg b/Resources/Audio/Animals/fox6.ogg
new file mode 100644 (file)
index 0000000..d23cca5
Binary files /dev/null and b/Resources/Audio/Animals/fox6.ogg differ
diff --git a/Resources/Audio/Animals/fox7.ogg b/Resources/Audio/Animals/fox7.ogg
new file mode 100644 (file)
index 0000000..d4da91e
Binary files /dev/null and b/Resources/Audio/Animals/fox7.ogg differ
diff --git a/Resources/Audio/Animals/fox8.ogg b/Resources/Audio/Animals/fox8.ogg
new file mode 100644 (file)
index 0000000..52337a6
Binary files /dev/null and b/Resources/Audio/Animals/fox8.ogg differ
diff --git a/Resources/Audio/Animals/fox9.ogg b/Resources/Audio/Animals/fox9.ogg
new file mode 100644 (file)
index 0000000..eb161cc
Binary files /dev/null and b/Resources/Audio/Animals/fox9.ogg differ
index 0f17e7e9ec6f38e3a37c55bccf5f5ec3042690f9..3a0b4d2858eb2b090aa6fd3ad649ba1071bd0cea 100644 (file)
     interactFailureString: petting-failure-generic
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
-      path: /Audio/Animals/fox_squeak.ogg
+      collection: Fox
   - type: Grammar
     attributes:
       gender: epicene
index dab2860e28f3db75e8bd50fd076a3a1755bf7e2d..23eb462db18f3ba16bc95d99d0f5563448b7e623 100644 (file)
     interactFailureString: petting-failure-generic
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
-      path: /Audio/Animals/fox_squeak.ogg
+      collection: Fox
   - type: Butcherable
     spawned:
     - id: FoodMeat
diff --git a/Resources/Prototypes/SoundCollections/fox.yml b/Resources/Prototypes/SoundCollections/fox.yml
new file mode 100644 (file)
index 0000000..912ae24
--- /dev/null
@@ -0,0 +1,18 @@
+- type: soundCollection
+  id: Fox
+  files:
+    - /Audio/Animals/fox_squeak.ogg
+    - /Audio/Animals/fox1.ogg
+    - /Audio/Animals/fox2.ogg
+    - /Audio/Animals/fox3.ogg
+    - /Audio/Animals/fox4.ogg
+    - /Audio/Animals/fox5.ogg
+    - /Audio/Animals/fox6.ogg
+    - /Audio/Animals/fox7.ogg
+    - /Audio/Animals/fox8.ogg
+    - /Audio/Animals/fox9.ogg
+    - /Audio/Animals/fox10.ogg
+    - /Audio/Animals/fox11.ogg
+    - /Audio/Animals/fox12.ogg
+    - /Audio/Animals/fox13.ogg
+    - /Audio/Animals/fox14.ogg