Autodelete items (and grids too)

.github/mapchecker/config.py

@@ -29,9 +29,5 @@
     ],
     "Syndicate": [
         "Plastitanium",  # And also on blackmarket ships cause syndicate.
-    ],
-	"BlackMarket": [
-        "Plastitanium",  # And also on blackmarket ships cause syndicate.
-        "ButtonFrameCautionSecurity",  # Decal.
-	]
+    ]
 }

.github/workflows/publish.yml

@@ -6,19 +6,35 @@ concurrency:
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 10 * * *'
+    - cron: '0 6 * * *'
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install dependencies
-      run: sudo apt-get install -y python3-paramiko python3-lxml
-
     - uses: actions/[email protected]
       with:
         submodules: 'recursive'
+
+    # Corvax-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git -c submodule.Secrets.update=checkout submodule update --init
+        cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets
+        cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer
+        cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets
+        cp -R Secrets/Resources/Textures Resources/Textures/CorvaxSecrets
+    # Corvax-Secrets-End
+
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
@@ -42,38 +58,29 @@ jobs:
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
     - name: Update Build Info
+      env:
+        FORK_ID: ${{ vars.FORK_ID }}
       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
+    - name: Upload files to mothership
+      uses: burnett01/[email protected]
       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
+        switches: -avzr --ignore-existing
+        path: "release/${{ github.sha }}"
+        remote_path: ${{ secrets.BUILDS_PATH }}
+        remote_host: ${{ secrets.BUILDS_HOST }}
+        remote_user: ${{ secrets.BUILDS_USERNAME }}
+        remote_key: ${{ secrets.BUILDS_SSH_KEY }}
 
     - 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 }}
-
-    #- name: Publish changelog (Discord)
-    #  run: Tools/actions_changelogs_since_last_run.py
-    # env:
-    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #    DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
-
-    - name: Publish changelog (RSS)
-      run: Tools/actions_changelog_rss.py
-      env:
-        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+        host: ${{ secrets.BUILDS_HOST }}
+        username: ${{ secrets.BUILDS_USERNAME }}
+        key: ${{ secrets.BUILDS_SSH_KEY }}
+        script: .nvm/versions/node/v20.12.2/bin/node ~/scripts/push_to_manifest.js -fork ${{ vars.FORK_ID }} -id ${{ github.sha }}

.github/workflows/rsi-diff.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Diff changed RSIs
         id: diff
-        uses: space-wizards/[email protected]
+        uses: mirrorcult/[email protected]
         with:
           modified: ${{ steps.files.outputs.modified }}
           removed: ${{ steps.files.outputs.removed }}

.gitmodules

@@ -1,4 +1,9 @@
 [submodule "RobustToolbox"]
 	path = RobustToolbox
 	url = https://github.com/space-wizards/RobustToolbox.git
-	branch = master
+	branch = master
+[submodule "Secrets"]
+	path = Secrets
+	url = [email protected]:corvax-project/secrets.git
+	branch = master
+	update = none

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml

@@ -2,8 +2,12 @@
          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label HorizontalExpand="True" SizeFlagsStretchRatio="0.50"
-                   Text="{Loc Object type:}" />
+            <Label Name="ShuttlesCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.15"
+                   Text="{Loc Shuttles Count}" />
+            <Label Name="DebrisCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.15"
+                   Text="{Loc Debris Count}" />
+            <Label Name="ExpeditionCount" HorizontalExpand="True" SizeFlagsStretchRatio="0.15"
+                   Text="{Loc Expedition Count}" />
             <OptionButton Name="ObjectTypeOptions" HorizontalExpand="True" SizeFlagsStretchRatio="0.25"/>
         </BoxContainer>
         <cc:HSeparator/>

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs

@@ -1,4 +1,7 @@
+using Content.Client.Salvage;
 using Content.Client.Station;
+using Content.Server.Worldgen.Components.Debris;
+using Content.Shared.Shipyard.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
@@ -95,6 +98,33 @@ private void RefreshObjectList(ObjectsTabSelection selection)
             ObjectList.AddChild(ctrl);
             ctrl.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(ctrl, args);
         }
