Screaming for cyborgs (#32329)

diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index 12a46ae1eb63766f34228bd6e9b6fa78ad7b2e0b..215944dc291881a6f8563ebeea67e60e147cac24 100644 (file)
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -172,12 +172,25 @@
   license: "CC0-1.0"
   copyright: "by Ko4erga"
   source: "https://github.com/space-wizards/space-station-14/pull/30431"
-  
+
+- files:
+  - robotscream_1.ogg
+  - robotscream_2.ogg
+  - robotscream_3.ogg
+  - robotscream_4.ogg
+  - robotscream_5.ogg
+  - robotscream_6.ogg
+  - robotscream_7.ogg
+  - robotscream_8.ogg
+  - robotscream_9.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "/tg/station and modified by AsnDen"
+  source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
+
 - files: ["double_ring.ogg"]
   license: "CC0-1.0"
   copyright: "Created by fspera, converted to OGG and modified by chromiumboy."
   source: "https://freesound.org/people/fspera/sounds/528111/"
-
 - files:
   - airlock_emergencyoff.ogg
   - airlock_emergencyon.ogg

diff --git a/Resources/Audio/Machines/robotscream_1.ogg b/Resources/Audio/Machines/robotscream_1.ogg
new file mode 100644 (file)
index 0000000..4da5563
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_1.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_2.ogg b/Resources/Audio/Machines/robotscream_2.ogg
new file mode 100644 (file)
index 0000000..3dfcce1
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_2.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_3.ogg b/Resources/Audio/Machines/robotscream_3.ogg
new file mode 100644 (file)
index 0000000..9f37b5b
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_3.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_4.ogg b/Resources/Audio/Machines/robotscream_4.ogg
new file mode 100644 (file)
index 0000000..f561fab
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_4.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_5.ogg b/Resources/Audio/Machines/robotscream_5.ogg
new file mode 100644 (file)
index 0000000..4397c2a
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_5.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_6.ogg b/Resources/Audio/Machines/robotscream_6.ogg
new file mode 100644 (file)
index 0000000..a654ce1
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_6.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_7.ogg b/Resources/Audio/Machines/robotscream_7.ogg
new file mode 100644 (file)
index 0000000..24ac53e
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_7.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_8.ogg b/Resources/Audio/Machines/robotscream_8.ogg
new file mode 100644 (file)
index 0000000..4209348
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_8.ogg differ

diff --git a/Resources/Audio/Machines/robotscream_9.ogg b/Resources/Audio/Machines/robotscream_9.ogg
new file mode 100644 (file)
index 0000000..07b0849
Binary files /dev/null and b/Resources/Audio/Machines/robotscream_9.ogg differ

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 722de7f74e432a2d8375b297ec1771c097ad0f06..68e5a802e2ef60ec68c0ec9cdb9c927ac8ea62e4 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -155,7 +155,7 @@
   - type: Vocal
     sounds:
       Unsexed: UnisexSilicon
-    screamAction: null
+    wilhelmProbability: 0
   - type: DamagedSiliconAccent
   - type: UnblockableSpeech
   - type: FootstepModifier

diff --git a/Resources/Prototypes/SoundCollections/screams.yml b/Resources/Prototypes/SoundCollections/screams.yml
index 8fb39e9dc146acd0cdb9ab3e9eb9a6a8c28e0da6..34cdeaf3740486c4c8ef8a4643ae9f10ad9a6074 100644 (file)
--- a/Resources/Prototypes/SoundCollections/screams.yml
+++ b/Resources/Prototypes/SoundCollections/screams.yml
@@ -47,4 +47,17 @@
     - /Audio/Voice/Human/femalescream_2.ogg
     - /Audio/Voice/Human/femalescream_3.ogg
     - /Audio/Voice/Human/femalescream_4.ogg
-    - /Audio/Voice/Human/femalescream_5.ogg
\ No newline at end of file
+    - /Audio/Voice/Human/femalescream_5.ogg
+
+- type: soundCollection
+  id: SiliconScreams
+  files:
+    - /Audio/Machines/robotscream_1.ogg
+    - /Audio/Machines/robotscream_2.ogg
+    - /Audio/Machines/robotscream_3.ogg
+    - /Audio/Machines/robotscream_4.ogg
+    - /Audio/Machines/robotscream_5.ogg
+    - /Audio/Machines/robotscream_6.ogg
+    - /Audio/Machines/robotscream_7.ogg
+    - /Audio/Machines/robotscream_8.ogg
+    - /Audio/Machines/robotscream_9.ogg

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 442dde4ba81321f59e430993d13a4c0cf883a121..7e06860bc64f794c756861e9e57056f37f46e3b2 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -399,6 +399,8 @@
   params:
     variation: 0.05
   sounds:
+    Scream:
+      collection: SiliconScreams
     Beep:
       path: /Audio/Machines/twobeep.ogg
     Chime:
@@ -417,6 +419,8 @@
   params:
     variation: 0.05
   sounds:
+    Scream:
+      collection: SiliconScreams
     Laugh:
       path: /Audio/Voice/Silicon/syndieborg_laugh.ogg
     Beep:

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 53cf9058458e1cb060209fcc2695a3f07eba5b16..8908752b7a2008449641584a0145b6cca6886f66 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -7,9 +7,6 @@
   whitelist:
     components:
     - Vocal
-  blacklist:
-    tags:
-    - SiliconEmotes
   chatMessages: ["chat-emote-msg-scream"]
   chatTriggers:
     - scream