Merge branch 'master' into Syndies-stuff

Lost-Paradise-Project · Nov 1, 2024 · 4469e38 · 4469e38
2 parents d6f03fd + 0394782
commit 4469e38
Show file tree

Hide file tree

Showing 77 changed files with 565,089 additions and 37 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1 @@
-**/_LostParadise @Flybik @Evgencheg
-* @BL02DL
+* @BL02DL @Flybik @Evgencheg
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -67,6 +67,10 @@ public sealed class PostMapInitTest
             "LPPNormandy", //LPP
             "LPPPebble", //LPP
             "LPPSubmarine", //LPP
+            "H_LPPKerberos", //LPP
+            "H_LPPAsterisk", //LPP
+            "H_LPPNormandy", //LPP
+            "H_LPPPebble", //LPP
             "Gax",
             "Rad"
         };

diff --git a/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs b/Content.Server/Supermatter/Systems/SupermatterSystem.Processing.cs
@@ -6,11 +6,16 @@
 using System.Linq;
 using Content.Shared.Audio;
 using Content.Shared.CCVar;
+using Content.Shared.Radio;
+using Content.Server.Radio.EntitySystems;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Supermatter.Systems;
 
 public sealed partial class SupermatterSystem
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly RadioSystem _radioSystem = default!;
     /// <summary>
     ///     Handle power and radiation output depending on atmospheric things.
     /// </summary>
@@ -293,6 +298,17 @@ private void AnnounceCoreDamage(EntityUid uid, SupermatterComponent sm)
         SendSupermatterAnnouncement(uid, message, global);
     }
 
+    private void Report(EntityUid source, string channelName, string messageKey, params (string, object)[] args)
+    {
+        var message = args.Length == 0 ? Loc.GetString(messageKey) : Loc.GetString(messageKey, args);
+
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        var radioChannel = _prototypeManager.Index<RadioChannelPrototype>(channelName);
+        _radioSystem.SendRadioMessage(source, message, radioChannel, source);
+    }
+
     /// <param name="global">If true, sends a station announcement</param>
     /// <param name="customSender">Localisation string for a custom announcer name</param>
     public void SendSupermatterAnnouncement(EntityUid uid, string message, bool global = false, string? customSender = null)
@@ -305,6 +321,11 @@ public void SendSupermatterAnnouncement(EntityUid uid, string message, bool glob
         }
 
         _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, hideChat: false, checkRadioPrefix: true);
+
+        if (!string.IsNullOrWhiteSpace(message))
+        {
+            Report(uid, "Engineering", message);
+        }
     }
 
     /// <summary>

diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
@@ -2376,3 +2376,153 @@
   id: 131
   time: '2024-10-25T18:15:03.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/303
+- author: NeLepus
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u0430\u0440\
+      \u0443\u043A\u0430\u0432\u043D\u044B\u0435 \u043F\u043E\u0432\u044F\u0437\u043A\
+      \u0438 \u0434\u043B\u044F \u043E\u0442\u0440\u044F\u0434\u043E\u0432 \u0441\u043B\
+      \u0443\u0436\u0431\u044B \u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\
+      \u0441\u0442\u0438."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043A\u043E\u0440\
+      \u043E\u0431\u043A\u0430 \u043D\u0430\u0440\u0443\u043A\u0430\u0432\u043D\u044B\
+      \u0445 \u043F\u043E\u0432\u044F\u0437\u043E\u043A \u0432 \u0448\u043A\u0430\u0444\
+      \ \u0433\u043B\u0430\u0432\u044B \u0441\u043B\u0443\u0436\u0431\u044B \u0431\
+      \u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\u0441\u0442\u0438."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0435\u0446\
+      \u0435\u043F\u0442\u044B \u043F\u043E\u0432\u044F\u0437\u043E\u043A \u0432 \u043F\
+      \u0440\u0438\u043D\u0442\u0435\u0440 \u0443\u043D\u0438\u0444\u043E\u0440\u043C\
+      \u044B \u0433\u043B\u0430\u0432\u044B \u043F\u0435\u0440\u0441\u043E\u043D\u0430\
+      \u043B\u0430."
+    type: Add
+  id: 132
+  time: '2024-10-27T18:24:46.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/304
+- author: PowerKAT1
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0425\u044D\u043B\
+      \u043B\u043E\u0443\u0438\u043D\u0441\u043A\u0438\u0435 \u043A\u0430\u0440\u0442\
+      \u044B"
+    type: Add
+  - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\
+      \u0435!"
+    type: Remove
+  id: 133
+  time: '2024-10-28T10:52:49.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/306
+- author: BL02DL
+  changes:
+  - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\
+      \u0435!"
+    type: Remove
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0442\u0440\
+      \u0430\u0448\u0438\u043B\u043A\u0438!"
+    type: Add
+  id: 134
+  time: '2024-10-28T14:57:15.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/308
+- author: MrDarkSide
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0437\u0430\u0434\u0435\
+      \u0440\u0436\u043A\u0430 \u043F\u0435\u0440\u0435\u0434 \u0438\u0441\u0447\u0435\
+      \u0437\u043D\u043E\u0432\u0435\u043D\u0438\u0435\u043C \u0443 \u0433\u043E\u043B\
+      \u043E\u0431\u0430\u0440\u044C\u0435\u0440\u0430 \u0421\u0411 \u0441 180 \u0441\
+      \u0435\u043A. \u0434\u043E 600 \u0441\u0435\u043A."
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u043A\u043E\u043B\
+      -\u0432\u043E \u0443\u0440\u043E\u043D\u0430 \u043A\u043E\u0442\u043E\u0440\u044B\
+      \u0435 \u043B\u0435\u0447\u0430\u0442 \u043F\u0440\u043E\u0432\u043E\u0434\u0430\
+      \ \u0434\u043B\u044F \u041A\u041F\u0411. \u0421 -1.66 \u0434\u043E -3.50."
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0437\u0430\u0434\u0435\
+      \u0440\u0436\u043A\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\
+      \u0430\u043D\u0438\u044F \u043F\u0440\u043E\u0432\u043E\u0434\u043E\u0432 \u043D\
+      \u0430 \u041A\u041F\u0411 \u0441 0.6 \u0434\u043E 0.7"
+    type: Tweak
+  id: 135
+  time: '2024-10-31T23:53:33.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/309
+- author: Farrellka
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0433\u0430\u0437\u043E\
+      \u0430\u043D\u0430\u043B\u0438\u0437\u0430\u0442\u043E\u0440 \u0432 \u041A\u041F\
+      \u041A \u0432\u0441\u0435\u043C \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u0430\
+      \u043C!"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\
+      \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0421\u0443\u043F\u0435\u0440\
+      \u043C\u0430\u0442\u0435\u0440\u0438\u0438 \u0433\u043E\u0432\u043E\u0440\u0438\
+      \u0442\u044C \u0432 \u0440\u0430\u0446\u0438\u044E \u0418\u043D\u0436\u0435\u043D\
+      \u0435\u0440\u0430\u043C \u043E \u0435\u0451 \u043D\u0435\u0441\u0442\u0430\u0431\
+      \u0438\u043B\u044C\u043D\u043E\u0441\u0442\u0438!"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u0430\u0433\
+      \u043D\u0438\u0442\u0431\u0443\u0442\u0441\u044B \u0432 \u0448\u043A\u0430\u0444\
+      \u044B \u0430\u0442\u043C\u043E\u0441\u0430\u043C."
+    type: Add
+  - message: "\u0412 \u043B\u043E\u0434\u0430\u0443\u0442 \u0421\u0418 \u0434\u043E\
+      \u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0435\u0433\u043E \u043E\u0434\u0435\
+      \u0436\u0434\u0430, \u0430 \u0442\u0430\u043A \u0436\u0435 \u043A\u0430\u0441\
+      \u043A\u0438."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u043E\u0435\u0432\
+      \u043E\u0439 \u0433\u0438\u043F\u043E \u0432 \u0448\u043A\u0430\u0444 \u041F\
+      \u043E\u043B\u0435\u0432\u043E\u0433\u043E \u0412\u0440\u0430\u0447\u0430!"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0431\u043E\u0435\u0432\
+      \u043E\u0439 \u0433\u0438\u043F\u043E \u0437\u0430 4 \u043E\u0447\u043A\u0430\
+      , \u0430 \u0442\u0430\u043A \u0436\u0435 \u0431\u043E\u0435\u0432\u0430\u044F\
+      \ \u0430\u043F\u0442\u0435\u0447\u043A\u0430 \u0437\u0430 2 \u043E\u0447\u043A\
+      \u0430 \u0432 \u043B\u043E\u0434\u0430\u0443\u0442 \u041E\u0444\u0438\u0446\u0435\
+      \u0440\u0430 \"\u0421\u0438\u043D\u0438\u0439 \u0429\u0438\u0442\"!"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0442\u0440\u0443\
+      \u0441\u0438\u043A\u0438 \u0433\u043B\u0430\u0432\u0430\u043C \u043E\u0442\u0434\
+      \u0435\u043B\u043E\u0432 \u0432 \u0438\u0445 \u0448\u043A\u0430\u0444\u0447\u0438\
+      \u043A\u0438, \u0430 \u0442\u0430\u043A \u0436\u0435 \u0440\u0443\u0447\u043A\
+      \u0438 \u0432 \u0438\u0445 \u041A\u041F\u041A!"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043A\u0430\u0444\
+      \u0430\u043D\u0434\u0440\u044B \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043E\
+      \u0432. \u0422\u0435\u043F\u0435\u0440\u044C \u0438\u0445 \u0448\u043B\u0435\
+      \u043C\u0430 \u0437\u0430\u0449\u0438\u0449\u0430\u044E\u0442 \u043E\u0442 \u0441\
+      \u0432\u0430\u0440\u043A\u0438."
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u043F\u0435\u0440\u043A\
+      \ \"\u0411\u0438\u043E\u043D\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u0440\
+      \u0443\u043A\u0430\". \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u0430\
+      \ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u043A\u0430\u043A \u043B\
+      \u043E\u043C, \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u044F \u0442\u043E\u043B\
+      \u044C\u043A\u043E \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u043D\u044B\
+      \u0435 \u0448\u043B\u044E\u0437\u044B. \u0422\u0430\u043A \u0436\u0435 \u0441\
+      \u0442\u043E\u0438\u043C\u043E\u0441\u0442\u044C \u0443\u043C\u0435\u043D\u044C\
+      \u0448\u0435\u043D\u0430 \u0441 9 \u0434\u043E 4."
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0433\u0430\u0440\u043D\
+      \u0438\u0442\u0443\u0440\u044B \u0413\u043B\u0430\u0432\u044B \u041F\u0435\u0440\
+      \u0441\u043E\u043D\u0430\u043B\u0430. \u0422\u0435\u043F\u0435\u0440\u044C \u043E\
+      \u043D\u0438 \u0438\u043C\u0435\u044E\u0442 \u0432\u0441\u0435 \u043A\u043B\u044E\
+      \u0447\u0438 \u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u044F, \u043A\
+      \u0430\u043A \u044D\u0442\u043E \u0431\u044B\u043B\u043E \u0440\u0430\u043D\u044C\
+      \u0448\u0435."
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u041A\u041F\
+      \u041A \u041F\u043E\u043B\u0435\u0432\u043E\u0433\u043E \u0418\u043D\u0436\u0435\
+      \u043D\u0435\u0440\u0430 \u0438 \u041F\u0438\u043B\u043E\u0442\u0430 \u0421\u0411\
+      ! \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u0438 \u0438\u043C\u0435\
+      \u044E\u0442 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B \u0421\u043B\
+      \u0443\u0436\u0431\u044B \u0411\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E\
+      \u0441\u0442\u0438."
+    type: Fix
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043B\u043E\u0434\
+      \u0430\u0443\u0442 \u041E\u0444\u0438\u0446\u0435\u0440\u0430 \"\u0421\u0438\
+      \u043D\u0438\u0439 \u0429\u0438\u0442\". \u0422\u0435\u043F\u0435\u0440\u044C\
+      \ \u043C\u043E\u0436\u043D\u043E \u0432\u044B\u0431\u0440\u0430\u0442\u044C\
+      \ \u043B\u0438\u0448\u044C \u043E\u0434\u0438\u043D \u043F\u0438\u0441\u0442\
+      \u043E\u043B\u0435\u0442 .45 \u0438 \u043E\u0431\u043E\u0439\u043C\u0443 \u043A\
+      \ \u043D\u0435\u043C\u0443."
+    type: Fix
+  id: 136
+  time: '2024-10-31T23:54:32.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/310