Merge remote-tracking branch 'remotes/origin/master' into maneater

.github/CODEOWNERS

@@ -3,17 +3,17 @@
 # Sorting by path instead of by who added it one day :(
 # this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
 
-/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr
-/Content.*/Administration/ @DrSmugleaf @nikthechampiongr
-/Resources/ServerInfo/ @nikthechampiongr
-/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr
+/Resources/ConfigPresets/WizardsDen/  @nikthechampiongr @crazybrain23
+/Content.*/Administration/ @DrSmugleaf @nikthechampiongr @crazybrain23
+/Resources/ServerInfo/ @nikthechampiongr @crazybrain23
+/Resources/ServerInfo/Guidebook/ServerRules/ @nikthechampiongr @crazybrain23
 
 /Resources/Prototypes/Maps/** @Emisse
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
 /Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr
+/Resources/Prototypes/Guidebook/rules.yml @nikthechampiongr @crazybrain23
 /Content.*/Body/ @DrSmugleaf
 /Content.YAMLLinter @DrSmugleaf
 /Content.Shared/Damage/ @DrSmugleaf
@@ -25,7 +25,7 @@
 
 # SKREEEE
 /Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr
+/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @nikthechampiongr @crazybrain23
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005
 

Content.Client/Buckle/BuckleSystem.cs

@@ -65,7 +65,6 @@ private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref Ap
             !buckled ||
             args.Sprite == null)
         {
-            _rotationVisualizerSystem.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation);
             return;
         }
 

Content.Client/Chat/UI/EmotesMenu.xaml.cs

@@ -35,7 +35,7 @@ public EmotesMenu()
         foreach (var emote in emotes)
         {
             var player = _playerManager.LocalSession?.AttachedEntity;
-            if (emote.Category == EmoteCategory.Invalid ||
+            if (emote.Category == EmoteCategory.Invalid || emote.Category == EmoteCategory.Verb ||
                 emote.ChatTriggers.Count == 0 ||
                 !(player.HasValue && whitelistSystem.IsWhitelistPassOrNull(emote.Whitelist, player.Value)) ||
                 whitelistSystem.IsBlacklistPass(emote.Blacklist, player.Value))

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -264,7 +264,8 @@ private void RemoveMarking(Marking marking, SpriteComponent spriteComp)
             spriteComp.RemoveLayer(index);
         }
     }
-    private void ApplyMarking(MarkingPrototype markingPrototype,
+    // Sunrsie-Edit
+    public void ApplyMarking(MarkingPrototype markingPrototype,
         IReadOnlyList<Color>? colors,
         bool visible,
         HumanoidAppearanceComponent humanoid,

Content.Client/Input/ContentContexts.cs

@@ -58,7 +58,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.Drop);
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
-            human.AddFunction(ContentKeyFunctions.CockGun);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
             human.AddFunction(ContentKeyFunctions.OpenEmotesMenu);
@@ -86,6 +85,13 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
 
+            // Sunrise-Start
+            human.AddFunction(ContentKeyFunctions.ToggleStanding);
+            human.AddFunction(ContentKeyFunctions.CockGun);
+            human.AddFunction(ContentKeyFunctions.Jump);
+            human.AddFunction(ContentKeyFunctions.Reloading);
+            // Sunrise-End
+
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
 

Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs

@@ -36,17 +36,18 @@ public LoadoutContainer(ProtoId<LoadoutPrototype> proto, bool disabled, Formatte
 
         if (_protoManager.TryIndex(proto, out var loadProto))
         {
-            var ent = _entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto);
+            var ent = loadProto.DummyEntity ?? _entManager.System<LoadoutSystem>().GetFirstOrNull(loadProto);
 
-            if (ent != null)
-            {
-                _entity = _entManager.SpawnEntity(ent, MapCoordinates.Nullspace);
-                Sprite.SetEntity(_entity);
+            if (ent == null)
+                return;
 
-                var spriteTooltip = new Tooltip();
-                spriteTooltip.SetMessage(FormattedMessage.FromUnformatted(_entManager.GetComponent<MetaDataComponent>(_entity.Value).EntityDescription));
-                TooltipSupplier = _ => spriteTooltip;
-            }
+            _entity = _entManager.SpawnEntity(ent, MapCoordinates.Nullspace);
+            Sprite.SetEntity(_entity);
+
+            var spriteTooltip = new Tooltip();
+            spriteTooltip.SetMessage(FormattedMessage.FromUnformatted(_entManager.GetComponent<MetaDataComponent>(_entity.Value).EntityDescription));
+
+            TooltipSupplier = _ => spriteTooltip;
         }
     }
 

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

@@ -132,10 +132,12 @@ public LobbyGui()
 
             _configurationManager.OnValueChanged(SunriseCCVars.LobbyOpacity, OnLobbyOpacityChanged);
             _configurationManager.OnValueChanged(SunriseCCVars.ServersHubEnable, OnServersHubEnableChanged);
+            _configurationManager.OnValueChanged(SunriseCCVars.ServiceAuthEnabled, OnServiceAuthEnableChanged);
             _configurationManager.OnValueChanged(SunriseCCVars.ServerName, OnServerNameChanged, true);
 
             SetLobbyOpacity(_configurationManager.GetCVar(SunriseCCVars.LobbyOpacity));
             SetServersHubEnable(_configurationManager.GetCVar(SunriseCCVars.ServersHubEnable));
+            SetUserProfileEnable(_configurationManager.GetCVar(SunriseCCVars.ServiceAuthEnabled));
 
             Chat.SetChatOpacity();
 
