diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index 8dc131d664e..5640e53d8dc 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -438,9 +438,11 @@ public void ShowRoundEndScoreboard(string text = "") PlayerICName = playerIcName, PlayerGuid = userId, PlayerNetEntity = GetNetEntity(entity), - Role = antag - ? roles.First(role => role.Antagonist).Name - : roles.FirstOrDefault().Name ?? Loc.GetString("game-ticker-unknown-role"), + Role = roles.Any() + ? (antag + ? roles.FirstOrDefault(role => role.Antagonist).Name + : roles.FirstOrDefault(role => !role.Antagonist).Name) ?? Loc.GetString("game-ticker-unknown-role") + : Loc.GetString("game-ticker-unknown-role"), Antag = antag, JobPrototypes = roles.Where(role => !role.Antagonist).Select(role => role.Prototype).ToArray(), AntagPrototypes = roles.Where(role => role.Antagonist).Select(role => role.Prototype).ToArray(), diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 4dc22a79f85..a7dc9df8ee3 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -4728,3 +4728,74 @@ id: 337 time: '2024-10-12T16:59:55.0000000+00:00' url: https://github.com/space-sunrise/space-station-14/pull/500 +- author: rhailrake + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0448\ + \u0438\u0431\u043A\u0430 \u0441 \u043A\u043E\u043D\u0446\u043E\u043C \u0440\u0430\ + \u0443\u043D\u0434\u0430." + type: Fix + id: 338 + time: '2024-10-14T19:35:01.0000000+00:00' + url: https://github.com/space-sunrise/space-station-14/pull/511 +- author: SplikZerys + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0447\u0435\u0442\u044B\u0440\ + \u0435 (4) \u043D\u043E\u0432\u044B\u0445 \u0422\u0422\u0421-\u0433\u043E\u043B\ + \u043E\u0441\u0430 \u0438\u0437 Hearthstone: \u0417\u0432\u0435\u0440\u043E\u043B\ + \u043E\u0432 \u0422\u0430\u0432\u0438\u0448, \u042D\u043B\u0438\u0437\u0430\ + , \u0421\u043E\u0442\u0438\u0441 \u0438 \u041C\u0435\u0434\u0438\u0432." + type: Add + id: 339 + time: '2024-10-15T19:38:09.377132+00:00' +- author: SplikZerys + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0433\u043E\u043B\u043E\u0441\ + \u0430 MTF \u0438\u0437 Containment Breach." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0433\u043E\u043B\u043E\u0441\ + \ \u0410\u043B\u0451\u0448\u0438 \u041F\u043E\u043F\u043E\u0432\u0438\u0447\u0430\ + \ \u0438\u0437 \u0422\u0440\u0435\u0445 \u0411\u043E\u0433\u0430\u0442\u044B\ + \u0440\u0435\u0439." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0433\u043E\u043B\u043E\u0441\ + \ \u041F\u0451\u0442\u0440\u0430 \u0418\u0432\u0430\u0449\u0435\u043D\u043A\u043E\ + \ - \u0410\u043A\u0442\u0435\u0440\u0430 \u043E\u0437\u0432\u0443\u0447\u043A\ + \u0438." + type: Add + id: 340 + time: '2024-10-15T00:14:13.974301+00:00' +- author: kanopus7 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0446\u0432\u0435\ + \u0442 \u0433\u0440\u0430\u043D\u0438\u0446 \u041A\u041F\u041A \u0430\u0434\u044A\ + \u044E\u0442\u0430\u043D\u0442\u0430." + type: Fix + - message: "\u0421\u043E\u043B\u043D\u0446\u0435\u0437\u0430\u0449\u0438\u0442\u043D\ + \u044B\u0435 \u043E\u0447\u043A\u0438 \u0430\u0434\u044A\u044E\u0442\u0430\u043D\ + \u0442\u0430 \u0437\u0430\u043C\u0435\u043D\u0435\u043D\u044B \u043D\u0430 \u0430\ + \u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\ + \u044B\u0435 \u043E\u0447\u043A\u0438." + type: Tweak + 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/station-goal/station-goal-component.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/station-goal/station-goal-component.ftl index e0c810586d1..37a4fc38b2d 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/station-goal/station-goal-component.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/station-goal/station-goal-component.ftl @@ -386,7 +386,7 @@ station-goal-nuke-room = ⠀============================================= ⠀Приветствую, уважаемое командование станции! ⠀ Поздравляем, цель вашей смены является [bold]ПОСТРОЙКА НОВОГО ЯДЕРНОГО ХРАНИЛИЩА[/bold] - ⠀Чтобы её выполнить инженерному отделу ставится задача построить с нуля ядерное хранилище вблизи мостика командования, размером 5 на 5. Разрешаем вам снести даже лишнюю помещение, которое не обладает стратегической важностью, дабы построить новое хранилище. + ⠀Чтобы её выполнить инженерному отделу ставится задача построить с нуля ядерное хранилище вблизи мостика командования, размером 5 на 5. Разрешаем вам снести даже лишнее помещение, которое не обладает стратегической важностью, дабы построить новое хранилище. ⠀Новое Ядерное Хранилище должно иметь обшивку из двух слоёв укреплённых стен, а также инженеры должны провести туда электропитание, атмосферные трубы и обеспечить атмос. ⠀После отстройки нового хранилища - вы обязаны также добавить туда два шлюза с доступом командования и перекрасить его в цвет командного шлюза. А также поставить гермозатворы с удалённым доступом, кнопка от них должна находиться в каюте капитана. ⠀Отделу Снабжения ставится задача заказать все требующиеся ресурсы для выполнения поставленной цели. 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 index e2170a9376a..d22aba9b903 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/tts/tts-voices-sunrise.ftl @@ -28,8 +28,24 @@ tts-voice-name-dota2-silencer = (NEW) [Dota 2] Сайленсер tts-voice-name-hearthstone-warden = (NEW) [Hearthstone] Смотритель tts-voice-name-cb-announcer = (NEW) [Containment Breach] Announcer tts-voice-name-hearthstone-lord-of-thunder = (NEW) [Hearthstone] Владыка Грома -tts-voice-name-hearthstone-ahun = (NEW) [Hearthstone] Ахун tts-voice-name-hearthstone-tekahn = (NEW) [Hearthstone] Текан tts-voice-name-hearthstone-finli = (NEW) [Hearthstone] Финли tts-voice-name-hearthstone-brann = (NEW) [Hearthstone] Бранн tts-voice-name-hearthstone-reno = (NEW) [Hearthstone] Рено +tts-voice-name-hearthstone-zverolov-tavish = (NEW) [Hearthstone] Зверолов Тавиш +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-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/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index ac49a8b3bb7..566e3da93ee 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -224,8 +224,8 @@ id: AdjutantIDCard state: pda-adj - type: PdaBorderColor - borderColor: "#A32D26" - accentVColor: "#DFDFDF" + borderColor: "#1b2426" + accentVColor: "#62584a" - type: Icon sprite: _Sunrise/Objects/Devices/pda.rsi state: pda-adj diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Adjutant/adjutant.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Adjutant/adjutant.yml index 89a0f3ace5f..992a4335f94 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Adjutant/adjutant.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Adjutant/adjutant.yml @@ -41,7 +41,7 @@ id: AdjutantGear equipment: shoes: ClothingShoesBootsLaceup - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesCommand id: AdjutantPDA ears: ClothingHeadsetAdjutant neck: ClothingNeckMantleAdjutant diff --git a/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml b/Resources/Prototypes/_Sunrise/tts_voices_sunrise.yml index c6362f4c2d5..b1f64262839 100644 --- 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 @@ -268,14 +269,6 @@ speaker: hearthstone_tekahn provider: sunrise -- type: ttsVoice - id: HearthstoneAhun - name: tts-voice-name-hearthstone-ahun - sex: Male - speaker: hearthstone_ahun - provider: sunrise - roundStart: false # ужасное качество - - type: ttsVoice id: HearthstoneFinli name: tts-voice-name-hearthstone-finli @@ -297,3 +290,142 @@ speaker: hearthstone_reno provider: sunrise +- type: ttsVoice + id: HearthstoneZverolovTavish + name: tts-voice-name-hearthstone-zverolov-tavish + sex: Male + speaker: hearthstone_zverolov_tavish + provider: sunrise + +- type: ttsVoice + id: HearthstoneElisa + name: tts-voice-name-hearthstone-elisa + sex: Female + speaker: hearthstone_elisa + provider: sunrise + +- type: ttsVoice + id: HearthstoneSotis + name: tts-voice-name-hearthstone-sotis + sex: Male + speaker: hearthstone_sotis + provider: sunrise + +- type: ttsVoice + id: HearthstoneMediv + name: tts-voice-name-hearthstone-mediv + sex: Male + speaker: hearthstone_mediv + provider: sunrise + +- type: ttsVoice + id: CBMTF1 + name: tts-voice-name-mtf1 + sex: Male + speaker: mtf_1 + provider: sunrise + roundStart: false # точно нет + +- type: ttsVoice + id: ThreeBigatiraAleshaPopovich + name: tts-voice-name-three-bogatira-alesha-popovich + sex: Male + speaker: three_bogatira_alesha + provider: sunrise + roundStart: true + +- type: ttsVoice + id: PetrGlanceIvashenko + name: tts-voice-name-petr_glance_ivashenko + sex: Male + 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