Merge remote-tracking branch 'WD-core/master' into upstream-core

2025-02-09 22:43:38 +03:00
parent 806f0c2b9f 0783db970d
commit 8cc9a42ee0
4 changed files with 537 additions and 21 deletions
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,24 +1,4 @@
 Entries:
- author: ThereDrD
-  changes:
-  - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u0441\u0442\u043E\u043B\
-      \u0430, \u043A\u043D\u0438\u0436\u043D\u044B\u0445 \u043F\u043E\u043B\u043E\u043A\
-      \ \u0438 \u0442\u0443\u043C\u0431\u043E\u0447\u043A\u0438"
-    type: Add
-  id: 162
-  time: '2024-02-28T14:00:28.0000000+00:00'
-  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/136
- author: Aviu
-  changes:
-  - message: "\u041F\u0440\u0438 \u043F\u0440\u043E\u043C\u0430\u0445\u0435 \u041B\
-      \u041A\u041C \u0430\u0442\u0430\u043A\u043E\u0439 \u043A\u0443\u043B\u0434\u0430\
-      \u0443\u043D \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0439 \u0430\u0442\
-      \u0430\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u0432\u0434\u0432\u043E\
-      \u0435 \u043C\u0435\u043D\u044C\u0448\u0435."
-    type: Tweak
-  id: 163
-  time: '2024-02-28T14:32:51.0000000+00:00'
-  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/140
 - author: ThereDrD
  changes:
  - message: "\u0424\u0438\u043A\u0441 \u0432\u0430\u0439\u0442\u043B\u0438\u0441\u0442\
@@ -8948,3 +8928,32 @@
  id: 661
  time: '2025-02-09T16:59:35.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/893
+- author: BIG_Zi_348
+  changes:
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043D\
+      \u043E\u043F\u043A\u0430 \u0434\u043E\u043D\u0430\u0442\u0448\u043E\u043F\u0430\
+      \ \u0434\u043B\u044F \u0441\u043B\u0430\u0439\u043C\u043E\u043B\u044E\u0434\u043E\
+      \u0432."
+    type: Fix
+  id: 662
+  time: '2025-02-09T19:10:11.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/895
+- author: Nonne46
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 70 \u043D\u043E\
+      \u0432\u044B\u0445 \u0433\u043E\u043B\u043E\u0441\u043E\u0432! Abaddon, Achemist,\
+      \ Anti-Mage, Arc Warden, Batrider, Bloodseeker, Bounty Hunter, Bristleback,\
+      \ Broodmother, Centaur Warrunner, Clinkz, Clockwerk, Crystal Maiden, Dazzle,\
+      \ Disruptor, Doom, Dragon Knight, Dragon Knight Dragon, Drow Ranger, Earthshaker,\
+      \ Ember Spirit, Enigma, Gyrocopter, Huskar, Invoker, Juggernaut, Keeper Of The\
+      \ Light, Kunkka, Legion Commander, Legion Commander Demon, Lich, Lina, Luna,\
+      \ Lycan, Lycan Wolf, Meepo, Mirana, Monkey King, Monkey King Crown, Necrophos,\
+      \ Nyx Assassin, Omniknight, Outworld Destroyer, Phantom Assassin, Phantom Assassin\
+      \ Arcana, Phantom Lancer, Pudge, Queen Of Pain, Razor, Riki, Rubick, Sand King,\
+      \ Shadow Fiend, Shadow Shaman, Skywrath Mage, Slardar, Slark, Spirit Breaker,\
+      \ Storm Spirit, Sven, Templar Assassin, Tidehunter, Treant Protector, Underlord,\
+      \ Ursa, Windranger, Winter Wyvern, Witch Doctor, Wraith King \u0438 Zeus."
+    type: Add
+  id: 663
+  time: '2025-02-09T19:40:49.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/897
--- a/Resources/Locale/ru-RU/_white/tts/tts-voices2.ftl
+++ b/Resources/Locale/ru-RU/_white/tts/tts-voices2.ftl
@@ -99,3 +99,73 @@ tts-voice-name-brendan = Брендан
 tts-voice-name-nancy-hartley = Нэнси Хартли
 tts-voice-name-oswald-forrest = Освальд Форрест
 tts-voice-name-steve = Стив Санчес
