]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New borg sounds (#27205)
authorMilenVolf <63782763+MilenVolf@users.noreply.github.com>
Mon, 29 Apr 2024 04:38:31 +0000 (07:38 +0300)
committerGitHub <noreply@github.com>
Mon, 29 Apr 2024 04:38:31 +0000 (21:38 -0700)
* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor

17 files changed:
Resources/Audio/Effects/Footsteps/attributions.yml
Resources/Audio/Effects/Footsteps/borgwalk1.ogg [new file with mode: 0644]
Resources/Audio/Effects/Footsteps/borgwalk2.ogg [new file with mode: 0644]
Resources/Audio/Voice/Silicon/attributions.yml [new file with mode: 0644]
Resources/Audio/Voice/Silicon/syndieborg_laugh.ogg [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/attributions.yml [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/borg.ogg [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/borg_ask.ogg [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/borg_exclaim.ogg [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/syndieborg.ogg [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/syndieborg_ask.ogg [new file with mode: 0644]
Resources/Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg [new file with mode: 0644]
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
Resources/Prototypes/SoundCollections/footsteps.yml
Resources/Prototypes/Voice/speech_emote_sounds.yml
Resources/Prototypes/Voice/speech_sounds.yml

index 82b5fa93ca2c95c975bda81ecc5dd1dc20ef57e4..91c3ce260d4e92d6951ce5d4b5a1222b4767100f 100644 (file)
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation"
   source: "https://github.com/tgstation/tgstation/tree/1e8d511946d194f92f744f5f957a7c41683d84a6/sound/effects/footstep"
+
+- files:
+  - borgwalk1.ogg
+  - borgwalk2.ogg
+  license: "CC-BY-SA-4.0"
+  copyright: "Taken from IENBA freesound.org and modified by https://github.com/MilenVolf"
+  source: "https://freesound.org/people/IENBA/sounds/697379/"
diff --git a/Resources/Audio/Effects/Footsteps/borgwalk1.ogg b/Resources/Audio/Effects/Footsteps/borgwalk1.ogg
new file mode 100644 (file)
index 0000000..1ffc151
Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/borgwalk1.ogg differ
diff --git a/Resources/Audio/Effects/Footsteps/borgwalk2.ogg b/Resources/Audio/Effects/Footsteps/borgwalk2.ogg
new file mode 100644 (file)
index 0000000..7998be8
Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/borgwalk2.ogg differ
diff --git a/Resources/Audio/Voice/Silicon/attributions.yml b/Resources/Audio/Voice/Silicon/attributions.yml
new file mode 100644 (file)
index 0000000..465f845
--- /dev/null
@@ -0,0 +1,4 @@
+- files: ["syndieborg_laugh.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from vultraz168 freesound.org and modified by https://github.com/MilenVolf"
+  source: "https://freesound.org/people/vultraz168/sounds/334665/"
diff --git a/Resources/Audio/Voice/Silicon/syndieborg_laugh.ogg b/Resources/Audio/Voice/Silicon/syndieborg_laugh.ogg
new file mode 100644 (file)
index 0000000..e0f4253
Binary files /dev/null and b/Resources/Audio/Voice/Silicon/syndieborg_laugh.ogg differ
diff --git a/Resources/Audio/Voice/Talk/Silicon/attributions.yml b/Resources/Audio/Voice/Talk/Silicon/attributions.yml
new file mode 100644 (file)
index 0000000..3a16007
--- /dev/null
@@ -0,0 +1,10 @@
+- files:
+  - borg.ogg
+  - borg_ask.ogg
+  - borg_exclaim.ogg
+  - syndieborg.ogg
+  - syndieborg_ask.ogg
+  - syndieborg_exclaim.ogg
+  license: "CC-BY-SA-4.0"
+  copyright: "Recorded and mixed by https://github.com/MilenVolf"
+  source: "https://github.com/space-wizards/space-station-14/pull/27205"
diff --git a/Resources/Audio/Voice/Talk/Silicon/borg.ogg b/Resources/Audio/Voice/Talk/Silicon/borg.ogg
new file mode 100644 (file)
index 0000000..afb9739
Binary files /dev/null and b/Resources/Audio/Voice/Talk/Silicon/borg.ogg differ
diff --git a/Resources/Audio/Voice/Talk/Silicon/borg_ask.ogg b/Resources/Audio/Voice/Talk/Silicon/borg_ask.ogg
new file mode 100644 (file)
index 0000000..fe2f601
Binary files /dev/null and b/Resources/Audio/Voice/Talk/Silicon/borg_ask.ogg differ
diff --git a/Resources/Audio/Voice/Talk/Silicon/borg_exclaim.ogg b/Resources/Audio/Voice/Talk/Silicon/borg_exclaim.ogg
new file mode 100644 (file)
index 0000000..5f0fdfe
Binary files /dev/null and b/Resources/Audio/Voice/Talk/Silicon/borg_exclaim.ogg differ
diff --git a/Resources/Audio/Voice/Talk/Silicon/syndieborg.ogg b/Resources/Audio/Voice/Talk/Silicon/syndieborg.ogg
new file mode 100644 (file)
index 0000000..60eb1a5
Binary files /dev/null and b/Resources/Audio/Voice/Talk/Silicon/syndieborg.ogg differ
diff --git a/Resources/Audio/Voice/Talk/Silicon/syndieborg_ask.ogg b/Resources/Audio/Voice/Talk/Silicon/syndieborg_ask.ogg
new file mode 100644 (file)
index 0000000..acafe45
Binary files /dev/null and b/Resources/Audio/Voice/Talk/Silicon/syndieborg_ask.ogg differ
diff --git a/Resources/Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg b/Resources/Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg
new file mode 100644 (file)
index 0000000..392b4fd
Binary files /dev/null and b/Resources/Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg differ
index cb846c7ddec519294a754db8d8c915c726bd1714..2df281971af3b6f55ceb47c006903c82de003a6e 100644 (file)
     proto: robot
   - type: Speech
     speechVerb: Robotic
-    speechSounds: Pai
+    speechSounds: Borg
   - type: Vocal
     sounds:
       Unsexed: UnisexSilicon
   - type: UnblockableSpeech
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepBorg
   - type: Construction
     graph: Cyborg
     containers:
   - type: Tag
     tags:
     - DoorBumpOpener
+    - FootstepSound
     - CanPilot
   - type: Emoting
   - type: GuideHelp
   parent: BaseBorgChassis
   abstract: true
   components:
-    - type: NpcFactionMember
-      factions:
-        - Syndicate
-    - type: Access
-      tags:
-       - NuclearOperative
-       - SyndicateAgent
-    - type: AccessReader
-      access: [["SyndicateAgent"], ["NuclearOperative"]]
-    - type: SiliconLawProvider
-      laws: SyndicateStatic
-    - type: IntrinsicRadioTransmitter
-      channels:
-        - Binary
-        - Syndicate
-    - type: ActiveRadio
-      channels:
-        - Syndicate
-    - type: ShowSyndicateIcons
-    - type: MovementAlwaysTouching
+  - type: NpcFactionMember
+    factions:
+    - Syndicate
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+  - type: AccessReader
+    access: [["SyndicateAgent"], ["NuclearOperative"]]
+  - type: SiliconLawProvider
+    laws: SyndicateStatic
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+    - Syndicate
+  - type: ActiveRadio
+    channels:
+    - Syndicate
+  - type: ShowSyndicateIcons
+  - type: MovementAlwaysTouching
+  - type: Speech
+    speechSounds: SyndieBorg
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconSyndicate
index 76edbf79e0b30baacfc12292c00481cecd09fe7f..9365c6da56902f1107f6cbd9f48c3405e144762f 100644 (file)
     access: [["Medical"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgDutch
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepHoverBorg
+      params:
+        volume: -6
 
 - type: entity
   id: BorgChassisService
index bd51e6b4458e683673bf2fc3f85193e3b5634219..e179584f6fb7dadd889f0dda5b0f9af8d9df9c35 100644 (file)
   - /Audio/Effects/Footsteps/spurs1.ogg
   - /Audio/Effects/Footsteps/spurs2.ogg
   - /Audio/Effects/Footsteps/spurs3.ogg
+
+- type: soundCollection
+  id: FootstepBorg
+  files:
+  - /Audio/Effects/Footsteps/borgwalk1.ogg
+
+- type: soundCollection
+  id: FootstepHoverBorg
+  files:
+  - /Audio/Effects/Footsteps/borgwalk2.ogg
index 5556afa07d8ccb99e5a963192a5c437018305148..61c951dca9a42b6e43a70fc5ee6f724aee3906eb 100644 (file)
     Ping:
       path: /Audio/Effects/Cargo/ping.ogg
 
+- type: emoteSounds
+  id: UnisexSiliconSyndicate
+  params:
+    variation: 0.05
+  sounds:
+    Laugh:
+      path: /Audio/Voice/Silicon/syndieborg_laugh.ogg
+    Beep:
+      path: /Audio/Machines/twobeep.ogg
+    Chime:
+      path: /Audio/Machines/chime.ogg
+    Buzz:
+      path: /Audio/Machines/buzz-sigh.ogg
+    Buzz-Two:
+      path: /Audio/Machines/buzz-two.ogg
+    Honk:
+      path: /Audio/Items/bikehorn.ogg
+    Ping:
+      path: /Audio/Effects/Cargo/ping.ogg
+
 # body emotes
 - type: emoteSounds
   id: GeneralBodyEmotes
index 2e7e7bf989a50d404f1cf15996cf196390c3f762..a490c734d3deffe930df1f93dc70b7172ce8e1fe 100644 (file)
   exclaimSound:
     path: /Audio/Machines/vending_jingle.ogg
 
+- type: speechSounds
+  id: Borg
+  saySound:
+    path: /Audio/Voice/Talk/Silicon/borg.ogg
+  askSound:
+    path: /Audio/Voice/Talk/Silicon/borg_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/Silicon/borg_exclaim.ogg
+
+- type: speechSounds
+  id: SyndieBorg
+  saySound:
+    path: /Audio/Voice/Talk/Silicon/syndieborg.ogg
+  askSound:
+    path: /Audio/Voice/Talk/Silicon/syndieborg_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg
+
 - type: speechSounds
   id: Pai
   saySound: