Merge branch 'space-sunrise:master' into some-fixes

space-sunrise · Oct 21, 2024 · 91a18c0 · 91a18c0
2 parents 19def05 + fe9e685
commit 91a18c0
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 10 deletions.
diff --git a/Content.Server/_Sunrise/PlanetPrison/PlanetPrisonStationSystem.cs b/Content.Server/_Sunrise/PlanetPrison/PlanetPrisonStationSystem.cs
@@ -71,6 +71,10 @@ private void OnPlanetPrisonStationInit(EntityUid uid, PlanetPrisonStationCompone
             return;
         }
 
+        var enable = _cfg.GetCVar(SunriseCCVars.MinPlayersEnable);
+        if (!enable)
+            return;
+
         var minPlayers = _cfg.GetCVar(SunriseCCVars.MinPlayersPlanetPrison);
         if (_player.PlayerCount <= minPlayers)
         {

diff --git a/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs b/Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
@@ -200,6 +200,9 @@ public static readonly CVarDef<bool>
      * Planet Prison
      */
 
+    public static readonly CVarDef<bool> MinPlayersEnable =
+            CVarDef.Create("planet_prison.enable", true, CVar.SERVERONLY);
+
     public static readonly CVarDef<int> MinPlayersPlanetPrison =
         CVarDef.Create("planet_prison.min_players", 60, CVar.SERVERONLY);
 

diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml
@@ -4779,3 +4779,23 @@
   id: 341
   time: '2024-10-17T00:26:12.0000000+00:00'
   url: https://github.com/space-sunrise/space-station-14/pull/505
+- author: SplikZerys
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0434\u0432\u0430\
+      \ (2) \u043D\u043E\u0432\u044B\u0445 \u0433\u043E\u043B\u043E\u0441\u0430 \u0438\
+      \u0437 Hearthstone: \u0410\u043A\u0430\u043C\u0430 \u0438 \u0412\u0430\u043B\
+      \u0438\u0440\u0430 \u0421\u0430\u043D\u0433\u0432\u0438\u043D\u0430\u0440."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u043E\u0441\
+      \u0435\u043C\u044C (8) \u043D\u043E\u0432\u044B\u0445 \u0433\u043E\u043B\u043E\
+      \u0441 \u0438\u0437 Pathologic 2: \u0413\u0435\u043E\u0440\u0433\u0438\u0439\
+      \ \u041A\u0430\u0438\u043D, \u0410\u0440\u0442\u0435\u043C\u0438\u0439 \u0411\
+      \u0443\u0440\u0430\u0445, \u0413\u0440\u0438\u0444, \u0410\u043D\u0433\u043B\
+      \u0430\u044F \u041B\u0438\u043B\u0438\u0447, \u0418\u043D\u043A\u0432\u0438\u0437\
+      \u0438\u0442\u043E\u0440, \u0410\u043B\u0435\u043A\u0441\u0430\u043D\u0434\u0440\
+      \ \u0421\u0430\u0431\u0443\u0440\u043E\u0432, \u0410\u043B\u0435\u043A\u0441\
+      \u0430\u043D\u0434\u0440 \u0411\u043B\u043E\u043A, \u041C\u0430\u0440\u043A\
+      \ \u0411\u0435\u0441\u0441\u043C\u0435\u0440\u0442\u043D\u0438\u043A."
+    type: Add
+  id: 342
+  time: '2024-10-21T00:08:09.484875+00:00'
diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl
@@ -37,6 +37,15 @@ tts-voice-name-hearthstone-elisa = (NEW) [Hearthstone] Элиза
 tts-voice-name-hearthstone-sotis = (NEW) [Hearthstone] Сотис
 tts-voice-name-hearthstone-mediv = (NEW) [Hearthstone] Медив
 tts-voice-name-mtf1 = (NEW) [Containment Breach] MTF 1
-tts-voice-name-mtf2 = (NEW) [Containment Breach] MTF 2
 tts-voice-name-petr_glance_ivashenko = (NEW) [Актер Озвучки] Пётр Иващенко
 tts-voice-name-three-bogatira-alesha-popovich = (NEW) [Три Богатыря] Алёша Попович
+tts-voice-name-hearthstone-valira-sangvinar = (NEW) [Hearthstone] Валира Сангвинар
+tts-voice-name-hearthstone-akama = (NEW) [Hearthstone] Акама
+tts-voice-name-pathologic2-georgiy-kain = (NEW) [Pathologic 2] Георгий Каин
+tts-voice-name-pathologic2-artemiy-burach = (NEW) [Pathologic 2] Артемий Бурах
+tts-voice-name-pathologic2-grif = (NEW) [Pathologic 2] Гриф
+tts-voice-name-pathologic2-anglaya-lilich = (NEW) [Pathologic 2] Англая Лилич
+tts-voice-name-pathologic2-alexander-saburov = (NEW) [Pathologic 2] Александр Сабуров
+tts-voice-name-pathologic2-inkvizitor = (NEW) [Pathologic 2] Инквизитор
+tts-voice-name-pathologic2-alexander-blok = (NEW) [Pathologic 2] Александр Блок
+tts-voice-name-pathologic2-mark-bessmertnik = (NEW) [Pathologic 2] Марк Бессмертник
diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml
@@ -204,6 +204,7 @@
   sex: Male
   speaker: splikzerys
   provider: sunrise
+  roundStart: false # предстоит перетренировка модели
 
 - type: ttsVoice
   id: Dota2Riki
@@ -323,15 +324,7 @@
   sex: Male
   speaker: mtf_1
   provider: sunrise
-  roundStart: true # хз
-
-- type: ttsVoice
-  id: CBMTF2
-  name: tts-voice-name-mtf2
-  sex: Male
-  speaker: mtf_2
-  provider: sunrise
-  roundStart: true # хз
+  roundStart: false # точно нет
 
 - type: ttsVoice
   id: ThreeBigatiraAleshaPopovich
@@ -348,3 +341,91 @@
   speaker: petr_ivashenko
   provider: sunrise
   roundStart: true
+
+- type: ttsVoice
+  id: HearthstoneValiraSangvinar
+  name: tts-voice-name-hearthstone-valira-sangvinar
+  sex: Female
+  speaker: hearthstone_valira_sangvinar
+  provider: sunrise
+  roundStart: true
+
+- type: ttsVoice
+  id: HearthstoneAkama
+  name: tts-voice-name-hearthstone-akama
+  sex: Male
+  speaker: hearthstone_akama
+  provider: sunrise
+  roundStart: true
+
+- type: ttsVoice
+  id: Pathologic2GeorgiyKain
+  name: tts-voice-name-pathologic2-georgiy-kain
+  sex: Male
+  speaker: pathologic2_georgiy_kain
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2ArtemiyBurach
+  name: tts-voice-name-pathologic2-artemiy-burach
+  sex: Male
+  speaker: pathologic2_artemiy_burach
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2Grif
+  name: tts-voice-name-pathologic2-grif
+  sex: Male
+  speaker: pathologic2_grif
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2AnglayaLilich
+  name: tts-voice-name-pathologic2-anglaya-lilich
+  sex: Female
+  speaker: pathologic2_anglaya_lilich_tired
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2AlexanderSaburov
+  name: tts-voice-name-pathologic2-alexander-saburov
+  sex: Male
+  speaker: pathologic2_alexander_saburov
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2Inkvizitor
+  name: tts-voice-name-pathologic2-inkvizitor
+  sex: Female
+  speaker: pathologic2_inkvizitor
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2AlexanderBlok
+  name: tts-voice-name-pathologic2-alexander-blok
+  sex: Male
+  speaker: pathologic2_alexander_blok
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true
+
+- type: ttsVoice
+  id: Pathologic2MarkBessmertnik
+  name: tts-voice-name-pathologic2-mark-bessmertnik
+  sex: Male
+  speaker: pathologic2_mark_bessmertnik
+  provider: sunrise
+  roundStart: true
+  sponsorOnly: true