diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index 12a46ae1eb..215944dc29 100644 --- 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 index 0000000000..4da5563fe7 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 index 0000000000..3dfcce11ae 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 index 0000000000..9f37b5b360 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 index 0000000000..f561fabdf1 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 index 0000000000..4397c2a4ff 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 index 0000000000..a654ce11c0 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 index 0000000000..24ac53ec34 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 index 0000000000..42093489d2 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 index 0000000000..07b0849849 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 722de7f74e..68e5a802e2 100644 --- 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 8fb39e9dc1..34cdeaf374 100644 --- 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 442dde4ba8..7e06860bc6 100644 --- 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 53cf905845..8908752b7a 100644 --- 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