+
+        var shuttlesCount = 0;
+        var shuttlesQuery = _entityManager.AllEntityQueryEnumerator<ShuttleDeedComponent, MapGridComponent>();
+        while (shuttlesQuery.MoveNext(out var uid, out _, out _))
+        {
+            shuttlesCount++;
+        }
+
+        ShuttlesCount.Text = $"Шаттлы: {shuttlesCount}";
+
+        var debrisCount = 0;
+        var debrisQuery = _entityManager.AllEntityQueryEnumerator<SpaceDebrisComponent, MetaDataComponent>();
+        while (debrisQuery.MoveNext(out var uid, out _, out _))
+        {
+            debrisCount++;
+        }
+
+        DebrisCount.Text = $"Обломки: {debrisCount}";
+
+        var expeditionCount = 0;
+        var expeditionQuery = _entityManager.AllEntityQueryEnumerator<SalvageExpeditionComponent, MetaDataComponent>();
+        while (expeditionQuery.MoveNext(out var uid, out _, out _))
+        {
+            expeditionCount++;
+        }
+
+        ExpeditionCount.Text = $"Экспедиции: {expeditionCount}";
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs

@@ -16,6 +16,7 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
     private readonly TimeSpan _typingTimeout = TimeSpan.FromSeconds(2);
     private TimeSpan _lastTextChange;
     private bool _isClientTyping;
+    private bool _isClientChatFocused; // Corvax-TypingIndicator
 
     public override void Initialize()
     {
@@ -31,7 +32,10 @@ public void ClientChangedChatText()
             return;
 
         // client typed something - show typing indicator
-        ClientUpdateTyping(true);
+        // Corvax-TypingIndicator-Start
+        _isClientTyping = true;
+        ClientUpdateTyping();
+        // Corvax-TypingIndicator-End
         _lastTextChange = _time.CurTime;
     }
 
@@ -42,9 +46,26 @@ public void ClientSubmittedChatText()
             return;
 
         // client submitted text - hide typing indicator
-        ClientUpdateTyping(false);
+        // Corvax-TypingIndicator-Start
+        _isClientTyping = false;
+        _isClientChatFocused = false;
+        ClientUpdateTyping();
+        // Corvax-TypingIndicator-End
     }
 
+    // Corvax-TypingIndicator-Start
+    public void ClientChangedChatFocus(bool isFocused)
+    {
+        // don't update it if player don't want to show typing
+        if (!_cfg.GetCVar(CCVars.ChatShowTypingIndicator))
+            return;
+
+        // client submitted text - hide typing indicator
+        _isClientChatFocused = isFocused;
+        ClientUpdateTyping();
+    }
+    // Corvax-TypingIndicator-End
+
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -56,31 +77,45 @@ public override void Update(float frameTime)
             if (dif > _typingTimeout)
             {
                 // client didn't typed anything for a long time - hide indicator
-                ClientUpdateTyping(false);
+                // Corvax-TypingIndicator-Start
+                _isClientTyping = false;
+                ClientUpdateTyping();
+                // Corvax-TypingIndicator-End
             }
         }
     }
 
-    private void ClientUpdateTyping(bool isClientTyping)
+    private void ClientUpdateTyping() // Corvax-TypingIndicator
     {
-        if (_isClientTyping == isClientTyping)
-            return;
-        _isClientTyping = isClientTyping;
+        // Corvax-TypingIndicator-Start
+        // if (_isClientTyping == isClientTyping)
+        //     return;
+        // _isClientTyping = isClientTyping;
+        // Corvax-TypingIndicator-End
 
         // check if player controls any pawn
         if (_playerManager.LocalEntity == null)
             return;
 
+        // Corvax-TypingIndicator-Start
+        var state = TypingIndicatorState.None;
+        if (_isClientChatFocused)
+            state = _isClientTyping ? TypingIndicatorState.Typing : TypingIndicatorState.Idle;
+        // Corvax-TypingIndicator-End
+
         // send a networked event to server
-        RaiseNetworkEvent(new TypingChangedEvent(isClientTyping));
+        RaiseNetworkEvent(new TypingChangedEvent(state)); // Corvax-TypingIndicator
     }
 
     private void OnShowTypingChanged(bool showTyping)
     {
         // hide typing indicator immediately if player don't want to show it anymore
         if (!showTyping)
         {
-            ClientUpdateTyping(false);
+            // Corvax-TypingIndicator-Start
+            _isClientTyping = false;
+            ClientUpdateTyping();
+            // Corvax-TypingIndicator-End
         }
     }
 }

Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs

@@ -20,7 +20,7 @@ protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorCompone
             return;
         }
 
-        AppearanceSystem.TryGetData<bool>(uid, TypingIndicatorVisuals.IsTyping, out var isTyping, args.Component);
+        //AppearanceSystem.TryGetData<bool>(uid, TypingIndicatorVisuals.IsTyping, out var isTyping, args.Component); // Corvax-TypingIndicator
         var layerExists = args.Sprite.LayerMapTryGet(TypingIndicatorLayers.Base, out var layer);
         if (!layerExists)
             layer = args.Sprite.LayerMapReserveBlank(TypingIndicatorLayers.Base);
