merge master

.github/CODEOWNERS

@@ -3,18 +3,36 @@
 # C# code
 /Content.*/ @DeltaV-Station/maintainers
 
+# Any assets
+/Resources/ @DeltaV-Station/maintainers
+
+# Server config files
+/Resources/ConfigPresets/ @MilonPL
+
 # YML files
 /Resources/*.yml @DeltaV-Station/yaml-maintainers
 /Resources/**/*.yml @DeltaV-Station/yaml-maintainers
 
 # Sprites
-/Resources/Textures/ @IamVelcroboy
+/Resources/Textures/ @DeltaV-Station/direction
 
 # Lobby art and music - automatically direction issues since its immediately visible to players
-/Resources/Audio/Lobby/ @DeltaV-Station/game-directors
-/Resources/Textures/LobbyScreens/ @DeltaV-Station/game-directors
+/Resources/Audio/Lobby/ @DeltaV-Station/direction
+/Resources/Textures/LobbyScreens/ @DeltaV-Station/direction
 
 # Maps
 /Resources/Maps/ @DeltaV-Station/maptainers
 /Resources/Prototypes/Maps/ @DeltaV-Station/maptainers
 /Content.IntegrationTests/Tests/PostMapInitTest.cs @DeltaV-Station/maptainers
+
+# Server rules
+/Resources/ServerInfo/Guidebook/DeltaV/Rules/ @DeltaV-Station/head-administrators
+
+# Tools and scripts
+/Tools/ @deltanedas @MilonPL
+
+# Workflows, codeowners, templates, etc.
+/.github/ @deltanedas @MilonPL
+
+# Standalone files in the root repo
+/* @deltanedas

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
+<!-- If you are new to the Delta-V repository, please read the [Contributing Guidelines](https://github.com/DeltaV-Station/Delta-v/blob/master/CONTRIBUTING.md) -->
 
 ## About the PR
 <!-- What did you change? -->
@@ -10,23 +10,22 @@
 <!-- Summary of code changes for easier review. -->
 
 ## Media
-<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). 
-Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
+<!-- Attach media if the PR makes ingame changes (clothing, items, features, etc).
+Small fixes/refactors are exempt. -->
 
 ## Requirements
 <!-- Confirm the following by placing an X in the brackets [X]: -->
-- [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
+- [ ] I have tested all added content and changes.
 - [ ] I have added media to this PR or it does not require an ingame showcase.
 <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
 
 ## Breaking changes
-<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them.
-This will be posted in #codebase-changes. -->
+<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. -->
 
 **Changelog**
 <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.
 Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up.
-Changelog must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
+Changelogs must have a :cl: symbol, so the bot recognizes the changes and adds them to the game's changelog. -->
 <!--
 :cl:
 - add: Added fun!

.github/workflows/labeler-conflict.yml

@@ -0,0 +1,21 @@
+name: Check Merge Conflicts
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+jobs:
+  Label:
+    if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) && ( github.actor != 'DeltaV-Bot' )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for Merge Conflicts
+        uses: eps1lon/[email protected]
+        with:
+          dirtyLabel: "S: Merge Conflict"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/labeler-needsreview.yml

@@ -3,14 +3,41 @@
 on:
   pull_request_target:
     types: [review_requested]
+  pull_request_review:
+    types: [submitted]
+
+permissions:
+  pull-requests: write
+  contents: write
 
 jobs:
   add_label:
     runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request_target'
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "Status: Needs Review"
+        labels: "S: Needs Review"
+    - uses: actions-ecosystem/action-remove-labels@v1
+      with:
+        labels: "S: Awaiting Changes"
+
+  handle_review:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request_review'
+    steps:
+    - uses: actions-ecosystem/action-add-labels@v1
+      if: |
+        github.event.review.state == 'changes_requested' &&
+        (github.event.review.author_association == 'OWNER' ||
+         github.event.review.author_association == 'MEMBER')
+      with:
+        labels: "S: Awaiting Changes"
+
     - uses: actions-ecosystem/action-remove-labels@v1
+      if: |
+        github.event.review.state == 'changes_requested' &&
+        (github.event.review.author_association == 'OWNER' ||
+         github.event.review.author_association == 'MEMBER')
       with:
-        labels: "Status: Awaiting Changes"
+        labels: "S: Needs Review"

.github/workflows/labeler-size.yml

@@ -0,0 +1,21 @@
+name: "Labels: Size"
+on: pull_request_target
+jobs:
+  size-label:
+    runs-on: ubuntu-latest
+    steps:
+      - name: size-label
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          # Custom size configuration
+          # DeltaV: changed to powers of 4
+          sizes: >
+            {
+              "0": "XS",
+              "16": "S",
+              "64": "M",
+              "256": "L",
+              "1024": "XL"
+            }

.github/workflows/labeler-untriaged.yml

@@ -11,4 +11,4 @@ jobs:
     - uses: actions-ecosystem/action-add-labels@v1
       if: join(github.event.issue.labels) == ''
       with:
-        labels: "Status: Untriaged"
+        labels: "S: Untriaged"

CONTRIBUTING.md

@@ -0,0 +1,100 @@
+# Delta-V Contributing Guidelines
+
+Generally we follow [upstream's PR guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html) for code quality and such.
+
+Importantly do not make webedits, copied verbatim from above:
+> Do not use GitHub's web editor to create PRs. PRs submitted through the web editor may be closed without review.
+
+Upstream is the [space-wizards/space-station-14](https://github.com/space-wizards/space-station-14) repository that wizden runs on.
+
+# Content specific to Delta-V
+
+In general anything you create from scratch (not modifying something that exists from upstream) should go in a DeltaV subfolder, `_DV`.
+
+Examples:
+- `Content.Server/_DV/Chapel/SacrificialAltarSystem.cs`
+- `Resources/Prototypes/_DV/ai_factions.yml`
+- `Resources/Audio/_DV/Items/gavel.ogg`
+- `Resources/Textures/_DV/Icons/cri.rsi`
+- `Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl`
+- `Resources/ServerInfo/Guidebook/_DV/AlertProcedure.xml`
+  Note that guidebooks go in `ServerInfo/Guidebook/_DV` and not `ServerInfo/_DV`!
+
+# Changes to upstream files
+
+If you make a change to an upstream C# or YAML file **you must add comments on or around the changed lines**.
+The comments should clarify what changed, to make conflict resolution simpler when a file is changed upstream.
+
+For YAML specifically, if you add a new component to a prototype add the comment to the `type: ...` line.
+If you just modify some fields of a component, comment the fields instead.
+
+For C# files, if you are adding a lot of code try to put it in a partial class when it makes sense.
+
+The exception to this is early merging commits that are going to be cherry picked in the future regardless, there's no harm in leaving them as-is.
+
+As an aside, fluent (.ftl) files **do not support comments on the same line** as a locale value, so be careful when changing them.
+
+## Examples of comments in upstream files
+
+A single line comment on a changed yml field:
+```yml
+- type: entity
+  parent: BasePDA
+  id: SciencePDA
+  name: epistemics PDA # DeltaV - Epistemics Department replacing Science
+```
+
+A pair of comments enclosing a list of added items to starting gear:
+```yml
+  storage:
+    back:
+    - EmergencyRollerBedSpawnFolded
+    # Begin DeltaV additions
+    - BodyBagFolded
+    - Portafib
+    # End DeltaV additions
+```
+
+A comment on a new imported namespace:
+```cs
+using Content.Server.Psionics.Glimmer; // DeltaV
+```
+
+A pair of comments enclosing a block of added code:
+```cs
+private EntityUid Slice(...)
+{
+    ...
+
+    _transform.SetLocalRotation(sliceUid, 0);
+
+    // DeltaV - start of deep frier stuff
+    var slicedEv = new FoodSlicedEvent(user, uid, sliceUid);
+    RaiseLocalEvent(uid, ref slicedEv);
+    // DeltaV - end of deep frier stuff
+
+    ...
+}
+```
+
+# Mapping
+
+If you want to make changes to a map, get in touch with its maintainer to make sure you don't both make changes at the same time.
+
+Conflicts with maps make PRs mutually exclusive so either your work on the maintainer's work will be lost, communicate to avoid this!
+
+# Before you submit
+
+Double-check your diff on GitHub before submitting: look for unintended commits or changes and remove accidental whitespace or line-ending changes.
+
+Additionally for long-lasting PRs, if you see `RobustToolbox` in the changed files you have to revert it, use `git checkout upstream/master RobustToolbox` (replacing `upstream` with the name of your DeltaV-Station/Delta-V remote)
+
+# Changelogs
+
+By default any changelogs goes in the DeltaV changelog, you can use the DeltaV admin changelog by putting `DELTAVADMIN:` in a line after `:cl:`.
+
+Do not use `ADMIN:` as **it will mangle** the upstream admin changelog!
+
+# Additional resources
+
+If you are new to contributing to SS14 in general, have a look at the [SS14 docs](https://docs.spacestation14.io/) or ask for help in `#contribution-help` on [Discord](https://go.delta-v.org/AtDxv)!

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -26,6 +26,13 @@ protected override void Open()
             _window.OnNameChanged += OnNameChanged;
             _window.OnJobChanged += OnJobChanged;
             _window.OnJobIconChanged += OnJobIconChanged;
+            _window.OnNumberChanged += OnNumberChanged; // DeltaV
+        }
+
+        // DeltaV - Add number change handler
+        private void OnNumberChanged(uint newNumber)
+        {
+            SendMessage(new AgentIDCardNumberChangedMessage(newNumber));
         }
 
         private void OnNameChanged(string newName)
@@ -56,6 +63,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
             _window.SetAllowedIcons(cast.CurrentJobIconId);
+            _window.SetCurrentNumber(cast.CurrentNumber); // DeltaV
         }
     }
 }

Content.Client/Access/UI/AgentIDCardWindow.xaml

@@ -6,6 +6,10 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
+        <!-- DeltaV - Add NanoChat number field -->
+        <Label Name="CurrentNumber" Text="{Loc 'agent-id-card-current-number'}" />
+        <LineEdit Name="NumberLineEdit" PlaceHolder="#0000" />
+        <!-- DeltaV end -->
         <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
         <GridContainer Name="IconGrid" Columns="10">
             <!-- Job icon buttons are generated in the code -->

Content.Client/Access/UI/AgentIDCardWindow.xaml.cs

@@ -21,9 +21,13 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
 
         private const int JobIconColumnCount = 10;
 
+        private const int MaxNumberLength = 4; // DeltaV - Same as NewChatPopup
+
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
 
+        public event Action<uint>? OnNumberChanged; // DeltaV - Add event for number changes
+
         public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;
 
         public AgentIDCardWindow()
@@ -37,6 +41,37 @@ public AgentIDCardWindow()
 
             JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
+
+            // DeltaV - Add handlers for number changes
+            NumberLineEdit.OnTextEntered += OnNumberEntered;
+            NumberLineEdit.OnFocusExit += OnNumberEntered;
+
+            // DeltaV - Filter to only allow digits
+            NumberLineEdit.OnTextChanged += args =>
+            {
+                if (args.Text.Length > MaxNumberLength)
+                {
+                    NumberLineEdit.Text = args.Text[..MaxNumberLength];
+                }
+
+                // Filter to digits only
+                var newText = string.Concat(args.Text.Where(char.IsDigit));
+                if (newText != args.Text)
+                    NumberLineEdit.Text = newText;
+            };
+        }
+
+        // DeltaV - Add number validation and event
+        private void OnNumberEntered(LineEdit.LineEditEventArgs args)
+        {
+            if (uint.TryParse(args.Text, out var number) && number > 0)
+                OnNumberChanged?.Invoke(number);
+        }
+
+        // DeltaV - Add setter for current number
+        public void SetCurrentNumber(uint? number)
+        {
+            NumberLineEdit.Text = number?.ToString("D4") ?? "";
         }
 
         public void SetAllowedIcons(string currentJobIconId)

Content.Client/Actions/ActionsSystem.cs

@@ -259,13 +259,13 @@ public void UnlinkAllActions()
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-             if (_playerManager.LocalEntity is not { } user ||
-                 !Resolve(user, ref actions, false))
-             {
-                 return;
-             }
+            if (_playerManager.LocalEntity is not { } user ||
+                !Resolve(user, ref actions, false))
+            {
+                return;
+            }
 
-             LinkActions?.Invoke(actions);
+            LinkActions?.Invoke(actions);
         }
 
         public override void Shutdown()