Merge branch 'master' into add/floating-visuals-update

Content.Client/FlavorText/FlavorText.xaml

@@ -1,5 +1,10 @@
 <Control Name="CFlavorText" xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+        <Label Name="SponsorOnlyNotify" Text="{Loc 'humanoid-profile-editor-flavor-text-sponsor-only'}" StyleClasses="LabelKeyText" Visible="False" />
+        <BoxContainer Name="LimitBox" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 5 0 0">
+            <Label Name="LimitTitle" Text="{Loc 'humanoid-profile-editor-flavor-text-limit'}" StyleClasses="LabelKeyText" Margin="0 0 5 0" />
+            <Label Name="LimitLabel"/>
+        </BoxContainer>
         <TextEdit Name="CFlavorTextInput" Access="Public" MinSize="220 100" Margin="10" HorizontalExpand="True" VerticalExpand="True" />
     </BoxContainer>
 </Control>

Content.Client/FlavorText/FlavorText.xaml.cs

@@ -1,4 +1,5 @@
-using Robust.Client.AutoGenerated;
+using Content.Sunrise.Interfaces.Shared;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
@@ -10,14 +11,40 @@ public sealed partial class FlavorText : Control
     {
         public Action<string>? OnFlavorTextChanged;
 
-        public FlavorText()
+        private ISharedSponsorsManager? _sponsorsMgr;  // Sunrise-Sponsors
+
+        public FlavorText(ISharedSponsorsManager? sponsorsMgr, bool sponsorOnly) // Sunrise-Edit
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
+            _sponsorsMgr = sponsorsMgr;
+
             var loc = IoCManager.Resolve<ILocalizationManager>();
             CFlavorTextInput.Placeholder = new Rope.Leaf(loc.GetString("flavor-text-placeholder"));
             CFlavorTextInput.OnTextChanged  += _ => FlavorTextChanged();
+            // Sunrise-Start
+            if (sponsorOnly)
+            {
+                SponsorOnlyNotify.Visible = true;
+                CFlavorTextInput.Visible = false;
+                LimitBox.Visible = false;
+            }
+            if (_sponsorsMgr != null && _sponsorsMgr.ClientAllowedFlavor())
+            {
+                var maxDescLength = _sponsorsMgr.ClientGetSizeFlavor();
+                LimitLabel.Text = $"{maxDescLength}";
+                SponsorOnlyNotify.Visible = false;
+                CFlavorTextInput.Visible = true;
+                LimitBox.Visible = true;
+            }
+            else
+            {
+                SponsorOnlyNotify.Visible = true;
+                CFlavorTextInput.Visible = false;
+                LimitBox.Visible = false;
+            }
+            // Sunrise-End
         }
 
         public void FlavorTextChanged()

Content.Client/Holiday/HolidayClothingSwapComponent.cs

@@ -0,0 +1,8 @@
+namespace Content.Client.Holiday;
+
+[RegisterComponent]
+public sealed partial class HolidayClothingSwapComponent : Component
+{
+    [DataField]
+    public Dictionary<string, string> Sprite = new();
+}

Content.Client/Holiday/HolidaySystem.cs

@@ -1,3 +1,4 @@
+using Content.Shared.Clothing.EntitySystems;
 using Content.Shared.Holiday;
 using Content.Shared.Item;
 using Robust.Client.GameObjects;