@@ -29,6 +29,19 @@ protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorCompone
         args.Sprite.LayerSetState(layer, proto.TypingState);
         args.Sprite.LayerSetShader(layer, proto.Shader);
         args.Sprite.LayerSetOffset(layer, proto.Offset);
-        args.Sprite.LayerSetVisible(layer, isTyping);
+        // args.Sprite.LayerSetVisible(layer, isTyping); // Corvax-TypingIndicator
+        // Corvax-TypingIndicator-Start
+        AppearanceSystem.TryGetData<TypingIndicatorState>(uid, TypingIndicatorVisuals.State, out var state);
+        args.Sprite.LayerSetVisible(layer, state != TypingIndicatorState.None);
+        switch (state)
+        {
+            case TypingIndicatorState.Idle:
+                args.Sprite.LayerSetState(layer, proto.IdleState);
+                break;
+            case TypingIndicatorState.Typing:
+                args.Sprite.LayerSetState(layer, proto.TypingState);
+                break;
+        }
+        // Corvax-TypingIndicator-End
     }
 }

Content.Client/Content.Client.csproj

@@ -22,6 +22,8 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
+    <ProjectReference Include="..\Corvax\Content.Corvax.Interfaces.Shared\Content.Corvax.Interfaces.Shared.csproj" />
+    <ProjectReference Include="..\Corvax\Content.Corvax.Interfaces.Client\Content.Corvax.Interfaces.Client.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Spawners\" />

Content.Client/Humanoid/MarkingPicker.xaml.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Corvax.Interfaces.Client;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
@@ -18,6 +19,7 @@ public sealed partial class MarkingPicker : Control
 {
     [Dependency] private readonly MarkingManager _markingManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    private IClientSponsorsManager? _sponsorsManager; // Corvax-Sponsors
 
     public Action<MarkingSet>? OnMarkingAdded;
     public Action<MarkingSet>? OnMarkingRemoved;
@@ -123,6 +125,7 @@ public MarkingPicker()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+        IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Corvax-Sponsors
 
         CMarkingCategoryButton.OnItemSelected +=  OnCategoryChange;
         CMarkingsUnused.OnItemSelected += item =>
@@ -224,6 +227,10 @@ public void Populate(string filter)
 
             var item = CMarkingsUnused.AddItem($"{GetMarkingName(marking)}", marking.Sprites[0].Frame0());
             item.Metadata = marking;
+            // Corvax-Sponsors-Start
+            if (marking.SponsorOnly && _sponsorsManager != null)
+                item.Disabled = !_sponsorsManager.Prototypes.Contains(marking.ID);
+            // Corvax-Sponsors-End
         }
 
         CMarkingPoints.Visible = _currentMarkings.PointsLeft(_selectedMarkingCategory) != -1;

Content.Client/Humanoid/SingleMarkingPicker.xaml.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Corvax.Interfaces.Client;
 using Content.Shared.Humanoid.Markings;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -11,6 +12,7 @@ namespace Content.Client.Humanoid;
 public sealed partial class SingleMarkingPicker : BoxContainer
 {
     [Dependency] private readonly MarkingManager _markingManager = default!;
+    private IClientSponsorsManager? _sponsorsManager; // Corvax-Sponsors
 
     /// <summary>
     ///     What happens if a marking is selected.
@@ -122,6 +124,7 @@ public SingleMarkingPicker()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+        IoCManager.Instance!.TryResolveType(out _sponsorsManager); // Corvax-Sponsors
 
         MarkingList.OnItemSelected += SelectMarking;
         AddButton.OnPressed += _ =>
@@ -190,6 +193,10 @@ public void PopulateList(string filter)
         {
             var item = MarkingList.AddItem(Loc.GetString($"marking-{id}"), marking.Sprites[0].Frame0());
             item.Metadata = marking.ID;
+            // Corvax-Sponsors-Start
+            if (marking.SponsorOnly && _sponsorsManager != null)
+                item.Disabled = !_sponsorsManager.Prototypes.Contains(marking.ID);
+            // Corvax-Sponsors-End
 
             if (_markings[Slot].MarkingId == id)
             {

Content.Client/Options/UI/Tabs/GraphicsTab.xaml

@@ -36,6 +36,9 @@
             <CheckBox Name="IntegerScalingCheckBox"
                       Text="{Loc 'ui-options-vp-integer-scaling'}"
                       ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+            <CheckBox Name="ViewportVerticalFitCheckBox"
+                      Text="{Loc 'ui-options-vp-vertical-fit'}"
+                      ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
             <CheckBox Name="ViewportLowResCheckBox" Text="{Loc 'ui-options-vp-low-res'}" />
             <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
             <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />