Merge branch 'master' into hotfixes

AdventureTimeSS14 · Aug 14, 2024 · a8959e1 · a8959e1
2 parents 5fe8b93 + a33eb33
commit a8959e1
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 21 deletions.
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -2170,3 +2170,43 @@ Entries:
       - {message: Добавил кастомизацию Людям, type: Add}
     time: '2024-08-12T22:11:20Z'
     id: 234
+  - author: Котя
+    changes:
+      - {message: 'Добавлена система барков. Вы можете переключить вид сопровождения
+          текста. ТТС - привычная говорилка, Барки - короткие звуки, имитирующие речь.',
+        type: Add}
+    time: '2024-08-13T08:19:59Z'
+    id: 235
+  - author: Котя
+    changes:
+      - {message: Переведены черты персонажа на систему поинтов., type: Add}
+      - {message: Добавлена черты "Ловкий". Она позволяет быстро забираться в шкафы
+          без необходимости открывать их., type: Add}
+      - {message: 'Добавлена черты "Осторожный шаг". Она позволяет не получать урон,
+          проходя по осколкам без обуви.', type: Add}
+      - {message: Добавлена черты "Спринтер". Она слегка увеличивает скорость персонажа.,
+        type: Add}
+      - {message: Добавлена черты "Сильный бросок". Она усиливает броски предметов.,
+        type: Add}
+      - {message: Добавлена черты "Паркурщик". Она позволяет быстро забираться на
+          столы., type: Add}
+    time: '2024-08-13T08:20:42Z'
+    id: 236
+  - author: jungarikjan
+    changes:
+      - {message: Изменил описание трейта "Немецкий акцент" на нормальный, type: Tweak}
+    time: '2024-08-13T12:50:42Z'
+    id: 237
+  - author: FaDeOkno
+    changes:
+      - {message: Новый антагонист - Фантом!, type: Add}
+      - {message: Множество новых способностей Ревенанту!, type: Add}
+      - {message: Новая роль - Полтергейст!, type: Add}
+    time: '2024-08-13T16:14:20Z'
+    id: 238
+  - author: jungarikjan
+    changes:
+      - {message: Исправлены грамматические и орфографические ошибки в правилах.,
+        type: Fix}
+    time: '2024-08-13T18:21:15Z'
+    id: 239
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -230,8 +230,8 @@
     guides:
       - Cyborgs
   - type: StepTriggerImmune
-  - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+  # - type: TTS # Corvax-TTS
+  #   voice: TrainingRobot
 
 - type: entity
   abstract: true

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -274,8 +274,8 @@
     interactFailureString: petting-failure-medical-cyborg
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+  # - type: TTS # Corvax-TTS
+  #   voice: TrainingRobot
 
 - type: entity
   id: BorgChassisService

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -795,8 +795,8 @@
     attributes:
       proper: true
       gender: female
-  - type: TTS # Corvax-TTS
-    voice: Dryad
+  # - type: TTS # Corvax-TTS
+  #   voice: Dryad
 
 - type: entity
   name: Pun Pun

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -120,8 +120,8 @@
   - type: Grammar
     attributes:
       gender: male
-  - type: TTS # Corvax-TTS
-    voice: Rat
+  # - type: TTS # Corvax-TTS
+  #   voice: Rat
 
 - type: entity
   id: MobRatKingBuff

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: basic slime
   id: BaseMobAdultSlimes
   parent: [ SimpleMobBase, MobCombat ]
@@ -147,8 +147,8 @@
   - type: HTN
     rootTask:
       task: SimpleHostileCompound
-  - type: TTS # Corvax-TTS
-    voice: Chen
+  # - type: TTS # Corvax-TTS
+  #   voice: Chen
 
 - type: entity
   name: geras

diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -55,8 +55,8 @@
   - type: Actions
   - type: TypingIndicator
     proto: robot
-  - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+  # - type: TTS # Corvax-TTS
+  #   voice: TrainingRobot
   - type: Speech
     speechVerb: Robotic
     speechSounds: Pai

diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml
@@ -18,8 +18,8 @@
   - type: Muted
   - type: TypingIndicator
     proto: robot
-  - type: TTS # Corvax-TTS
-    voice: Meepo
+  # - type: TTS # Corvax-TTS
+  #   voice: Meepo
   - type: Actions
   - type: MobState
     allowedStates:
@@ -42,5 +42,5 @@
     sprite: Objects/Fun/mrdips.rsi
     layers:
     - state: icon
-  - type: TTS # Corvax-TTS
-    voice: Zibb
+  # - type: TTS # Corvax-TTS
+  #   voice: Zibb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -71,8 +71,8 @@
   - type: Anchorable
   - type: TypingIndicator
     proto: robot
-  - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+  # - type: TTS # Corvax-TTS
+  #   voice: TrainingRobot
   - type: Speech
     speechVerb: Robotic
     speechSounds: Vending

diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -82,8 +82,8 @@
         acts: ["Destruction"]
   - type: Machine
     board: HydroponicsTrayMachineCircuitboard
-  - type: TTS # Corvax-TTS
-    voice: TrainingRobot
+  # - type: TTS # Corvax-TTS
+  #   voice: TrainingRobot
   - type: WiresPanel
   - type: AmbientSound
     volume: -9