@@ -11,11 +12,13 @@ public sealed class HolidaySystem : EntitySystem
 {
     [Dependency] private readonly IResourceCache _rescache = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly ClothingSystem _clothing = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
     {
         SubscribeLocalEvent<HolidayRsiSwapComponent, AppearanceChangeEvent>(OnAppearanceChange);
+        SubscribeLocalEvent<HolidayClothingSwapComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
     private void OnAppearanceChange(Entity<HolidayRsiSwapComponent> ent, ref AppearanceChangeEvent args)
@@ -31,4 +34,18 @@ private void OnAppearanceChange(Entity<HolidayRsiSwapComponent> ent, ref Appeara
         if (_rescache.TryGetResource(path, out RSIResource? rsi))
             args.Sprite.BaseRSI = rsi.RSI;
     }
+
+    // Sunrise-Start
+    private void OnAppearanceChange(Entity<HolidayClothingSwapComponent> ent, ref AppearanceChangeEvent args)
+    {
+        if (!_appearance.TryGetData<string>(ent, HolidayVisuals.Holiday, out var data, args.Component))
+            return;
+
+        var comp = ent.Comp;
+        if (!comp.Sprite.TryGetValue(data, out var rsistring) || args.Sprite == null)
+            return;
+
+        _clothing.SetVisuals(ent, rsistring);
+    }
+    // Sunrise-End
 }

Content.Client/Holopad/HolopadWindow.xaml

@@ -27,7 +27,11 @@
                 <!-- Header text -->
                 <BoxContainer MinHeight="60" Orientation="Vertical" VerticalAlignment="Center">
                     <Label Name="CallStatusText" Margin="10 5 10 0" ReservesSpace="False"/>
-                    <RichTextLabel Name="CallerIdText" HorizontalAlignment="Center" Margin="0 0 0 0" ReservesSpace="False"/>
+                    <BoxContainer Name="CallerIdContainer" Orientation="Vertical" ReservesSpace="False">
+                        <RichTextLabel Name="CallerIdText" HorizontalAlignment="Center" Margin="0 0 0 0"/>
+                        <Label Text="{Loc 'holopad-window-relay-label'}" Margin="10 10 10 0" ReservesSpace="False"/>
+                        <RichTextLabel Name="HolopadIdText" HorizontalAlignment="Center" Margin="0 0 0 10"/>
+                    </BoxContainer>
                 </BoxContainer>
 
                 <!-- Controls (the answer call button is absent when the phone is not ringing) -->
@@ -68,18 +72,25 @@
                     <PanelContainer Name="HolopadContactListHeaderPanel">
                         <Label Text="{Loc 'holopad-window-select-contact-from-list'}" HorizontalAlignment="Center" Margin="0 3 0 3"/>
                     </PanelContainer>
-                
+
                     <PanelContainer Name="HolopadContactListPanel">
-                        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="8, 8, 8, 8" MinHeight="256">
+                        <BoxContainer Orientation="Vertical">
+
+                            <!-- Contact filter -->
+                            <LineEdit Name="SearchLineEdit" HorizontalExpand="True" Margin="4, 4, 4, 0"
+                                      PlaceHolder="{Loc holopad-window-filter-line-placeholder}" />
 
-                            <!-- If there is no data yet, this will be displayed -->
-                            <BoxContainer Name="FetchingAvailableHolopadsContainer" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="True" ReservesSpace="False">
-                                <Label Text="{Loc 'holopad-window-fetching-contacts-list'}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                            </BoxContainer>
+                            <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="8, 8, 8, 8" MinHeight="256">
 
-                            <!-- Container for the contacts -->
-                            <BoxContainer Name="ContactsList" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 0"/>
-                        </ScrollContainer>
+                                <!-- If there is no data yet, this will be displayed -->
+                                <BoxContainer Name="FetchingAvailableHolopadsContainer" HorizontalAlignment="Center" HorizontalExpand="True" VerticalExpand="True" ReservesSpace="False">
+                                    <Label Text="{Loc 'holopad-window-fetching-contacts-list'}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                </BoxContainer>
+
+                                <!-- Container for the contacts -->
+                                <BoxContainer Name="ContactsList" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="10 0 10 0"/>
+                            </ScrollContainer>
+                        </BoxContainer>
                     </PanelContainer>
                 </BoxContainer>
 

Content.Client/Holopad/HolopadWindow.xaml.cs

@@ -171,8 +171,10 @@ public void UpdateState(Dictionary<NetEntity, string> holopads)
 
         // Caller ID text
         var callerId = _telephoneSystem.GetFormattedCallerIdForEntity(telephone.LastCallerId.Item1, telephone.LastCallerId.Item2, Color.LightGray, "Default", 11);
+        var holoapdId = _telephoneSystem.GetFormattedDeviceIdForEntity(telephone.LastCallerId.Item3, Color.LightGray, "Default", 11);
 
         CallerIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId));
+        HolopadIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(holoapdId));
         LockOutIdText.SetMessage(FormattedMessage.FromMarkupOrThrow(callerId));
 
         // Sort holopads alphabetically
@@ -236,10 +238,13 @@ private void UpdateAppearance()
         // Make / update required children
         foreach (var child in ContactsList.Children)
         {
-            if (child is not HolopadContactButton)
+            if (child is not HolopadContactButton contactButton)
                 continue;
 
-            var contactButton = (HolopadContactButton)child;
+            var passesFilter = string.IsNullOrEmpty(SearchLineEdit.Text) ||
+                               contactButton.Text?.Contains(SearchLineEdit.Text, StringComparison.CurrentCultureIgnoreCase) == true;
+
+            contactButton.Visible = passesFilter;
             contactButton.Disabled = (_currentState != TelephoneState.Idle || lockButtons);
         }
 
@@ -290,7 +295,7 @@ private void UpdateAppearance()
         FetchingAvailableHolopadsContainer.Visible = (ContactsList.ChildCount == 0);
         ActiveCallControlsContainer.Visible = (_currentState != TelephoneState.Idle || _currentUiKey == HolopadUiKey.AiRequestWindow);
         CallPlacementControlsContainer.Visible = !ActiveCallControlsContainer.Visible;
-        CallerIdText.Visible = (_currentState == TelephoneState.Ringing);
+        CallerIdContainer.Visible = (_currentState == TelephoneState.Ringing);
         AnswerCallButton.Visible = (_currentState == TelephoneState.Ringing);
     }
 
@@ -316,6 +321,7 @@ public HolopadContactButton()
             HorizontalExpand = true;
             SetHeight = 32;
             Margin = new Thickness(0f, 1f, 0f, 1f);
+            ReservesSpace = false;
         }
 
         public void UpdateValues(NetEntity netEntity, string label)

Content.Client/Lobby/LobbyUIController.cs

@@ -5,6 +5,7 @@
 using Content.Client.Lobby.UI;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Station;
+using Content.Shared._Sunrise.SunriseCCVars;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
@@ -75,6 +76,12 @@ public override void Initialize()
         {
             _profileEditor?.RefreshFlavorText();
         });
+        // Sunrise-Start
+        _configurationManager.OnValueChanged(SunriseCCVars.FlavorTextSponsorOnly, args =>
+        {
+            _profileEditor?.RefreshFlavorText();
+        });
+        // Sunrise-End
 
         _configurationManager.OnValueChanged(CCVars.GameRoleTimers, _ => RefreshProfileEditor());
 

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -470,7 +470,10 @@ public void RefreshFlavorText()
                 if (_flavorText != null)
                     return;
 
-                _flavorText = new FlavorText.FlavorText();
+                // Sunrise-Start
+                var sponsorOnly = _cfgManager.GetCVar(SunriseCCVars.FlavorTextSponsorOnly);
+                _flavorText = new FlavorText.FlavorText(_sponsorsMgr, sponsorOnly);
+                // Sunrise-End
                 TabContainer.AddChild(_flavorText);
                 TabContainer.SetTabTitle(TabContainer.ChildCount - 1, Loc.GetString("humanoid-profile-editor-flavortext-tab"));
                 _flavorTextEdit = _flavorText.CFlavorTextInput;

Content.Client/Options/UI/OptionsMenu.xaml

@@ -3,11 +3,11 @@
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
+        <tabs:ExtraTab Name="ExtraTab" />
         <tabs:MiscTab Name="MiscTab" />
         <tabs:GraphicsTab Name="GraphicsTab" />
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
         <tabs:AccessibilityTab Name="AccessibilityTab" />
-        <tabs:SunriseTab Name="SunriseTab" />
     </TabContainer>
 </DefaultWindow>

Content.Client/Options/UI/OptionsMenu.xaml.cs

@@ -13,12 +13,14 @@ public OptionsMenu()
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
 
-            Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-misc"));
-            Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics"));
-            Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
-            Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
-            Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility"));
-            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-sunrise"));
+            // Sunrise-Start
+            Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-extra"));
+            Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-misc"));
+            Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-graphics"));
+            Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-controls"));
+            Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-audio"));
+            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-accessibility"));
+            // Sunrise-End
 
             UpdateTabs();
         }

Content.Client/Options/UI/Tabs/SunriseTab.xaml → Content.Client/Options/UI/Tabs/ExtraTab.xaml

@@ -1,4 +1,4 @@
-<tabs:SunriseTab xmlns="https://spacestation14.io"
+<tabs:ExtraTab xmlns="https://spacestation14.io"
                  xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
                  xmlns:ui="clr-namespace:Content.Client.Options.UI">
     <BoxContainer Orientation="Vertical">
@@ -36,4 +36,4 @@
         </ScrollContainer>
         <ui:OptionsTabControlRow Name="Control" Access="Public" />
     </BoxContainer>
-</tabs:SunriseTab>
+</tabs:ExtraTab>

Content.Client/Options/UI/Tabs/SunriseTab.xaml.cs → Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs

@@ -13,12 +13,12 @@
 namespace Content.Client.Options.UI.Tabs;
 
 [GenerateTypedNameReferences]
-public sealed partial class SunriseTab : Control
+public sealed partial class ExtraTab : Control
 {
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    public SunriseTab()
+    public ExtraTab()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);

Content.Client/Physics/Controllers/MoverController.cs

@@ -146,6 +146,9 @@ public override void SetSprinting(Entity<InputMoverComponent> entity, ushort sub
         // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
         base.SetSprinting(entity, subTick, walking);
 
-
+        if (walking && _cfg.GetCVar(CCVars.ToggleWalk))
+            _alerts.ShowAlert(entity, WalkingAlert, showCooldown: false, autoRemove: false);
+        else
+            _alerts.ClearAlert(entity, WalkingAlert);
     }
 }

Content.Client/Stylesheets/StyleNano.cs

@@ -163,6 +163,7 @@ public sealed class StyleNano : StyleBase
         public const string StyleClassCrossButtonRed = "CrossButtonRed";
         public const string StyleClassButtonColorRed = "ButtonColorRed";
         public const string StyleClassButtonColorGreen = "ButtonColorGreen";
+        public const string StyleClassNoStyle = "NoStyle";  // Sunrise-Edit
 
         public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
 
@@ -1722,7 +1723,19 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     new[]
                     {
                         new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png"))
-                    })
+                    }),
+                // Sunrise-Edit
+
+                Element<Button>().Class(StyleClassNoStyle)
+                    .Prop(Button.StylePropertyStyleBox, new StyleBoxFlat
+                    {
+                        BackgroundColor = Color.Transparent,
+                        ContentMarginLeftOverride = 15,
+                        ContentMarginRightOverride = 15,
+                        ContentMarginTopOverride = 12,
+                        ContentMarginBottomOverride = 12
+                    }),
+                // Sunrise-Edit
             }).ToList());
         }
     }

Content.Client/_Sunrise/AssaultOps/AssaultOps/AssaultOpsSystem.cs

@@ -0,0 +1,23 @@
+using Content.Shared._Sunrise.AssaultOps;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Sunrise.AssaultOps.AssaultOps;
+
+public sealed class AssaultOpsSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AssaultOperativeComponent, GetStatusIconsEvent>(GetVampireIcon);
+    }
+
+    private void GetVampireIcon(EntityUid uid, AssaultOperativeComponent component, ref GetStatusIconsEvent args)
+    {
+        var iconPrototype = _prototype.Index(component.StatusIcon);
+        args.StatusIcons.Add(iconPrototype);
+    }
+}