Updated Saltern 😄 😄 😄

.github/CODEOWNERS

@@ -1,10 +1,4 @@
 # Last match in file takes precedence.
 
-# I pretend to have authority over these things.
-/Resources/ @SweptWasTaken
-
-# Be they Fluent translations or Freemarker templates, I know them both!
-*.ftl @RemieRichards
-
 # Ping for all PRs
-* @PJB3005 @Zumorica
+* @ZeroDayDaemon

.github/workflows/publish.yml

@@ -1,58 +1,61 @@
-name: Publish
-
-concurrency:
-  group: publish
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.100
-
-    - name: Get Engine Tag
-      run: |
-        cd RobustToolbox
-        git fetch --depth=1
-
-    - name: Package client
-      run: |
-        Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-        Tools/package_client_build.py
-
-    - name: Update Build Info
-      run: Tools/gen_build_info.py
-
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/*.zip "release/${{ github.sha }}"
-
-    - name: Upload files to centcomm
-      uses: appleboy/scp-action@master
-      with:
-        host: centcomm.spacestation14.io
-        username: wizards-build-push
-        key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
-        source: "release/${{ github.sha }}"
-        target: "/home/wizards-build-push/builds_dir/builds/"
-        strip_components: 1
-
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
-      with:
-        host: centcomm.spacestation14.io
-        username: wizards-build-push
-        key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
-        script: /home/wizards-build-push/push.ps1 ${{ github.sha }}
+
+# Not using a manifest update method, using git instead
+
+#name: Publish
+
+#concurrency:
+#  group: publish
+
+#on:
+#  push:
+#    branches: [ master ]
+
+#jobs:
+#  build:
+#    runs-on: ubuntu-latest
+
+#    steps:
+#    - uses: actions/checkout@v2
+#      with:
+#        submodules: 'recursive'
+#    - name: Setup .NET Core
+#      uses: actions/setup-dotnet@v1
+#      with:
+#        dotnet-version: 6.0.100
+
+#    - name: Get Engine Tag
+#      run: |
+#        cd RobustToolbox
+#        git fetch --depth=1
+
+#    - name: Package all
+#      run: |
+#        Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
+#        Tools/package_client_build.py
+
+#    - name: Update Build Info
+#      run: Tools/gen_build_info.py
+
+#    - name: Shuffle files around
+#      run: |
+#        mkdir "release/${{ github.sha }}"
+#        mv release/*.zip "release/${{ github.sha }}"
+
+#    - name: Upload files to nowhere
+#      uses: appleboy/scp-action@master
+#      with:
+#        host: station14.space
+#        username: arcadia-build-push
+#        key: ${{ secrets.NOWHERE_ARCADIA_BUILDS_PUSH_KEY }}
+#        source: "release/${{ github.sha }}"
+#        target: "/home/arcadia-build-push/builds_dir/builds/"
+#        strip_components: 1
+
+#    - name: Update manifest JSON
+#      uses: appleboy/ssh-action@master
+#      with:
+#        host: centcomm.spacestation14.io
+#        username: arcadia-build-push
+#        key: ${{ secrets.NOWHERE_ARCADIA_BUILDS_PUSH_KEY }}
+#        script: /home/arcadia-build-push/push.ps1 ${{ github.sha }}
 

Content.Client/Administration/BwoinkSystem.cs

@@ -100,11 +100,29 @@ public BwoinkPanel EnsurePanel(NetUserId channelId)
             return EnsurePlain(channelId);
         }
 
-        public void EnsurePanelForLocalPlayer()
+        public void Open(NetUserId? channelId = null)
         {
-            var localPlayer = _playerManager.LocalPlayer;
-            if (localPlayer != null)
-                EnsurePanel(localPlayer.UserId);
+            if (channelId == null)
+            {
+                var localPlayer = _playerManager.LocalPlayer;
+                if (localPlayer != null)
+                    Open(localPlayer.UserId);
+                return;
+            }
+
+            if (_adminManager.HasFlag(AdminFlags.Adminhelp))
+            {
+                SelectChannel(channelId.Value);
+                return;
+            }
+
+            EnsurePlain(channelId.Value);
+        }
+
+        private void SelectChannel(NetUserId uid)
+        {
+            _adminWindow ??= new BwoinkWindow(this);
+            _adminWindow.SelectChannel(uid);
         }
 
         public void Send(NetUserId channelId, string text)

Content.Client/Administration/UI/BwoinkWindow.xaml.cs

@@ -108,15 +108,20 @@ public void OnBwoink(NetUserId channel)
 
             if (!open)
             {
-                var pi = ChannelSelector
-                    .PlayerItemList
-                    .FirstOrDefault(i => ((PlayerInfo) i.Metadata!).SessionId == channel);
-
-                if (pi is not null)
-                    pi.Selected = true;
+                SelectChannel(channel);
             }
         }
 
+        public void SelectChannel(NetUserId channel)
+        {
+            var pi = ChannelSelector
+                .PlayerItemList
+                .FirstOrDefault(i => ((PlayerInfo) i.Metadata!).SessionId == channel);
+
+            if (pi is not null)
+                pi.Selected = true;
+        }
+
         private void FixButtons()
         {
             Ban.Visible = _adminManager.HasFlag(AdminFlags.Ban);
@@ -157,11 +162,12 @@ private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
             return sb.ToString();
         }
 
-        public void SwitchToChannel(NetUserId ch)
+        private void SwitchToChannel(NetUserId ch)
         {
             foreach (var bw in BwoinkArea.Children)
                 bw.Visible = false;
-            _bwoinkSystem.EnsurePanel(ch).Visible = true;
+            var panel = _bwoinkSystem.EnsurePanel(ch);
+            panel.Visible = true;
         }
     }
 }

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs

@@ -25,16 +25,13 @@ public PlayerListControl()
             _adminSystem = EntitySystem.Get<AdminSystem>();
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
-        }
-
-        protected override void EnteredTree()
-        {
             // Fill the Option data
             PopulateList();
             PlayerItemList.OnItemSelected += PlayerItemListOnOnItemSelected;
             PlayerItemList.OnItemDeselected += PlayerItemListOnOnItemDeselected;
             FilterLineEdit.OnTextChanged += FilterLineEditOnOnTextEntered;
             _adminSystem.PlayerListChanged += PopulateList;
+
         }
 
         private void FilterLineEditOnOnTextEntered(LineEdit.LineEditEventArgs obj)