Merge branch 'master' into Suacy_Sauces

.github/workflows/publish-changelog.yml

@@ -0,0 +1,25 @@
+name: Publish Changelog
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 10 * * *'
+
+jobs:
+ publish_changelog:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: checkout
+      uses: actions/checkout@v3
+      with:
+        token: ${{secrets.GITHUB_TOKEN}}
+        ref: master
+
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+    continue-on-error: true

.github/workflows/publish.yml

@@ -41,41 +41,36 @@ 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
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
         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 }}
+
+    - 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 }}"

.vscode/settings.json

@@ -1,4 +1,10 @@
 {
     "omnisharp.analyzeOpenDocumentsOnly": true,
-    "dotnet.defaultSolution": "SpaceStation14.sln"
+    "dotnet.defaultSolution": "SpaceStation14.sln",
+    "json.schemas": [
+        {
+            "fileMatch": [ "**/meta.json" ],
+            "url": "https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/.github/rsi-schema.json"
+        }
+    ]
 }

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -49,24 +49,23 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
 
     protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
-        if (_playerManager.LocalEntity != alerts.Owner)
-            return;
-
-        SyncAlerts?.Invoke(this, alerts.Comp.Alerts);
+        UpdateHud(alerts);
     }
 
-    protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
+    protected override void AfterClearAlert(Entity<AlertsComponent> alerts)
     {
-        if (_playerManager.LocalEntity != alertsComponent.Owner)
-            return;
+        UpdateHud(alerts);
+    }
 
-        SyncAlerts?.Invoke(this, alertsComponent.Comp.Alerts);
+    private void ClientAlertsHandleState(Entity<AlertsComponent> alerts, ref AfterAutoHandleStateEvent args)
+    {
+        UpdateHud(alerts);
     }
 
-    private void ClientAlertsHandleState(EntityUid uid, AlertsComponent component, ref AfterAutoHandleStateEvent args)
+    private void UpdateHud(Entity<AlertsComponent> entity)
     {
-        if (_playerManager.LocalEntity == uid)
-            SyncAlerts?.Invoke(this, component.Alerts);
+        if (_playerManager.LocalEntity == entity.Owner)
+            SyncAlerts?.Invoke(this, entity.Comp.Alerts);
     }
 
     private void OnPlayerAttached(EntityUid uid, AlertsComponent component, LocalPlayerAttachedEvent args)

Content.Client/Announcements/Systems/AnnouncerSystem.cs

@@ -0,0 +1,69 @@
+using Content.Client.Audio;
+using Content.Shared.Announcements.Events;
+using Content.Shared.Announcements.Systems;
+using Content.Shared.CCVar;
+using Robust.Client.Audio;
+using Robust.Client.Player;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Audio.Sources;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.Announcements.Systems;
+
+public sealed class AnnouncerSystem : SharedAnnouncerSystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
+    [Dependency] private readonly IResourceCache _cache = default!;
+    [Dependency] private readonly IAudioManager _audioManager = default!;
+
+    private IAudioSource? AnnouncerSource { get; set; }
+    private float AnnouncerVolume { get; set; }
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        AnnouncerVolume = _config.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier;
+
+        SubscribeNetworkEvent<AnnouncementSendEvent>(OnAnnouncementReceived);
+        _config.OnValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _config.UnsubValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged);
+    }
+
+
+    private void OnAnnouncerVolumeChanged(float value)
+    {
+        AnnouncerVolume = value;
+
+        if (AnnouncerSource != null)
+            AnnouncerSource.Gain = AnnouncerVolume;
+    }
+
+    private void OnAnnouncementReceived(AnnouncementSendEvent ev)
+    {
+        if (!ev.Recipients.Contains(_player.LocalSession!.UserId)
+            || !_cache.TryGetResource<AudioResource>(GetAnnouncementPath(ev.AnnouncementId, ev.AnnouncerId),
+                out var resource))
+            return;
+
+        var source = _audioManager.CreateAudioSource(resource);
+        if (source != null)
+        {
+            source.Gain = AnnouncerVolume * SharedAudioSystem.VolumeToGain(ev.AudioParams.Volume);
+            source.Global = true;
+        }
+
+        AnnouncerSource?.Dispose();
+        AnnouncerSource = source;
+        AnnouncerSource?.StartPlaying();
+    }
+}

Content.Client/Audio/AmbientSoundSystem.cs

@@ -50,7 +50,6 @@ protected override void QueueUpdate(EntityUid uid, AmbientSoundComponent ambienc
     private static AudioParams _params = AudioParams.Default
         .WithVariation(0.01f)
         .WithLoop(true)
-        .WithAttenuation(Attenuation.LinearDistance)
         .WithMaxDistance(7f);
 
     /// <summary>

Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs

@@ -23,8 +23,8 @@ public sealed partial class ContentAudioSystem
     [Dependency] private readonly IStateManager _stateManager = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
-    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
+    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, 0, 0, 0, false, 0f);
+    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, 0, 0, 0, false, 0f);
 
     /// <summary>
     /// EntityUid of lobby restart sound component.

Content.Client/Audio/ContentAudioSystem.cs

@@ -29,7 +29,8 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float AmbientMusicMultiplier = 3f;
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
-
+    public const float AnnouncerMultiplier = 3f;
+
     public override void Initialize()
     {
         base.Initialize();

Content.Client/Chat/Managers/ChatManager.cs

@@ -47,6 +47,10 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
                     break;
 
+                case ChatSelectChannel.Subtle: // Floofstation
+                    _consoleHost.ExecuteCommand($"subtle \"{CommandParsing.Escape(str)}\"");
+                    break;
+
                 case ChatSelectChannel.Dead:
                     if (_systems.GetEntitySystemOrNull<GhostSystem>() is {IsGhost: true})
                         goto case ChatSelectChannel.Local;
@@ -76,7 +80,7 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     throw new ArgumentOutOfRangeException(nameof(channel), channel, null);
             }
         }
-        //Nyano - Summary: fires off the update permissions script. 
+        //Nyano - Summary: fires off the update permissions script.
         public void UpdatePermissions()
         {
             PermissionsUpdated?.Invoke();

Content.Client/Clothing/ClientClothingSystem.cs

@@ -133,7 +133,7 @@ private bool TryGetDefaultVisuals(EntityUid uid, ClothingComponent clothing, str
         else if (TryComp(uid, out SpriteComponent? sprite))
             rsi = sprite.BaseRSI;
 
-        if (rsi == null || rsi.Path == null)
+        if (rsi == null)
             return false;
 
         var correctedSlot = slot;

Content.Client/Doors/DoorSystem.cs

@@ -4,14 +4,12 @@
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Timing;
 
 namespace Content.Client.Doors;
 
 public sealed class DoorSystem : SharedDoorSystem
 {
     [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IResourceCache _resourceCache = default!;
 
     public override void Initialize()

Content.Client/FurryServers/FurryServersWindow.xaml

@@ -0,0 +1,16 @@
+<ui:FurryServersWindow xmlns="https://spacestation14.io"
+                    xmlns:ui="clr-namespace:Content.Client.FurryServers"
+                    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                    Title="Other Furry Servers..."
+                    MinSize="500 300"
+                    SetSize="500 450">
+    <ScrollContainer HScrollEnabled="False" Margin="4" VerticalExpand="True" ReturnMeasure="True">
+        <BoxContainer Orientation="Vertical">
+            <Label Margin="8 0 0 0" StyleClasses="FurryServersSectionHeader" Align="Center"
+                                Text="BlepStation (LRP)" Name="BlepstationHeader" />
+            <RichTextLabel Margin="8 8 8 8" Name="BlepstationDescription" />
+
+            <Button Name="BlepstationWebsite" Text="Launch Website:  BlepStation.com" />
+        </BoxContainer>
+    </ScrollContainer>
+</ui:FurryServersWindow>

Content.Client/FurryServers/FurryServersWindow.xaml.cs

@@ -0,0 +1,59 @@
+using System.Linq;
+using Content.Client.Administration.Managers;
+using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.EscapeMenu;
+using Content.Shared.Administration;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Console;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Utility;
+
+namespace Content.Client.FurryServers
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class FurryServersWindow : FancyWindow
+    {
+        [Dependency] private readonly IResourceCache _resourceManager = default!;
+        [Dependency] private readonly IUriOpener _uri = default!;
+
+        public FurryServersWindow()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+
+            BlepstationHeader.AddStyleClass(StyleBase.StyleClassLabelHeading);
+            BlepstationHeader.FontColorOverride = Color.FromHex("#7687f2");
+
+            var description = FormattedMessage.FromMarkup(_resourceManager.ContentFileReadAllText($"/FurryServers/Blepstation.txt"));
+            BlepstationDescription.SetMessage(description);
+
+            BlepstationWebsite.OnPressed += _ =>
+            {
+                _uri.OpenUri("https://blepstation.com");
+            };
+        }
+
+        protected override void Opened()
+        {
+            base.Opened();
+        }
+    }
+
+    [UsedImplicitly, AnyCommand]
+    public sealed class FurryServersCommand : IConsoleCommand
+    {
+        public string Command => "furry";
+        public string Description => "Shows list of furry space station 14 servers";
+        public string Help => "Usage: furry";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            IoCManager.Resolve<IUserInterfaceManager>().GetUIController<FurryServersUIController>().OpenWindow();
+        }
+    }
+}