+tts-voice-name-abaddon-dota-2 = Abaddon
+tts-voice-name-alchemist-dota-2 = Achemist
+tts-voice-name-anti-mage-dota-2 = Anti-Mage
+tts-voice-name-arc-warden-dota-2 = Arc Warden
+tts-voice-name-batrider-dota-2 = Batrider
+tts-voice-name-bloodseeker-dota-2 = Bloodseeker
+tts-voice-name-bounty-hunter-dota-2 = Bounty Hunter
+tts-voice-name-bristleback-dota-2 = Bristleback
+tts-voice-name-broodmother-dota-2 = Broodmother
+tts-voice-name-centaur-warrunner-dota-2 = Centaur Warrunner
+tts-voice-name-clinkz-dota-2 = Clinkz
+tts-voice-name-clockwerk-dota-2 = Clockwerk
+tts-voice-name-crystal-maiden-dota-2 = Crystal Maiden
+tts-voice-name-dazzle-dota-2 = Dazzle
+tts-voice-name-disruptor-dota-2 = Disruptor
+tts-voice-name-doom-dota-2 = Doom
+tts-voice-name-dragon-knight-dota-2 = Dragon Knight
+tts-voice-name-dragon-knight-dragon-dota-2 = Dragon Knight Dragon
+tts-voice-name-drow-ranger-dota-2 = Drow Ranger
+tts-voice-name-earthshaker-dota-2 = Earthshaker
+tts-voice-name-ember-spirit-dota-2 = Ember Spirit
+tts-voice-name-enigma-dota-2 = Enigma
+tts-voice-name-gyrocopter-dota-2 = Gyrocopter
+tts-voice-name-huskar-dota-2 = Huskar
+tts-voice-name-invoker-dota-2 = Invoker
+tts-voice-name-juggernaut-dota-2 = Juggernaut
+tts-voice-name-keeper-of-the-light-dota-2 = Keeper Of The Light
+tts-voice-name-kunkka-dota-2 = Kunkka
+tts-voice-name-legion-commander-demon-dota-2 = Legion Commander Demon
+tts-voice-name-legion-commander-dota-2 = Legion Commander
+tts-voice-name-lich-dota-2 = Lich
+tts-voice-name-lina-dota-2 = Lina
+tts-voice-name-luna-dota-2 = Luna
+tts-voice-name-lycan-dota-2 = Lycan
+tts-voice-name-lycan-wolf-dota-2 = Lycan Wolf
+tts-voice-name-meepo-dota-2 = Meepo
+tts-voice-name-mirana-dota-2 = Mirana
+tts-voice-name-monkey-king-crown-dota-2 = Monkey King Crown
+tts-voice-name-monkey-king-dota-2 = Monkey King
+tts-voice-name-necrophos-dota-2 = Necrophos
+tts-voice-name-nyx-assassin-dota-2 = Nyx Assassin
+tts-voice-name-omniknight-dota-2 = Omniknight
+tts-voice-name-outworld-destroyer-dota-2 = Outworld Destroyer
+tts-voice-name-phantom-assassin-arcana-dota-2 = Phantom Assassin Arcana
+tts-voice-name-phantom-assassin-dota-2 = Phantom Assassin
+tts-voice-name-phantom-lancer-dota-2 = Phantom Lancer
+tts-voice-name-pudge-dota-2 = Pudge
+tts-voice-name-queen-of-pain-dota-2 = Queen Of Pain
+tts-voice-name-razor-dota-2 = Razor
+tts-voice-name-riki-dota-2 = Riki
+tts-voice-name-rubick-dota-2 = Rubick
+tts-voice-name-sand-king-dota-2 = Sand King
+tts-voice-name-shadow-fiend-dota-2 = Shadow Fiend
+tts-voice-name-shadow-shaman-dota-2 = Shadow Shaman
+tts-voice-name-skywrath-mage-dota-2 = Skywrath Mage
+tts-voice-name-slardar-dota-2 = Slardar
+tts-voice-name-slark-dota-2 = Slark
+tts-voice-name-spirit-breaker-dota-2 = Spirit Breaker
+tts-voice-name-storm-spirit-dota-2 = Storm Spirit
+tts-voice-name-sven-dota-2 = Sven
+tts-voice-name-templar-assassin-dota-2 = Templar Assassin
+tts-voice-name-tidehunter-dota-2 = Tidehunter
+tts-voice-name-treant-protector-dota-2 = Treant Protector
+tts-voice-name-underlord-dota-2 = Underlord
+tts-voice-name-ursa-dota-2 = Ursa
+tts-voice-name-windranger-dota-2 = Windranger
+tts-voice-name-winter-wyvern-dota-2 = Winter Wyvern
+tts-voice-name-witch-doctor-dota-2 = Witch Doctor
+tts-voice-name-wraith-king-dota-2 = Wraith King
+tts-voice-name-zeus-dota-2 = Zeus
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -34,6 +34,24 @@
        type: HumanoidMarkingModifierBoundUserInterface
      enum.StrippingUiKey.Key:
        type: StrippableBoundUserInterface
+      # WD-EDIT
+      enum.ListViewSelectorUiKeyChangeling.Key:
+        type: ListViewSelectorBui
+      enum.TransformStingSelectorUiKey.Key:
+        type: TransformStingSelectorBui
+      enum.NameSelectorUIKey.Key:
+        type: NameSelectorBUI
+      enum.RuneTeleporterUiKey.Key:
+        type: TeleportRunesListWindowBUI
+      enum.SummonCultistUiKey.Key:
+        type: SummonCultistListWindowBUI
+      enum.CultEmpowerUiKey.Key:
+        type: SpellSelectorBUI
+      enum.CultEmpowerRemoveUiKey.Key:
+        type: SpellRemoverBUI
+      enum.StoreUiKey.Key:
+        type: StoreBoundUserInterface
+      # WD-EDIT END
  # to prevent bag open/honk spam
  - type: UseDelay
    delay: 0.5
--- a/Resources/Prototypes/_White/tts-voices.yml
+++ b/Resources/Prototypes/_White/tts-voices.yml
@@ -853,7 +853,7 @@
  id: DinahHecat

 - type: ttsVoice
-  name: tts-voice-name-aesop-sharp 
+  name: tts-voice-name-aesop-sharp
  sex: Male
  speaker: aesop_sharp
  id: AesopSharp
@@ -954,3 +954,422 @@
  speaker: steve
  id: Steve

+- type: ttsVoice
+  name: tts-voice-name-abaddon-dota-2
+  sex: Male
+  speaker: abaddon_dota_2
+  id: AbaddonDota2
+
+- type: ttsVoice
+  name: tts-voice-name-alchemist-dota-2
+  sex: Male
+  speaker: alchemist_dota_2
+  id: AlchemistDota2
+
+- type: ttsVoice
+  name: tts-voice-name-anti-mage-dota-2
+  sex: Male
+  speaker: anti-mage_dota_2
+  id: Anti-mageDota2
+
+- type: ttsVoice
+  name: tts-voice-name-arc-warden-dota-2
+  sex: Male
+  speaker: arc_warden_dota_2
+  id: ArcWardenDota2
+
+- type: ttsVoice
+  name: tts-voice-name-batrider-dota-2
+  sex: Male
+  speaker: batrider_dota_2
+  id: BatriderDota2
+
+- type: ttsVoice
+  name: tts-voice-name-bloodseeker-dota-2
+  sex: Male
+  speaker: bloodseeker_dota_2
+  id: BloodseekerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-bounty-hunter-dota-2
+  sex: Male
+  speaker: bounty_hunter_dota_2
+  id: BountyHunterDota2
+
+- type: ttsVoice
+  name: tts-voice-name-bristleback-dota-2
+  sex: Male
+  speaker: bristleback_dota_2
+  id: BristlebackDota2
+
+- type: ttsVoice
+  name: tts-voice-name-broodmother-dota-2
+  sex: Female
+  speaker: broodmother_dota_2
+  id: BroodmotherDota2
+
+- type: ttsVoice
+  name: tts-voice-name-centaur-warrunner-dota-2
+  sex: Male
+  speaker: centaur_warrunner_dota_2
+  id: CentaurWarrunnerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-clinkz-dota-2
+  sex: Male
+  speaker: clinkz_dota_2
+  id: ClinkzDota2
+
+- type: ttsVoice
+  name: tts-voice-name-clockwerk-dota-2
+  sex: Male
+  speaker: clockwerk_dota_2
+  id: ClockwerkDota2
+
+- type: ttsVoice
+  name: tts-voice-name-crystal-maiden-dota-2
+  sex: Female
+  speaker: crystal_maiden_dota_2
+  id: CrystalMaidenDota2
+
+- type: ttsVoice
+  name: tts-voice-name-dazzle-dota-2
+  sex: Male
+  speaker: dazzle_dota_2
+  id: DazzleDota2
+
+- type: ttsVoice
+  name: tts-voice-name-disruptor-dota-2
+  sex: Male
+  speaker: disruptor_dota_2
+  id: DisruptorDota2
+
+- type: ttsVoice
+  name: tts-voice-name-doom-dota-2
+  sex: Male
+  speaker: doom_dota_2
+  id: DoomDota2
+
+- type: ttsVoice
+  name: tts-voice-name-dragon-knight-dota-2
+  sex: Male
+  speaker: dragon_knight_dota_2
+  id: DragonKnightDota2
+
+- type: ttsVoice
+  name: tts-voice-name-dragon-knight-dragon-dota-2
+  sex: Male
+  speaker: dragon_knight_dragon_dota_2
+  id: DragonKnightDragonDota2
+
+- type: ttsVoice
+  name: tts-voice-name-drow-ranger-dota-2
+  sex: Female
+  speaker: drow_ranger_dota_2
+  id: DrowRangerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-earthshaker-dota-2
+  sex: Male
+  speaker: earthshaker_dota_2
+  id: EarthshakerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-ember-spirit-dota-2
+  sex: Male
+  speaker: ember_spirit_dota_2
+  id: EmberSpiritDota2
+
+- type: ttsVoice
+  name: tts-voice-name-enigma-dota-2
+  sex: Male
+  speaker: enigma_dota_2
+  id: EnigmaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-gyrocopter-dota-2
+  sex: Male
+  speaker: gyrocopter_dota_2
+  id: GyrocopterDota2
+
+- type: ttsVoice
+  name: tts-voice-name-huskar-dota-2
+  sex: Male
+  speaker: huskar_dota_2
+  id: HuskarDota2
+
+- type: ttsVoice
+  name: tts-voice-name-invoker-dota-2
+  sex: Male
+  speaker: invoker_dota_2
+  id: InvokerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-juggernaut-dota-2
+  sex: Male
+  speaker: juggernaut_dota_2
+  id: JuggernautDota2
+
+- type: ttsVoice
+  name: tts-voice-name-keeper-of-the-light-dota-2
+  sex: Male
+  speaker: keeper_of_the_light_dota_2
+  id: KeeperOfTheLightDota2
+
+- type: ttsVoice
+  name: tts-voice-name-kunkka-dota-2
+  sex: Male
+  speaker: kunkka_dota_2
+  id: KunkkaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-legion-commander-demon-dota-2
+  sex: Female
+  speaker: legion_commander_demon_dota_2
+  id: LegionCommanderDemonDota2
+
+- type: ttsVoice
+  name: tts-voice-name-legion-commander-dota-2
+  sex: Female
+  speaker: legion_commander_dota_2
+  id: LegionCommanderDota2
+
+- type: ttsVoice
+  name: tts-voice-name-lich-dota-2
+  sex: Male
+  speaker: lich_dota_2
+  id: LichDota2
+
+- type: ttsVoice
+  name: tts-voice-name-lina-dota-2
+  sex: Female
+  speaker: lina_dota_2
+  id: LinaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-luna-dota-2
+  sex: Female
+  speaker: luna_dota_2
+  id: LunaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-lycan-dota-2
+  sex: Male
+  speaker: lycan_dota_2
+  id: LycanDota2
+
+- type: ttsVoice
+  name: tts-voice-name-lycan-wolf-dota-2
+  sex: Male
+  speaker: lycan_wolf_dota_2
+  id: LycanWolfDota2
+
+- type: ttsVoice
+  name: tts-voice-name-meepo-dota-2
+  sex: Male
+  speaker: meepo_dota_2
+  id: MeepoDota2
+
+- type: ttsVoice
+  name: tts-voice-name-mirana-dota-2
+  sex: Female
+  speaker: mirana_dota_2
+  id: MiranaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-monkey-king-crown-dota-2
+  sex: Male
+  speaker: monkey_king_crown_dota_2
+  id: MonkeyKingCrownDota2
+
+- type: ttsVoice
+  name: tts-voice-name-monkey-king-dota-2
+  sex: Male
+  speaker: monkey_king_dota_2
+  id: MonkeyKingDota2
+
+- type: ttsVoice
+  name: tts-voice-name-necrophos-dota-2
+  sex: Male
+  speaker: necrophos_dota_2
+  id: NecrophosDota2
+
+- type: ttsVoice
+  name: tts-voice-name-nyx-assassin-dota-2
+  sex: Male
+  speaker: nyx_assassin_dota_2
+  id: NyxAssassinDota2
+
+- type: ttsVoice
+  name: tts-voice-name-omniknight-dota-2
+  sex: Male
+  speaker: omniknight_dota_2
+  id: OmniknightDota2
+
+- type: ttsVoice
+  name: tts-voice-name-outworld-destroyer-dota-2
+  sex: Male
+  speaker: outworld_destroyer_dota_2
+  id: OutworldDestroyerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-phantom-assassin-arcana-dota-2
+  sex: Female
+  speaker: phantom_assassin_arcana_dota_2
+  id: PhantomAssassinArcanaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-phantom-assassin-dota-2
+  sex: Female
+  speaker: phantom_assassin_dota_2
+  id: PhantomAssassinDota2
+
+- type: ttsVoice
+  name: tts-voice-name-phantom-lancer-dota-2
+  sex: Male
+  speaker: phantom_lancer_dota_2
+  id: PhantomLancerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-pudge-dota-2
+  sex: Male
+  speaker: pudge_dota_2
+  id: PudgeDota2
+
+- type: ttsVoice
+  name: tts-voice-name-queen-of-pain-dota-2
+  sex: Female
+  speaker: queen_of_pain_dota_2
+  id: QueenOfPainDota2
+
+- type: ttsVoice
+  name: tts-voice-name-razor-dota-2
+  sex: Male
+  speaker: razor_dota_2
+  id: RazorDota2
+
+- type: ttsVoice
+  name: tts-voice-name-riki-dota-2
+  sex: Male
+  speaker: riki_dota_2
+  id: RikiDota2
+
+- type: ttsVoice
+  name: tts-voice-name-rubick-dota-2
+  sex: Male
+  speaker: rubick_dota_2
+  id: RubickDota2
+
+- type: ttsVoice
+  name: tts-voice-name-sand-king-dota-2
+  sex: Male
+  speaker: sand_king_dota_2
+  id: SandKingDota2
+
+- type: ttsVoice
+  name: tts-voice-name-shadow-fiend-dota-2
+  sex: Male
+  speaker: shadow_fiend_dota_2
+  id: ShadowFiendDota2
+
+- type: ttsVoice
+  name: tts-voice-name-shadow-shaman-dota-2
+  sex: Male
+  speaker: shadow_shaman_dota_2
+  id: ShadowShamanDota2
+
+- type: ttsVoice
+  name: tts-voice-name-skywrath-mage-dota-2
+  sex: Male
+  speaker: skywrath_mage_dota_2
+  id: SkywrathMageDota2
+
+- type: ttsVoice
+  name: tts-voice-name-slardar-dota-2
+  sex: Male
+  speaker: slardar_dota_2
+  id: SlardarDota2
+
+- type: ttsVoice
+  name: tts-voice-name-slark-dota-2
+  sex: Male
+  speaker: slark_dota_2
+  id: SlarkDota2
+
+- type: ttsVoice
+  name: tts-voice-name-spirit-breaker-dota-2
+  sex: Male
+  speaker: spirit_breaker_dota_2
+  id: SpiritBreakerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-storm-spirit-dota-2
+  sex: Male
+  speaker: storm_spirit_dota_2
+  id: StormSpiritDota2
+
+- type: ttsVoice
+  name: tts-voice-name-sven-dota-2
+  sex: Male
+  speaker: sven_dota_2
+  id: SvenDota2
+
+- type: ttsVoice
+  name: tts-voice-name-templar-assassin-dota-2
+  sex: Female
+  speaker: templar_assassin_dota_2
+  id: TemplarAssassinDota2
+
+- type: ttsVoice
+  name: tts-voice-name-tidehunter-dota-2
+  sex: Male
+  speaker: tidehunter_dota_2
+  id: TidehunterDota2
+
+- type: ttsVoice
+  name: tts-voice-name-treant-protector-dota-2
+  sex: Male
+  speaker: treant_protector_dota_2
+  id: TreantProtectorDota2
+
+- type: ttsVoice
+  name: tts-voice-name-underlord-dota-2
+  sex: Male
+  speaker: underlord_dota_2
+  id: UnderlordDota2
+
+- type: ttsVoice
+  name: tts-voice-name-ursa-dota-2
+  sex: Male
+  speaker: ursa_dota_2
+  id: UrsaDota2
+
+- type: ttsVoice
+  name: tts-voice-name-windranger-dota-2
+  sex: Female
+  speaker: windranger_dota_2
+  id: WindrangerDota2
+
+- type: ttsVoice
+  name: tts-voice-name-winter-wyvern-dota-2
+  sex: Female
+  speaker: winter_wyvern_dota_2
+  id: WinterWyvernDota2
+
+- type: ttsVoice
+  name: tts-voice-name-witch-doctor-dota-2
+  sex: Male
+  speaker: witch_doctor_dota_2
+  id: WitchDoctorDota2
+
+- type: ttsVoice
+  name: tts-voice-name-wraith-king-dota-2
+  sex: Male
+  speaker: wraith_king_dota_2
+  id: WraithKingDota2
+
+- type: ttsVoice
+  name: tts-voice-name-zeus-dota-2
+  sex: Male
+  speaker: zeus_dota_2
+  id: ZeusDota2