Merge branch 'ADTMakiCoat' of https://github.com/Inconnu1337/space_st…

…ation_ADT into ADTMakiCoat
AdventureTimeSS14 · Sep 8, 2024 · 5b1446c · 5b1446c
2 parents a65efee + 1370bc8
commit 5b1446c
Show file tree

Hide file tree

Showing 39 changed files with 951 additions and 382 deletions.
diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
@@ -277,11 +277,23 @@ private void SendAdminChat(ICommonSession player, string message)
             _adminLogger.Add(LogType.Chat, LogImpact.Extreme, $"{player:Player} attempted to send admin message but was not admin");
             return;
         }
+        // Start-ADT Schrodinger Tweak: Отсюда сможем получить инфу о префиксе админа
+        var senderAdmin = _adminManager.GetAdminData(player);
+        if (senderAdmin == null)
+        {
+            return;
+        }
+        var senderName = player.Name;  // Добавил переменную senderName, в ней содержиться player.Name и приставляем префикс к имени
+        if (!string.IsNullOrEmpty(senderAdmin.Title))
+        {
+            senderName += $"\\[{senderAdmin.Title}\\]";
+        }
+        // End-ADT Tweak
 
         var clients = _adminManager.ActiveAdmins.Select(p => p.Channel);
         var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message",
                                         ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
-                                        ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
+                                        ("playerName", senderName), ("message", FormattedMessage.EscapeText(message))); // ADT Tweak тут заменил player.Name на senderName
 
         foreach (var client in clients)
         {

diff --git a/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs b/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs
@@ -16,6 +16,9 @@ public sealed class TTSVoicePrototype : IPrototype
     [DataField("name")]
     public string Name { get; } = string.Empty;
 
+    [DataField("description")]
+    public string Description { get; } = string.Empty;
+
     [DataField("sex", required: true)]
     public Sex Sex { get; } = default!;
 

diff --git a/Resources/Changelog/1ChangelogADT.yml b/Resources/Changelog/1ChangelogADT.yml
@@ -2813,3 +2813,37 @@ Entries:
       - {message: Подтянуты коммиты с корвакса 06.09.2024, type: Add}
     time: '2024-09-06T23:18:41Z'
     id: 327
+  - author: Inconnu
+    changes:
+      - {message: 'Добавлено Хачапуре, рецепт приготовления и перевод.', type: Add}
+    time: '2024-09-07T00:22:04Z'
+    id: 328
+  - author: Friskis
+    changes:
+      - {message: 'Благодаря стараниям флота, значительное количество космического
+          мусора было уничтожено', type: Fix}
+      - {message: Хотфикс игры за ИИ от Коти, type: Fix}
+      - {message: Добавлены роли СБ борга на карты, type: Add}
+    time: '2024-09-07T06:56:16Z'
+    id: 329
+  - author: Шрёдька
+    changes:
+      - {message: Админ префикс для админ-чата починен., type: Fix}
+    time: '2024-09-07T09:23:21Z'
+    id: 330
+  - author: KashRas2
+    changes:
+      - {message: Теперь в Керфуса можно класть разные вещи. Готовьте своих робо-котиков
+          к работе официантом., type: Tweak}
+      - {message: Роботехнический отдел обучили настройке медицинских модулей для
+          Керфуса., type: Tweak}
+      - {message: Керфуса теперь точно можно собрать., type: Fix}
+    time: '2024-09-07T11:54:08Z'
+    id: 331
+  - author: KashRas2
+    changes:
+      - {message: Добавлен модуль с экспериментальным РРТ для боргов., type: Add}
+      - {message: 'В связи с добавлением нового модуля, цена технологии увеличена
+          с 10000 до 10500', type: Tweak}
+    time: '2024-09-07T14:14:07Z'
+    id: 332
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_modules.ftl
@@ -1,6 +1,8 @@
 ent-ADTBorgModuleDetention = модуль задержания
-    .desc = сожержит вспышку, кабельные стяжки и телескопическую дубинку.
+    .desc = { ent-BaseBorgModule.desc }
 ent-ADTBorgModuleHarm = модуль вреда
-    .desc = сожержит самозарядную лазерную винтовку и дубину для нанесения тяжких телесных повреждений.
+    .desc = { ent-BaseBorgModule.desc }
 ent-ADTBorgModuleDisabler = модуль дизаблера
-    .desc = сожержит дизаблер и кабельные стяжки.
+    .desc = { ent-BaseBorgModule.desc }
+ent-ADTBorgModuleRPD = РРТ-модуль киборга
+    .desc = { ent-BaseBorgModule.desc }
diff --git a/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl b/Resources/Locale/ru-RU/ADT/Objects/Specific/Robotics/borg_parts.ftl
@@ -4,5 +4,5 @@ ent-ADTLeftLegBorgSecurity = левая нога киборга-офицера
 ent-ADTRightLegBorgSecurity = правая нога киборга-офицера
 ent-ADTHeadBorgSecurity = голова киборга-офицера
 ent-ADTTorsoBorgSecurity = туловище киборга-офицера
-ent-ADTTorsoBorgKerfusNT = голова керфуса
-ent-ADTHeadBorgKerfusNT = туловище керфуса
+ent-ADTTorsoBorgKerfusNT = туловище керфуса
+ent-ADTHeadBorgKerfusNT = голова керфуса
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/silicon.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/silicon.ftl
@@ -0,0 +1,3 @@
+ent-ADTPlayerBorgKerfusNT = { ent-ADTBorgChassisKerfusNT }
+    .desc = { ent-ADTBorgChassisKerfusNT.desc }
+    .suffix = Батарея, инструменты
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/tools.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/tools.ftl
@@ -5,3 +5,6 @@ ent-ADTRPDAmmo = консервированная материя
 ent-ADTRPDEmpty = { ent-ADTRPD }
     .desc = { ent-ADTRPD.desc }
     .suffix = Пустой
+ent-ADTRPDRecharging = экспериментальный РРТ
+    .desc = Блюспейс-улучшенный РРТ, пассивно регенерирующий заряды.
+    .suffix = Автозарядка
diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml b/Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml
@@ -5083,8 +5083,6 @@ entities:
       pos: 64.5,-23.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 7833
       - 7834
@@ -5124,8 +5122,6 @@ entities:
       pos: 68.5,-19.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 496
       - 7833
@@ -5150,8 +5146,6 @@ entities:
       pos: 63.5,-9.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 7835
       - 7840
@@ -5756,8 +5750,6 @@ entities:
       pos: 14.5,46.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 7968
       - 7965
@@ -5960,8 +5952,6 @@ entities:
       pos: 44.5,-9.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 445
       - 8018
@@ -6278,8 +6268,6 @@ entities:
       pos: 59.5,28.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 8141
       - 8142
@@ -7522,7 +7510,7 @@ entities:
       pos: 70.5,-27.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -5933.1836
+      secondsUntilStateChange: -6152.204
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -7595,7 +7583,7 @@ entities:
       pos: 84.5,57.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -16036.741
+      secondsUntilStateChange: -16255.762
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -8049,7 +8037,7 @@ entities:
       pos: 43.5,33.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -13371.057
+      secondsUntilStateChange: -13590.077
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -48170,8 +48158,6 @@ entities:
       pos: 58.5,33.5
       parent: 2
     - type: DeviceList
-      # configurators:
-      # - invalid
       devices:
       - 8076
       - 8075
@@ -48394,7 +48380,7 @@ entities:
       - 7710
       - 80
     - type: Door
-      secondsUntilStateChange: -38988.836
+      secondsUntilStateChange: -39207.855
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 85100.4006158
@@ -48418,7 +48404,7 @@ entities:
       - 81
       - 7711
     - type: Door
-      secondsUntilStateChange: -39387.836
+      secondsUntilStateChange: -39606.855
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 86093.4281942
@@ -49127,7 +49113,7 @@ entities:
       pos: 66.5,-1.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -37754.125
+      secondsUntilStateChange: -37973.145
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -49592,7 +49578,7 @@ entities:
       pos: 82.5,45.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -39477.895
+      secondsUntilStateChange: -39696.914
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -50425,7 +50411,7 @@ entities:
       pos: 21.5,23.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -24403.965
+      secondsUntilStateChange: -24622.986
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -50507,7 +50493,7 @@ entities:
       pos: 16.5,5.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -24748.535
+      secondsUntilStateChange: -24967.557
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -50587,7 +50573,7 @@ entities:
       pos: 32.5,-2.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -37389.953
+      secondsUntilStateChange: -37608.973
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -51224,7 +51210,7 @@ entities:
       pos: 58.5,23.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -14234.729
+      secondsUntilStateChange: -14453.749
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -51336,7 +51322,7 @@ entities:
       pos: 82.5,62.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -15811.47
+      secondsUntilStateChange: -16030.49
       state: Closing
   - uid: 8082
     components:
@@ -51459,7 +51445,7 @@ entities:
       pos: 64.5,36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -26385.248
+      secondsUntilStateChange: -26604.27
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -51909,7 +51895,7 @@ entities:
       pos: 40.5,73.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -30458.215
+      secondsUntilStateChange: -30677.236
       state: Closing
     - type: Firelock
       emergencyCloseCooldown: 82208.0035082
@@ -96811,6 +96797,13 @@ entities:
     - type: Transform
       pos: 74.5,38.5
       parent: 2
+- proto: SpawnPointADTSecborg
+  entities:
+  - uid: 18126
+    components:
+    - type: Transform
+      pos: 36.5,55.5
+      parent: 2
 - proto: SpawnPointAtmos
   entities:
   - uid: 14901

diff --git a/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml b/Resources/Maps/ADTMaps/ADTStations/adt_astra.yml
@@ -115283,7 +115283,7 @@ entities:
       pos: 29.5,-30.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -1696.3945
+      secondsUntilStateChange: -1728.3838
       state: Closing
   - uid: 17086
     components:
@@ -181870,43 +181870,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -64.73485,-33.68395
       parent: 2
-- proto: RiotBulletShield
-  entities:
-  - uid: 26828
-    components:
-    - type: Transform
-      pos: 65.3617,-4.430693
-      parent: 2
-  - uid: 26829
-    components:
-    - type: Transform
-      pos: 65.68115,-4.421434
-      parent: 2
-  - uid: 26830
-    components:
-    - type: Transform
-      pos: 65.500595,-4.6019893
-      parent: 2
-  - uid: 26831
-    components:
-    - type: Transform
-      pos: 45.59504,7.4947042
-      parent: 2
-  - uid: 26832
-    components:
-    - type: Transform
-      pos: 45.25129,7.4790792
-      parent: 2
-  - uid: 26833
-    components:
-    - type: Transform
-      pos: 45.43879,7.3697042
-      parent: 2
-  - uid: 37166
-    components:
-    - type: Transform
-      pos: 6.4677124,-10.531189
-      parent: 36616
 - proto: RiotLaserShield
   entities:
   - uid: 14335
@@ -188608,6 +188571,13 @@ entities:
     - type: Transform
       pos: -55.5,-37.5
       parent: 2
+- proto: SpawnPointADTSecborg
+  entities:
+  - uid: 26828
+    components:
+    - type: Transform
+      pos: 56.5,-3.5
+      parent: 2
 - proto: SpawnPointAtmos
   entities:
   - uid: 27779