diff --git a/Resources/Audio/White/Voice/Human/Female/crying1.ogg b/Resources/Audio/White/Voice/Human/Female/crying1.ogg new file mode 100644 index 0000000000..f8f468c2b4 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying1.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_female_1.ogg b/Resources/Audio/White/Voice/Human/Female/crying10.ogg similarity index 100% rename from Resources/Audio/Voice/Human/cry_female_1.ogg rename to Resources/Audio/White/Voice/Human/Female/crying10.ogg diff --git a/Resources/Audio/Voice/Human/cry_female_2.ogg b/Resources/Audio/White/Voice/Human/Female/crying11.ogg similarity index 100% rename from Resources/Audio/Voice/Human/cry_female_2.ogg rename to Resources/Audio/White/Voice/Human/Female/crying11.ogg diff --git a/Resources/Audio/Voice/Human/cry_female_3.ogg b/Resources/Audio/White/Voice/Human/Female/crying12.ogg similarity index 100% rename from Resources/Audio/Voice/Human/cry_female_3.ogg rename to Resources/Audio/White/Voice/Human/Female/crying12.ogg diff --git a/Resources/Audio/White/Voice/Human/Female/crying2.ogg b/Resources/Audio/White/Voice/Human/Female/crying2.ogg new file mode 100644 index 0000000000..14f186d7dc Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying2.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/crying3.ogg b/Resources/Audio/White/Voice/Human/Female/crying3.ogg new file mode 100644 index 0000000000..25fa49d105 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying3.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/crying4.ogg b/Resources/Audio/White/Voice/Human/Female/crying4.ogg new file mode 100644 index 0000000000..42c5f7ec6d Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying4.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/crying5.ogg b/Resources/Audio/White/Voice/Human/Female/crying5.ogg new file mode 100644 index 0000000000..96b5afb1bc Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying5.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/crying6.ogg b/Resources/Audio/White/Voice/Human/Female/crying6.ogg new file mode 100644 index 0000000000..25ed055d72 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying6.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/crying7.ogg b/Resources/Audio/White/Voice/Human/Female/crying7.ogg new file mode 100644 index 0000000000..04ae90df9c Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying7.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/crying8.ogg b/Resources/Audio/White/Voice/Human/Female/crying8.ogg new file mode 100644 index 0000000000..0f5598b744 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/crying8.ogg differ diff --git a/Resources/Audio/Voice/Human/cry_female_4.ogg b/Resources/Audio/White/Voice/Human/Female/crying9.ogg similarity index 100% rename from Resources/Audio/Voice/Human/cry_female_4.ogg rename to Resources/Audio/White/Voice/Human/Female/crying9.ogg diff --git a/Resources/Audio/White/Voice/Human/Female/laugh1.ogg b/Resources/Audio/White/Voice/Human/Female/laugh1.ogg new file mode 100644 index 0000000000..f15e2a8fbb Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/laugh1.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/laugh2.ogg b/Resources/Audio/White/Voice/Human/Female/laugh2.ogg new file mode 100644 index 0000000000..b724f2a91c Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/laugh2.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Female/laugh3.ogg b/Resources/Audio/White/Voice/Human/Female/laugh3.ogg new file mode 100644 index 0000000000..1313bd445f Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Female/laugh3.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/crying1.ogg b/Resources/Audio/White/Voice/Human/Male/crying1.ogg new file mode 100644 index 0000000000..1ce3a7b8ba Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/crying1.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/crying2.ogg b/Resources/Audio/White/Voice/Human/Male/crying2.ogg new file mode 100644 index 0000000000..000b8020ee Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/crying2.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/crying3.ogg b/Resources/Audio/White/Voice/Human/Male/crying3.ogg new file mode 100644 index 0000000000..2b3fab1593 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/crying3.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/crying4.ogg b/Resources/Audio/White/Voice/Human/Male/crying4.ogg new file mode 100644 index 0000000000..d7de7301fe Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/crying4.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/crying5.ogg b/Resources/Audio/White/Voice/Human/Male/crying5.ogg new file mode 100644 index 0000000000..56d2ec4e84 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/crying5.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/crying6.ogg b/Resources/Audio/White/Voice/Human/Male/crying6.ogg new file mode 100644 index 0000000000..cf4234f379 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/crying6.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/laugh2.ogg b/Resources/Audio/White/Voice/Human/Male/laugh2.ogg new file mode 100644 index 0000000000..d4c4fae561 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/laugh2.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/laugh3.ogg b/Resources/Audio/White/Voice/Human/Male/laugh3.ogg new file mode 100644 index 0000000000..9497c7f3de Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/laugh3.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/laugh4.ogg b/Resources/Audio/White/Voice/Human/Male/laugh4.ogg new file mode 100644 index 0000000000..c132a448e7 Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/laugh4.ogg differ diff --git a/Resources/Audio/White/Voice/Human/Male/laugh5.ogg b/Resources/Audio/White/Voice/Human/Male/laugh5.ogg new file mode 100644 index 0000000000..c74ccc5d1f Binary files /dev/null and b/Resources/Audio/White/Voice/Human/Male/laugh5.ogg differ diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml index 1fbd88b48f..6367599ffc 100644 --- a/Resources/Prototypes/SoundCollections/emotes.yml +++ b/Resources/Prototypes/SoundCollections/emotes.yml @@ -1,13 +1,17 @@ - type: soundCollection id: MaleLaugh files: - - /Audio/Voice/Human/manlaugh1.ogg - - /Audio/Voice/Human/manlaugh2.ogg + - /Audio/White/Voice/Human/Male/laugh2.ogg # WD + - /Audio/White/Voice/Human/Male/laugh3.ogg # WD + - /Audio/White/Voice/Human/Male/laugh4.ogg # WD + - /Audio/White/Voice/Human/Male/laugh5.ogg # WD - type: soundCollection id: FemaleLaugh files: - - /Audio/Voice/Human/womanlaugh.ogg + - /Audio/White/Voice/Human/Female/laugh1.ogg # WD + - /Audio/White/Voice/Human/Female/laugh2.ogg # WD + - /Audio/White/Voice/Human/Female/laugh3.ogg # WD - type: soundCollection id: Claps @@ -47,20 +51,30 @@ - /Audio/Effects/Emotes/salute.ogg - type: soundCollection - id: MaleCry + id: MaleCrying files: - - /Audio/Voice/Human/cry_male_1.ogg - - /Audio/Voice/Human/cry_male_2.ogg - - /Audio/Voice/Human/cry_male_3.ogg - - /Audio/Voice/Human/cry_male_4.ogg + - /Audio/White/Voice/Human/Male/crying1.ogg # WD + - /Audio/White/Voice/Human/Male/crying2.ogg # WD + - /Audio/White/Voice/Human/Male/crying3.ogg # WD + - /Audio/White/Voice/Human/Male/crying4.ogg # WD + - /Audio/White/Voice/Human/Male/crying5.ogg # WD + - /Audio/White/Voice/Human/Male/crying6.ogg # WD - type: soundCollection - id: FemaleCry + id: FemaleCrying files: - - /Audio/Voice/Human/cry_female_1.ogg - - /Audio/Voice/Human/cry_female_2.ogg - - /Audio/Voice/Human/cry_female_3.ogg - - /Audio/Voice/Human/cry_female_4.ogg + - /Audio/White/Voice/Human/Female/crying1.ogg # WD + - /Audio/White/Voice/Human/Female/crying2.ogg # WD + - /Audio/White/Voice/Human/Female/crying3.ogg # WD + - /Audio/White/Voice/Human/Female/crying4.ogg # WD + - /Audio/White/Voice/Human/Female/crying5.ogg # WD + - /Audio/White/Voice/Human/Female/crying6.ogg # WD + - /Audio/White/Voice/Human/Female/crying7.ogg # WD + - /Audio/White/Voice/Human/Female/crying8.ogg # WD + - /Audio/White/Voice/Human/Female/crying9.ogg # WD + - /Audio/White/Voice/Human/Female/crying10.ogg # WD + - /Audio/White/Voice/Human/Female/crying11.ogg # WD + - /Audio/White/Voice/Human/Female/crying12.ogg # WD - type: soundCollection id: Whistles diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index f5f4b921be..c11c1498b5 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -29,7 +29,7 @@ Sigh: collection: MaleSigh Crying: - collection: MaleCry + collection: MaleCrying Whistle: collection: Whistles Weh: @@ -61,7 +61,15 @@ Snore: collection: Snores Honk: - collection: CluwneHorn + collection: BikeHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCrying + Whistle: + collection: Whistles + Weh: + collection: Weh - type: emoteSounds id: MaleFelinid @@ -85,9 +93,11 @@ Sigh: collection: MaleSigh Crying: - collection: MaleCry + collection: MaleCrying Whistle: collection: Whistles + Weh: + collection: Weh Hiss: collection: FelinidHisses Meow: @@ -119,7 +129,7 @@ Sigh: collection: FemaleSigh Crying: - collection: FemaleCry + collection: FemaleCrying Whistle: collection: Whistles Weh: @@ -154,6 +164,8 @@ collection: HarpyCry Whistle: collection: Whistles + Weh: + collection: Weh Hiss: collection: HarpyHisses Meow: @@ -204,7 +216,7 @@ Whistle: collection: Whistles Crying: - collection: MaleCry + collection: MaleCrying Weh: collection: Weh @@ -238,7 +250,7 @@ Sigh: collection: MaleSigh Crying: - collection: MaleCry + collection: MaleCrying Whistle: collection: Whistles Weh: @@ -276,7 +288,7 @@ Sigh: collection: FemaleSigh Crying: - collection: FemaleCry + collection: FemaleCrying Whistle: collection: Whistles Weh: @@ -302,6 +314,8 @@ path: /Audio/Voice/Diona/diona_scream.ogg Laugh: collection: DionaLaugh + Whistle: + collection: Whistles Honk: collection: BikeHorn Weh: @@ -353,7 +367,7 @@ Honk: collection: BikeHorn Crying: - collection: MaleCry + collection: MaleCrying Whistle: collection: Whistles Weh: @@ -390,7 +404,7 @@ Honk: collection: BikeHorn Crying: - collection: FemaleCry + collection: FemaleCrying Whistle: collection: Whistles Weh: diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 5fcd343058..c9361c90e1 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -67,6 +67,7 @@ buttonText: Свистнуть chatMessages: [ свистит ] chatTriggers: + - свистит - свистнул - свистнула - свистнуло