Upstream23102024

.github/workflows/publish.yml

@@ -5,8 +5,8 @@ concurrency:
 
 on:
   workflow_dispatch:
-  # schedule:
-   # - cron: '0 10 * * *'
+#  schedule:
+#    - cron: '0 10 * * *'
 
 jobs:
   build:
@@ -41,19 +41,35 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
+      with:
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
+
     - name: Publish version
-      run: Tools/publish_multi_request.py
+      run: Tools/publish_github_artifact.py
       env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
         GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
 
-    - 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 (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 }}
+#    - name: Publish changelog (RSS)
+#      run: Tools/actions_changelog_rss.py
+#      env:
+#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
+      with:
+        name: build

.github/workflows/rsi-diff.yml

@@ -1,9 +1,10 @@
 name: Diff RSIs
 
 on:
-  pull_request_target:
-    paths:
-      - '**.rsi/**.png'
+  workflow_dispatch:
+#  pull_request_target:
+#    paths:
+#      - '**.rsi/**.png'
 
 jobs:
   diff:

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -61,7 +61,9 @@ public sealed class PostMapInitTest
             "Reach",
             "Train",
             "Oasis",
-            "Cog"
+            "Cog",
+            "Xeno", // Xeno map playtest
+            "Barratry" // Update of old map
         };
 
         /// <summary>

Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs

@@ -172,4 +172,3 @@ private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref Compo
         _solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
     }
 }
-

Content.Server/_Harmony/RoundEnd/RoundEndSystem.Pacified.cs

@@ -0,0 +1,65 @@
+// Credits:
+// This code was originally created by DebugOk, deltanedas, and NullWanderer for DeltaV.
+// Available at https://github.com/DebugOk/Delta-v/blob/master/Content.Server/DeltaV/RoundEnd/RoundEndSystem.Pacified.cs
+// Original PR: https://github.com/DeltaV-Station/Delta-v/pull/350
+// Modified by FluffMe on 12.10.2024 with no major changes except the Namespaces and the CVar name.
+using Content.Server.GameTicking;
+using Content.Shared.CombatMode;
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared._Harmony.CCVars;
+using Content.Shared.Explosion.Components;
+using Content.Shared.Flash.Components;
+using Content.Shared.Store.Components;
+using Robust.Shared.Configuration;
+
+namespace Content.Server._Harmony.RoundEnd;
+
+public sealed class PacifiedRoundEnd : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+
+    private bool _enabled;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _configurationManager.OnValueChanged(HCCVars.RoundEndPacifist, v => _enabled = v, true);
+        SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEnded);
+    }
+
+    private void OnRoundEnded(RoundEndTextAppendEvent ev)
+    {
+        if (!_enabled)
+            return;
+
+        var harmQuery = EntityQueryEnumerator<CombatModeComponent>();
+        while (harmQuery.MoveNext(out var uid, out _))
+        {
+            EnsureComp<PacifiedComponent>(uid);
+        }
+
+        var explosiveQuery = EntityQueryEnumerator<ExplosiveComponent>();
+        while (explosiveQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<ExplosiveComponent>(uid);
+        }
+
+        var grenadeQuery = EntityQueryEnumerator<OnUseTimerTriggerComponent>();
+        while (grenadeQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<OnUseTimerTriggerComponent>(uid);
+        }
+
+        var flashQuery = EntityQueryEnumerator<FlashComponent>();
+        while (flashQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<FlashComponent>(uid);
+        }
+
+        var uplinkQuery = EntityQueryEnumerator<StoreComponent>();
+        while (uplinkQuery.MoveNext(out var uid, out _))
+        {
+            RemComp<StoreComponent>(uid);
+        }
+    }
+}

Content.Shared/_Harmony/CCVars/HCCVars.cs

@@ -0,0 +1,17 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared._Harmony.CCVars;
+
+/// <summary>
+/// Harmony-specific cvars.
+/// </summary>
+[CVarDefs]
+public sealed class HCCVars
+{
+    /// <summary>
+    /// Anti-EORG measure. Will add pacified to all players upon round end.
+    /// Its not perfect, but gets the job done.
+    /// </summary>
+    public static readonly CVarDef<bool> RoundEndPacifist =
+        CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);
+}

Resources/Audio/_Harmony/Announcements/RoundEnd/attributions.yml

@@ -0,0 +1,19 @@
+- files: ["chickens.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "TBD"
+  source: "https://www.youtube.com/watch?v=XIqMvjwaEGk"
+
+- files: ["freesteel.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "TBD"
+  source: "https://www.youtube.com/watch?v=1zvV2clsaX4"
+
+- files: ["tortilla.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "TBD"
+  source: "https://www.youtube.com/watch?v=snQ8MnJNNY0"
+
+- files: ["unacceptable.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "TBD"
+  source: "https://www.youtube.com/watch?v=6AdZEYK9FwQ"