Merge branch 'master' into sprites-but-gaming

.github/workflows/publish.yml

@@ -41,33 +41,22 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - 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
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        source: "release/${{ github.sha }}"
-        target: "/var/www/builds.delta-v.org/delta-v/builds/"
-        strip_components: 1
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
 
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.PUBLISH_HOST }}
-        username: ${{ secrets.PUBLISH_USER }}
-        key: ${{ secrets.PUBLISH_KEY }}
-        port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
+    - name: Publish version
+      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
@@ -79,3 +68,8 @@ jobs:
       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/test-packaging.yml

@@ -65,9 +65,6 @@ jobs:
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release
 
-      - name: Update Build Info
-        run: Tools/gen_build_info.py
-
       - name: Shuffle files around
         run: |
           mkdir "release/${{ github.sha }}"

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -55,6 +55,7 @@ public sealed class PostMapInitTest
             "Tortuga", //DeltaV
             "Arena", //DeltaV
             "Asterisk", //DeltaV
+            "Glacier", //DeltaV
             "TheHive", //DeltaV
             "Hammurabi", //DeltaV
             "Lighthouse", //DeltaV

Content.Server/DeltaV/Station/Components/StationSurfaceComponent.cs

@@ -0,0 +1,23 @@
+using Content.Server.Station.Systems;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Station.Components;
+
+/// <summary>
+/// Loads a surface map on mapinit.
+/// </summary>
+[RegisterComponent, Access(typeof(StationSurfaceSystem))]
+public sealed partial class StationSurfaceComponent : Component
+{
+    /// <summary>
+    /// Path to the map to load.
+    /// </summary>
+    [DataField(required: true)]
+    public ResPath? MapPath;
+
+    /// <summary>
+    /// The map that was loaded.
+    /// </summary>
+    [DataField]
+    public EntityUid? Map;
+}

Content.Server/DeltaV/Station/Systems/StationSurfaceSystem.cs

@@ -0,0 +1,40 @@
+using Content.Server.Parallax;
+using Content.Server.Station.Components;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Station.Systems;
+
+public sealed class StationSurfaceSystem : EntitySystem
+{
+    [Dependency] private readonly BiomeSystem _biome = default!;
+    [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<StationSurfaceComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<StationSurfaceComponent> ent, ref MapInitEvent args)
+    {
+        if (ent.Comp.MapPath is not {} path)
+            return;
+
+        var map = _map.CreateMap(out var mapId);
+        if (!_mapLoader.TryLoad(mapId, path.ToString(), out _))
+        {
+            Log.Error($"Failed to load surface map {ent.Comp.MapPath}!");
+            Del(map);
+            return;
+        }
+
+        // loading replaced the map entity with a new one so get the latest id
+        map = _map.GetMap(mapId);
+        _map.SetPaused(map, false);
+
+        _biome.SetEnabled(map); // generate the terrain after the grids loaded to prevent it getting hidden under it
+        ent.Comp.Map = map;
+    }
+}

Resources/Changelog/DeltaVChangelog.yml

@@ -2942,3 +2942,46 @@
   id: 428
   time: '2024-07-10T15:55:58.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1479
+- author: TadJohnson00
+  changes:
+  - message: New security outer clothing for all security roles, as well as proper
+      senior security officers' and cadets' jumpsuits.
+    type: Add
+  - message: Jetpacks are now available in all security suit storage. Thank goodness
+      for increased funding.
+    type: Add
+  - message: Revamped security's clothing and equipment options; all gear is now up
+      to code, and no further outdated equipment will be issued. This includes, most
+      notably, the detective's uniform, which has received a whole makeover.
+    type: Tweak
+  - message: Fixed security hardsuits not allowing you to turn on internals without
+      a mask.
+    type: Fix
+  - message: Head of security's winter coat, warden's winter coat, security winter
+      coat, security departmental winter boots, WizDen-pattern body armour, and some
+      other minor changes necessary for respriting.
+    type: Remove
+  id: 429
+  time: '2024-07-15T06:45:41.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1273
+- author: Bellwether
+  changes:
+  - message: Prosecutors can now lock and unlock Security evidence lockers.
+    type: Tweak
+  id: 430
+  time: '2024-07-17T19:01:03.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1422
+- author: deltanedas
+  changes:
+  - message: Fixed Glacier not being in map votes.
+    type: Fix
+  id: 431
+  time: '2024-07-18T14:17:17.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1503
+- author: deltanedas
+  changes:
+  - message: Mime and Clown lockers now use their respective accesses.
+    type: Tweak
+  id: 432
+  time: '2024-07-19T16:39:36.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1509

Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl

@@ -62,15 +62,15 @@ loadout-group-station-engineer-neck = Station Engineer neck
 loadout-group-atmospheric-technician-neck = Atmospheric Technician neck
 
 # Security
-loadout-group-head-of-security-shoes = Head of Security shoes
-
-loadout-group-security-cadet-head = Security Cadet head
+loadout-group-security-eyes = Security eyes
 loadout-group-security-neck = Security neck
 
-loadout-group-brig-medic-head = Brigmedic head
-loadout-group-brig-medic-jumpsuit = Brigmedic jumpsuit
-loadout-group-brig-medic-back = Brigmedic backpack
+loadout-group-brig-medic-head = Corpsman head
+loadout-group-brig-medic-eyes = Corpsman eyes
 loadout-group-brig-medic-neck = Corpsman neck
+loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit
+loadout-group-brig-medic-back = Corpsman backpack
+loadout-group-brig-medic-outerclothing = Corpsman outer clothing
 
 loadout-group-prison-guard-head = Prison Guard head
 loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit