Консоль радио и доступы (#2203)

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:52:43 +03:00 · 2025-05-27 01:52:43 +03:00 · d781e0f166
commit d781e0f166
parent 67a2e97442
12 changed files with 42 additions and 16 deletions
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@ -379,15 +379,16 @@ namespace Content.Server.Lathe

                if (!_proto.TryIndex(recipeId, out LatheRecipePrototype? recipe))
                    continue;
-
-                var itemName = GetRecipeName(recipe!);
-                recipeNames.Add(Loc.GetString("lathe-unlock-recipe-radio-broadcast-item", ("item", itemName)));
+                //Sunrise-Edit-Start
+                //var itemName = GetRecipeName(recipe!);
+                //recipeNames.Add(Loc.GetString("lathe-unlock-recipe-radio-broadcast-item", ("item", itemName)));
+                //Sunrise-Edit-End
            }

            if (recipeNames.Count == 0)
                return;
-
-            var message =
+            //Sunrise-Edit-Start
+            /*var message =
                recipeNames.Count > ent.Comp.MaximumItems ?
                    Loc.GetString(
                        "lathe-unlock-recipe-radio-broadcast-overflow",
@ -402,7 +403,8 @@ namespace Content.Server.Lathe
            foreach (var channel in ent.Comp.Channels)
            {
                _radio.SendRadioMessage(ent.Owner, message, channel, ent.Owner, escapeMarkup: false);
-            }
+            }*/
+            //Sunrise-Edit-End
        }

        private void OnResearchRegistrationChanged(EntityUid uid, LatheComponent component, ref ResearchRegistrationChangedEvent args)
--- a/Content.Server/Research/Systems/ResearchSystem.Console.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs
@ -44,7 +44,8 @@ public sealed partial class ResearchSystem
        if (!UnlockTechnology(uid, args.Id, act))
            return;

-        if (!_emag.CheckFlag(uid, EmagType.Interaction))
+        //sunrise-edit-start
+        /*if (!_emag.CheckFlag(uid, EmagType.Interaction))
        {
            var getIdentityEvent = new TryGetIdentityShortInfoEvent(uid, act);
            RaiseLocalEvent(getIdentityEvent);
@ -56,7 +57,8 @@ public sealed partial class ResearchSystem
                ("approver", getIdentityEvent.Title ?? string.Empty)
            );
            _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
-        }
+        }*/
+        //sunrise-edit-end

        SyncClientWithServer(uid);
        UpdateConsoleInterface(uid, component);
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@ -79,6 +79,8 @@ public sealed partial class IdCardConsoleComponent : Component
        "Magistrat", // Sunrise-Edit
        "Barber", // Sunrise-Edit
        "Mail", // Sunrise-Edit
+        "CargoPurchaseAccess", // Sunrise-Edit
+        "ResearchConsoleAccess", // Sunrise-Edit
    };

    [Serializable, NetSerializable]
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/access/accesses.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/access/accesses.ftl
@ -4,4 +4,6 @@ id-card-access-level-ntrep = Представитель NT
 id-card-access-level-magistrat = Магистрат
 id-card-access-level-barber = Парикмахер
 id-card-access-level-mail = Почтальйон
-id-card-access-level-mining = Шахтёр
+id-card-access-level-cargo-purchase-access = Снабжение: заказы
+id-card-access-level-research-console-access = Науч. исследования
+id-card-access-level-mining = Шахтёр
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@ -39,3 +39,6 @@
  - BlueShieldEnsign  # Sunrise-edit
  - Ntrep  # Sunrise-edit
  - Barber  # Sunrise-edit
+  - Mail  # Sunrise-edit
+  - CargoPurchaseAccess  # Sunrise-edit
+  - ResearchConsoleAccess  # Sunrise-edit
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@ -245,7 +245,7 @@
    sprite: Objects/Misc/cc-clipboard.rsi

 - type: entity
-  id: BoxFolderQmClipboard
+  id: BoxFolderQmClipboard #
  parent: [BoxFolderClipboard, BaseGrandTheftContraband]
  name: requisition digi-board
  description: A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe.
@ -311,3 +311,5 @@
    - HighRiskItem
  - type: StealTarget
    stealGroup: BoxFolderQmClipboard
+  - type: AccessReader #Sunrise-edit
+    access: [["CargoPurchaseAccess"]] #Sunrise-edit
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@ -486,9 +486,11 @@
      state: generic_panel_open
  - type: ResearchClient
  - type: ResearchConsole
-  - type: ActiveRadio
-    channels:
-    - Science
+  # Sunrise-Edit-Start
+  #- type: ActiveRadio
+  #  channels:
+  #  - Science
+  # Sunrise-Edit-End
  - type: TechnologyDatabase
  - type: ActivatableUI
    key: enum.ResearchConsoleUiKey.Key
@ -505,7 +507,7 @@
  - type: Computer
    board: ResearchComputerCircuitboard
  - type: AccessReader
-    access: [["Research"]]
+    access: [["ResearchConsoleAccess"]]
  - type: PointLight
    radius: 1.5
    energy: 1.6
@ -981,7 +983,7 @@
    energy: 1.6
    color: "#b89f25"
  - type: AccessReader
-    access: [["Quartermaster"], ["HeadOfPersonnel"]] # Sunrise-Edit
+    access: [["CargoPurchaseAccess"]] # Sunrise-Edit
  - type: DeviceNetwork
    deviceNetId: Wireless
    receiveFrequencyId: BasicDevice
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@ -23,6 +23,7 @@
  access:
  - Cargo
  - Salvage
+  - CargoPurchaseAccess  # Sunrise-Edit
  - Quartermaster
  - Maintenance
  - External
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@ -51,6 +51,8 @@
  - Brig
  - Lawyer
  - Cargo
+  - CargoPurchaseAccess # Sunrise-edit
+  - ResearchConsoleAccess # Sunrise-Edit
  - Atmospherics
  - Medical
  - Barber  # Sunrise-edit
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@ -24,6 +24,7 @@
  - ResearchDirector
  - Brig
  - Cryogenics
+  - ResearchConsoleAccess # Sunrise-Edit
  special:
  - !type:AddImplantSpecial
    implants: [ MindShieldImplant, TrackingImplant, DeathRattleImplantBlueShield ]
--- a/Resources/Prototypes/_Sunrise/Access/cargo.yml
+++ b/Resources/Prototypes/_Sunrise/Access/cargo.yml
@ -2,6 +2,10 @@
  id: Mail
  name: id-card-access-level-mail

+- type: accessLevel
+  id: CargoPurchaseAccess
+  name: id-card-access-level-cargo-purchase-access
+
 - type: accessLevel
  id: Mining
-  name: id-card-access-level-mining
+  name: id-card-access-level-mining
--- a/Resources/Prototypes/_Sunrise/Access/research.yml
+++ b/Resources/Prototypes/_Sunrise/Access/research.yml
@ -0,0 +1,3 @@
+- type: accessLevel
+  id: ResearchConsoleAccess
+  name: id-card-access-level-research-console-access