Merge branch 'Cloth&radioHL2' of https://github.com/Elst28/space-stat…

…ion-14 into Cloth&radioHL2

.envrc

@@ -1 +1,4 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+fi
 use flake

.github/CODEOWNERS

@@ -1,15 +1,19 @@
 # Last match in file takes precedence.
 
+# Sorting by path instead of by who added it one day :(
+/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
+
 # Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
 # You need to add your name to these entries, not make a new one, if you care about them.
 /Content.*/Bql/ @moonheart08
-/Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf
+/Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf @Chief-Engineer
 /Content.*/Station/ @moonheart08
 /Content.*/Maps/ @moonheart08
 /Content.*/GameTicking/ @moonheart08
-/Resources/Server\ Info/ @moonheart08
-/Resources/engineCommandPerms.yml @moonheart08
-/Resources/clientCommandPerms.yml @moonheart08
+/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
+/Resources/ServerInfo/Guidebook/ @moonheart08
+/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
+/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
 /Resources/Prototypes/species.yml @moonheart08
 /Resources/Prototypes/Body/ @moonheart08 @mirrorcult @DrSmugleaf # suffering
 /Resources/Prototypes/Maps/ @moonheart08 @Emisse
@@ -50,5 +54,6 @@
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
+/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005

.run/Content Server+Client.run.xml

@@ -4,4 +4,4 @@
     <toRun name="Content.Server" type="DotNetProject" />
     <method v="2" />
   </configuration>
-</component>
+</component>

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -25,8 +25,8 @@ protected override void Open()
             _window.OpenCentered();
 
             _window.OnClose += Close;
-            _window.OnNameEntered += OnNameChanged;
-            _window.OnJobEntered += OnJobChanged;
+            _window.OnNameChanged += OnNameChanged;
+            _window.OnJobChanged += OnJobChanged;
         }
 
         private void OnNameChanged(string newName)

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

@@ -7,16 +7,18 @@ namespace Content.Client.Access.UI
     [GenerateTypedNameReferences]
     public sealed partial class AgentIDCardWindow : DefaultWindow
     {
-        public event Action<string>? OnNameEntered;
-
-        public event Action<string>? OnJobEntered;
+        public event Action<string>? OnNameChanged;
+        public event Action<string>? OnJobChanged;
 
         public AgentIDCardWindow()
         {
             RobustXamlLoader.Load(this);
 
-            NameLineEdit.OnTextEntered += e => OnNameEntered?.Invoke(e.Text);
-            JobLineEdit.OnTextEntered += e => OnJobEntered?.Invoke(e.Text);
+            NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text);
+            NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text);
+
+            JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
+            JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
         }
 
         public void SetCurrentName(string name)

Content.Client/Actions/ActionsSystem.cs

@@ -173,7 +173,7 @@ public void UnlinkAllActions()
         public void LinkAllActions(ActionsComponent? actions = null)
         {
              var player = _playerManager.LocalPlayer?.ControlledEntity;
-             if (player == null || !Resolve(player.Value, ref actions))
+             if (player == null || !Resolve(player.Value, ref actions, false))
              {
                  return;
              }