From db2b48f68aae6e207401a5e412a3ce686a2e4684 Mon Sep 17 00:00:00 2001
From: Morb0 <14136326+Morb0@users.noreply.github.com>
Date: Mon, 17 Jun 2024 22:47:46 +0300
Subject: [PATCH] Use new voices

---
 Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs | 8 ++++----
 Resources/Prototypes/Corvax/tts-voices.yml                | 8 ++++++++
 .../Entities/Mobs/Cyborgs/base_borg_chassis.yml           | 2 +-
 .../Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml     | 2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/pets.yml          | 2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml      | 2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml      | 2 +-
 Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml        | 2 +-
 Resources/Prototypes/Entities/Objects/Fun/pai.yml         | 2 +-
 Resources/Prototypes/Entities/Objects/Fun/puppet.yml      | 4 ++--
 .../Entities/Structures/Machines/vending_machines.yml     | 2 +-
 Resources/Prototypes/Entities/Structures/hydro_tray.yml   | 2 +-
 12 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 4f011cba982..56155d8dc21 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -43,12 +43,12 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [ValidatePrototypeId<SpeciesPrototype>]
     public const string DefaultSpecies = "Human";
     // Corvax-TTS-Start
-    public const string DefaultVoice = "Garithos";
+    public const string DefaultVoice = "johnny";
     public static readonly Dictionary<Sex, string> DefaultSexVoice = new()
     {
-        {Sex.Male, "Garithos"},
-        {Sex.Female, "Maiev"},
-        {Sex.Unsexed, "Myron"},
+        {Sex.Male, "johnny"},
+        {Sex.Female, "v_female"},
+        {Sex.Unsexed, "serana"},
     };
     // Corvax-TTS-End
 
diff --git a/Resources/Prototypes/Corvax/tts-voices.yml b/Resources/Prototypes/Corvax/tts-voices.yml
index a80296d20c1..4dd28f9795d 100644
--- a/Resources/Prototypes/Corvax/tts-voices.yml
+++ b/Resources/Prototypes/Corvax/tts-voices.yml
@@ -123,6 +123,7 @@
   sex: Male
   speaker: gman
   id: gman
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-barni
@@ -341,24 +342,28 @@
   sex: Male
   speaker: adventure_core
   id: adventure_core
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-fact_core
   sex: Male
   speaker: fact_core
   id: fact_core
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-space_core
   sex: Male
   speaker: space_core
   id: space_core
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-turret_floor
   sex: Female
   speaker: turret_floor
   id: turret_floor
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-geralt
@@ -557,6 +562,7 @@
   sex: Male
   speaker: skippy
   id: skippy
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-jackie
@@ -569,6 +575,7 @@
   sex: Male
   speaker: dornan
   id: dornan
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-officer_enclave
@@ -665,6 +672,7 @@
   sex: Female
   speaker: adjutant
   id: adjutant
+  roundStart: false
 
 - type: ttsVoice
   name: tts-voice-name-hanson
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 6a2aa84dc45..581ed90a40d 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -218,7 +218,7 @@
       - Cyborgs
   - type: StepTriggerImmune
   - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+    voice: fact_core
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 6cb4b1b9599..7696fb0a523 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -249,7 +249,7 @@
     footstepSoundCollection:
       collection: FootstepHoverBorg
   - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+    voice: fact_core
 
 - type: entity
   id: BorgChassisService
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index dfc0be00b38..5f37a6b0ac5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -760,7 +760,7 @@
       proper: true
       gender: female
   - type: TTS # Corvax-TTS
-    voice: Dryad
+    voice: angry_neco_arc
 
 - type: entity
   name: Pun Pun
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index c188ecafbd8..daa7a7b4b63 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -121,7 +121,7 @@
     attributes:
       gender: male
   - type: TTS # Corvax-TTS
-    voice: Rat
+    voice: dude
 
 - type: entity
   id: MobRatKingBuff
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 806af49f6f9..d7d8afdd1d0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -41,7 +41,7 @@
   - type: NoSlip
   - type: Actions
   - type: TTS # Corvax-TTS
-    voice: Kelthuzad
+    voice: illidan
   - type: Eye
     drawFov: false
     visMask:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index e75d948bfba..43cb774a204 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -142,7 +142,7 @@
     rootTask:
       task: SimpleHostileCompound
   - type: TTS # Corvax-TTS
-    voice: Chen
+    voice: neco_arc_2
 
 - type: entity
   name: geras
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 6f5ef5455ba..587bd5b2cfb 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -55,7 +55,7 @@
   - type: TypingIndicator
     proto: robot
   - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+    voice: skippy
   - type: Speech
     speechVerb: Robotic
     speechSounds: Pai
diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
index eaa0eb42ae7..e85a50400b3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
@@ -19,7 +19,7 @@
   - type: TypingIndicator
     proto: robot
   - type: TTS # Corvax-TTS
-    voice: Meepo
+    voice: ziggs
   - type: Actions
   - type: MobState
     allowedStates:
@@ -43,4 +43,4 @@
     layers:
     - state: icon
   - type: TTS # Corvax-TTS
-    voice: Zibb
+    voice: ominisgaunt
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 6487ce7210d..65026b4d056 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -72,7 +72,7 @@
   - type: TypingIndicator
     proto: robot
   - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+    voice: space_core
   - type: Speech
     speechVerb: Robotic
     speechSounds: Vending
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 5f8642ca15d..5c24261f610 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -83,7 +83,7 @@
   - type: Machine
     board: HydroponicsTrayMachineCircuitboard
   - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+    voice: space_core
   - type: WiresPanel
   - type: AmbientSound
     volume: -9