Merge branch 'borgs-sound' into 'arumoon-server'

New Borgs Sounds See merge request Workbench-Team/space-station-14!123
Workbench-Team · Aug 13, 2023 · 85a15ed · 85a15ed
2 parents 06fa62a + ffb01f5
commit 85a15ed
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 1 deletion.
diff --git a/Resources/Audio/Effects/Footsteps/attributions.yml b/Resources/Audio/Effects/Footsteps/attributions.yml
@@ -32,3 +32,11 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken and modified from tgstation (clownstep 1 and 2) by brainfood1183 (github)"
   source: "https://github.com/tgstation/tgstation/tree/f8ee37afc00bce1ad421615eaa0e4cbddd5eea90/sound/effects"
+
+- files:
+  - borgwalk1.ogg
+  - borgwalk2.ogg
+  - borgwalk3.ogg
+  license: "CC-BY-SA-4.0"
+  copyright: "Recorded and modified by https://github.com/MilenVolf"
+  source: "https://git.arumoon.ru/Workbench-Team/space-station-14/-/merge_requests/123"
diff --git a/Resources/Audio/Effects/Footsteps/borgwalk1.ogg b/Resources/Audio/Effects/Footsteps/borgwalk1.ogg
diff --git a/Resources/Audio/Effects/Footsteps/borgwalk2.ogg b/Resources/Audio/Effects/Footsteps/borgwalk2.ogg
diff --git a/Resources/Audio/Effects/Footsteps/borgwalk3.ogg b/Resources/Audio/Effects/Footsteps/borgwalk3.ogg
diff --git a/Resources/Audio/Voice/Talk/attributions.yml b/Resources/Audio/Voice/Talk/attributions.yml
@@ -2,3 +2,8 @@
   license: "CC-BY-4.0"
   copyright: "Recorded by https://github.com/PixelTheKermit"
   source: "https://github.com/space-wizards/space-station-14/pull/13945"
+
+- files: ["borg.ogg", "borg_ask.ogg", "borg_exclaim.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Recorded and mixed by https://github.com/MilenVolf"
+  source: "https://git.arumoon.ru/Workbench-Team/space-station-14/-/merge_requests/123"
diff --git a/Resources/Audio/Voice/Talk/borg.ogg b/Resources/Audio/Voice/Talk/borg.ogg
diff --git a/Resources/Audio/Voice/Talk/borg_ask.ogg b/Resources/Audio/Voice/Talk/borg_ask.ogg
diff --git a/Resources/Audio/Voice/Talk/borg_exclaim.ogg b/Resources/Audio/Voice/Talk/borg_exclaim.ogg
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -103,7 +103,13 @@
   - type: TypingIndicator
     proto: robot
   - type: Speech
-    speechSounds: Pai
+    speechSounds: Borg
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: LimbstepBorg
+      params:
+        variation: 0.07
+        volume: -5
   - type: Construction
     graph: Cyborg
     containers:
@@ -170,3 +176,4 @@
     tags:
     - ShoesRequiredStepTriggerImmune
     - DoorBumpOpener
+    - FootstepSound
diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml
@@ -153,3 +153,10 @@
   files:
   - /Audio/Effects/Footsteps/clownspiderstep1.ogg
   - /Audio/Effects/Footsteps/clownspiderstep2.ogg
+
+- type: soundCollection
+  id: LimbstepBorg
+  files:
+  - /Audio/Effects/Footsteps/borgwalk1.ogg
+  - /Audio/Effects/Footsteps/borgwalk2.ogg
+  - /Audio/Effects/Footsteps/borgwalk3.ogg
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -61,6 +61,15 @@
   exclaimSound:
     path: /Audio/Machines/vending_jingle.ogg
 
+- type: speechSounds
+  id: Borg
+  saySound:
+    path: /Audio/Voice/Talk/borg.ogg
+  askSound:
+    path: /Audio/Voice/Talk/borg_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/borg_exclaim.ogg
+
 - type: speechSounds
   id: Pai
   saySound: