diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 62b7b0df398b53..11e6eca72819ae 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -2,7 +2,7 @@ name: Build & Test Debug on: push: - branches: [ master, staging, trying, master-ru, arumoon-server ] + branches: [ master, staging, trying, master-ru ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index 4b357cfe7d6163..61a37807aaddf8 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -2,7 +2,7 @@ name: Build & Test Release on: push: - branches: [ master, staging, trying, master-ru, arumoon-server ] + branches: [ master, staging, trying, master-ru ] merge_group: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] diff --git a/.github/workflows/changelogs.yml b/.github/workflows/changelogs.yml index ef02f5fb3b7606..5e7465ac5efe38 100644 --- a/.github/workflows/changelogs.yml +++ b/.github/workflows/changelogs.yml @@ -7,8 +7,6 @@ on: workflow_dispatch: schedule: - cron: '0 10 * * *' - push: - branches: [ arumoon-server ] jobs: build: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 2159bae2806ead..00000000000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,98 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ "arumoon-server" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "arumoon-server" ] - schedule: - - cron: '20 9 * * 1' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'csharp', 'go', 'javascript', 'python' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] - # Use only 'java' to analyze code written in Java, Kotlin or both - # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Setup Submodule - run: | - git submodule update --init --recursive - - - name: Pull engine updates - uses: space-wizards/submodule-dependency@v0.1.5 - - - name: Update Engine Submodules - run: | - cd RobustToolbox/ - git submodule update --init --recursive - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - #- name: Autobuild - # uses: github/codeql-action/autobuild@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.0.x - - - name: Install dependencies - run: dotnet restore - - - name: Build Project - run: dotnet build --configuration Debug --no-restore /p:WarningsAsErrors=nullable /m - - # ℹ️ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - with: - category: "/language:csharp" diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 6a4ab060c83373..d652ab047f504c 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -5,7 +5,6 @@ on: branches: - master - master-ru - - arumoon-server pull_request_target: jobs: diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 278df80e39ea18..a6b635c227cfbe 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -2,7 +2,7 @@ on: push: - branches: [ master, staging, trying, master-ru, arumoon-server ] + branches: [ master, staging, trying, master-ru ] paths: - '**.cs' - '**.csproj' diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml index d38dfa60663d5d..1d5b0a8725f6a7 100644 --- a/.github/workflows/update-wiki.yml +++ b/.github/workflows/update-wiki.yml @@ -3,7 +3,7 @@ name: Update Wiki on: workflow_dispatch: push: - branches: [ arumoon-server ] + branches: [ master, jsondump ] paths: - '.github/workflows/update-wiki.yml' - 'Content.Shared/Chemistry/**.cs' @@ -56,7 +56,7 @@ jobs: wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json edit_summary: Update chem_prototypes.json via GitHub Actions page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json" - api_url: https://wiki.ss14.arumoon.ru/api.php + api_url: https://wiki.spacestation14.io/w/api.php username: ${{ secrets.WIKI_BOT_USER }} password: ${{ secrets.WIKI_BOT_PASS }} @@ -66,7 +66,7 @@ jobs: wiki_text_file: ./bin/Content.Server/data/react_prototypes.json edit_summary: Update react_prototypes.json via GitHub Actions page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json" - api_url: https://wiki.ss14.arumoon.ru/api.php + api_url: https://wiki.spacestation14.io/w/api.php username: ${{ secrets.WIKI_BOT_USER }} password: ${{ secrets.WIKI_BOT_PASS }} diff --git a/.vscode/launch.json b/.vscode/launch.json index b9242a4b8f6147..4d7ba6748e02e8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -20,8 +20,7 @@ "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll", "args": [], "console": "integratedTerminal", - "stopAtEntry": false, - "requireExactSource": false, + "stopAtEntry": false }, { "name": "YAML Linter", @@ -44,4 +43,4 @@ "preLaunchTask": "build" } ] -} +} \ No newline at end of file diff --git a/Content.Client/Access/UI/AccessStorageBoundUserInterface.cs b/Content.Client/Access/UI/AccessStorageBoundUserInterface.cs deleted file mode 100644 index 65990475fc10da..00000000000000 --- a/Content.Client/Access/UI/AccessStorageBoundUserInterface.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Linq; -using Content.Shared.Access.Components; -using Content.Shared.Access.Systems; -using Robust.Client.GameObjects; -using Robust.Shared.Prototypes; - -namespace Content.Client.Access.UI -{ - public sealed class AccessStorageBoundUserInterface : BoundUserInterface - { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - - public AccessStorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) - { - } - - private AccessStorageWindow? _window; - - protected override void Open() - { - base.Open(); - - List accessLevels; - - if (EntMan.TryGetComponent(Owner, out var accessStorage)) - { - accessLevels = accessStorage.AccessLevels; - accessLevels.Sort(); - } - else - { - accessLevels = new List(); - } - - _window = new AccessStorageWindow(this, _prototypeManager, accessLevels) {Title = EntMan.GetComponent(Owner).EntityName}; - - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } - - protected override void UpdateState(BoundUserInterfaceState state) - { - base.UpdateState(state); - var castState = (AccessStorageBoundUserInterfaceState) state; - _window?.UpdateState(castState); - } - - public void SubmitData(List newAccessList, List newDenyTags) - { - SendMessage(new WriteToTargetAccessStorageMessage(newAccessList, newDenyTags)); - } - } -} diff --git a/Content.Client/Access/UI/AccessStorageWindow.xaml b/Content.Client/Access/UI/AccessStorageWindow.xaml deleted file mode 100644 index e607535756bb57..00000000000000 --- a/Content.Client/Access/UI/AccessStorageWindow.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/Content.Client/Access/UI/AccessStorageWindow.xaml.cs b/Content.Client/Access/UI/AccessStorageWindow.xaml.cs deleted file mode 100644 index c53aa7cb0c1e12..00000000000000 --- a/Content.Client/Access/UI/AccessStorageWindow.xaml.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Content.Shared.Access; -using Content.Shared.Access.Systems; -using Content.Shared.Roles; -using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.CustomControls; -using Robust.Client.UserInterface.XAML; -using Robust.Shared.Localization; -using Robust.Shared.Maths; -using Robust.Shared.Prototypes; - -namespace Content.Client.Access.UI -{ - [GenerateTypedNameReferences] - public sealed partial class AccessStorageWindow : DefaultWindow - { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - - private readonly AccessStorageBoundUserInterface _owner; - - private readonly Dictionary _accessButtons = new(); - private readonly Dictionary _denyButtons = new(); - - public AccessStorageWindow(AccessStorageBoundUserInterface owner, IPrototypeManager prototypeManager, - List accessLevels) - { - RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); - - _owner = owner; - - foreach (var access in accessLevels) - { - if (!prototypeManager.TryIndex(access, out var accessLevel)) - { - Logger.Error($"Unable to find accesslevel for {access}"); - continue; - } - - var newButton = new Button - { - Text = GetAccessLevelName(accessLevel), - ToggleMode = true, - }; - AccessLevelGrid.AddChild(newButton); - _accessButtons.Add(accessLevel.ID, newButton); - newButton.OnPressed += _ => SubmitData(); - } - foreach (var access in accessLevels) - { - if (!prototypeManager.TryIndex(access, out var accessLevel)) - { - Logger.Error($"Unable to find accesslevel for {access}"); - continue; - } - - var newButton = new Button - { - Text = GetAccessLevelName(accessLevel), - ToggleMode = true, - }; - DenyTagsGrid.AddChild(newButton); - _denyButtons.Add(accessLevel.ID, newButton); - newButton.OnPressed += _ => SubmitData(); - } - } - - private static string GetAccessLevelName(AccessLevelPrototype prototype) - { - if (prototype.Name is { } name) - return Loc.GetString(name); - - return prototype.ID; - } - - private void ClearAllAccess() - { - foreach (var button in _accessButtons.Values) - { - if (button.Pressed) - { - button.Pressed = false; - } - } - foreach (var button in _denyButtons.Values) - { - if (button.Pressed) - { - button.Pressed = false; - } - } - } - - public void UpdateState(AccessStorageBoundUserInterfaceState state) - { - foreach (var (accessName, button) in _accessButtons) - { - button.Disabled = false; - button.Pressed = state.AccessList?.Contains(accessName) ?? false; - } - foreach (var (accessName, button) in _denyButtons) - { - button.Disabled = false; - button.Pressed = state.DenyTags?.Contains(accessName) ?? false; - } - } - - private void SubmitData() - { - // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair - _owner.SubmitData(_accessButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(), _denyButtons.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); - } - } -} diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml index cca4cf6ff8373d..c29adc8ebd3f2f 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml @@ -1,5 +1,5 @@ + MinSize="650 290"> diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs index f9c15f5abf1385..67d847fe51aa47 100644 --- a/Content.Client/Administration/Managers/ClientAdminManager.cs +++ b/Content.Client/Administration/Managers/ClientAdminManager.cs @@ -2,7 +2,6 @@ using Content.Shared.Administration.Managers; using Robust.Client.Console; using Robust.Client.Player; -using Robust.Client.State; using Robust.Shared.ContentPack; using Robust.Shared.Network; using Robust.Shared.Utility; @@ -22,7 +21,6 @@ public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImp private readonly AdminCommandPermissions _localCommandPermissions = new(); public event Action? AdminStatusUpdated; - public bool BwoinkSound = true; public bool IsActive() { @@ -123,14 +121,5 @@ void IPostInjectInit.PostInject() ? _adminData : null; } - public bool SetBwoink(bool state) - { - BwoinkSound = state; - return BwoinkSound; - } - public bool GetBwoink() - { - return BwoinkSound; - } } } diff --git a/Content.Client/Administration/Managers/IClientAdminManager.cs b/Content.Client/Administration/Managers/IClientAdminManager.cs index 216d86c89b5cb9..46e3a01537b1c0 100644 --- a/Content.Client/Administration/Managers/IClientAdminManager.cs +++ b/Content.Client/Administration/Managers/IClientAdminManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Shared.Administration; namespace Content.Client.Administration.Managers @@ -52,15 +52,5 @@ public interface IClientAdminManager bool CanAdminMenu(); void Initialize(); - - /// - /// Set ahelp sound flag - /// - bool SetBwoink(bool state); - - /// - /// Get ahelp sound flag - /// - bool GetBwoink(); } } diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml index e3733beaca63e6..89e5694b0d3ec7 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml @@ -1,4 +1,4 @@ - @@ -18,7 +18,6 @@