@@ -180,10 +182,20 @@ private void OnServersHubEnableChanged(bool enable)
             SetServersHubEnable(enable);
         }
 
+        private void OnServiceAuthEnableChanged(bool enable)
+        {
+            SetUserProfileEnable(enable);
+        }
+
         private void SetServersHubEnable(bool enable)
         {
             ServersHubBox.Visible = enable;
         }
+
+        private void SetUserProfileEnable(bool enable)
+        {
+            UserProfileBox.Visible = enable;
+        }
         // Sunrise-End
 
         private void OnLobbyOpacityChanged(float opacity)

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -177,7 +177,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(EngineKeyFunctions.UseSecondary);
             AddButton(ContentKeyFunctions.UseItemInHand);
             AddButton(ContentKeyFunctions.AltUseItemInHand);
-            AddButton(ContentKeyFunctions.CockGun);
             AddButton(ContentKeyFunctions.ActivateItemInWorld);
             AddButton(ContentKeyFunctions.AltActivateItemInWorld);
             AddButton(ContentKeyFunctions.Drop);
@@ -187,6 +186,13 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.RotateStoredItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
 
+            // Sunrise
+            AddButton(ContentKeyFunctions.ToggleStanding);
+            AddButton(ContentKeyFunctions.CockGun);
+            AddButton(ContentKeyFunctions.Jump);
+            AddButton(ContentKeyFunctions.Reloading);
+            // Sunrise
+
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
             AddButton(ContentKeyFunctions.SmartEquipBelt);

Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs

@@ -28,6 +28,7 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
     public SensorMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
     }
 
     public void UpdateState(ConsoleUIState state)

Content.Client/Standing/StandingStateSystem.cs

@@ -0,0 +1,67 @@
+using Content.Shared.Input;
+using Content.Shared.Rotation;
+using Content.Shared.Standing;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+
+namespace Content.Client.Standing;
+
+public sealed class StandingStateSystem : SharedStandingStateSystem
+{
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding))
+            .Register<SharedStandingStateSystem>();
+
+        SubscribeLocalEvent<RotationVisualsComponent, MoveEvent>(OnMove);
+    }
+
+    private void ToggleStanding(ICommonSession? session)
+    {
+        if (session is not { AttachedEntity: { Valid: true } uid } _
+            || !Exists(uid))
+            return;
+
+        RaiseNetworkEvent(new ChangeLayingDownEvent());
+    }
+
+    private void OnMove(EntityUid uid, RotationVisualsComponent component, ref MoveEvent args)
+    {
+        if (!TryComp<SpriteComponent>(uid, out var sprite) ||
+            !TryComp<AppearanceComponent>(uid, out var appearance) ||
+            !TryComp<TransformComponent>(uid, out var transform) ||
+            component.DefaultRotation == 0)
+            return;
+
+        _appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, appearance);
+
+        var rotation = transform.LocalRotation + _eyeManager.CurrentEye.Rotation;
+        if (rotation.GetDir() is Direction.East or Direction.North or Direction.NorthEast or Direction.SouthEast)
+        {
+            if (state != RotationState.Horizontal ||
+                sprite.Rotation != component.DefaultRotation)
+                return;
+
+            component.HorizontalRotation = Angle.FromDegrees(270);
+            sprite.Rotation = Angle.FromDegrees(270);
+
+            return;
+        }
+
+        if (state != RotationState.Horizontal ||
+            sprite.Rotation != Angle.FromDegrees(270))
+            return;
+
+        component.HorizontalRotation = component.DefaultRotation;
+
+        sprite.Rotation = component.DefaultRotation;
+    }
+}

Content.Client/Tips/TippyUIController.cs

@@ -104,7 +104,7 @@ private Vector2 UpdatePosition(TippyUI tippy, Vector2 screenSize, FrameEventArgs
                 ? -WaddleRotation
                 : WaddleRotation;
 
-            if (EntityManager.TryGetComponent(_entity, out FootstepModifierComponent? step))
+            if (EntityManager.TryGetComponent(_entity, out FootstepModifierComponent? step) && step.FootstepSoundCollection != null)
             {
                 var audioParams = step.FootstepSoundCollection.Params
                     .AddVolume(-7f)

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml

@@ -10,6 +10,7 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
+    xmlns:us="clr-namespace:Content.Client._Sunrise.UserActions"
     Name="SeparatedChatHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -33,6 +34,7 @@
 
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SeparationOverride="10" Margin="10">
                 <menuBar:GameTopMenuBar Name="TopBar" HorizontalExpand="True" Access="Protected" />
+                <us:UserActionsPanel></us:UserActionsPanel>
                 <chat:ChatBox VerticalExpand="True" HorizontalExpand="True" Name="Chat" Access="Protected" MinSize="0 0"/>
             </BoxContainer>
         </PanelContainer>

Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs

@@ -21,7 +21,7 @@ public sealed class EmotesUIController : UIController, IOnStateChanged<GameplayS
     [Dependency] private readonly IClyde _displayManager = default!;
     [Dependency] private readonly IInputManager _inputManager = default!;
 
-    private MenuButton? EmotesButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.EmotesButton;
+    private MenuButton? EmotesButton => null;
     private EmotesMenu? _menu;
 
     public void OnStateEntered(GameplayState state)

Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

@@ -43,6 +43,7 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
+    <!-- not needed because of new emote ui system
     <ui:MenuButton
         Name="EmotesButton"
         Access="Internal"
@@ -53,6 +54,7 @@
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
         />
+    -->
     <ui:MenuButton
         Name="CraftingButton"
         Access="Internal"