Merge remote-tracking branch 'EE-Master/master' into Update-12/17/2024

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

@@ -95,7 +95,8 @@ public HumanoidProfileEditor(
             IPlayerManager playerManager,
             IPrototypeManager prototypeManager,
             JobRequirementsManager requirements,
-            MarkingManager markings)
+            MarkingManager markings
+            )
         {
             RobustXamlLoader.Load(this);
             _cfgManager = cfgManager;
@@ -114,7 +115,8 @@ public HumanoidProfileEditor(
             SaveButton.OnPressed += args => { Save?.Invoke(); };
             ResetButton.OnPressed += args =>
             {
-                SetProfile((HumanoidCharacterProfile?) _preferencesManager.Preferences?.SelectedCharacter,
+                SetProfile(
+                    (HumanoidCharacterProfile?) _preferencesManager.Preferences?.SelectedCharacter,
                     _preferencesManager.Preferences?.SelectedCharacterIndex);
             };
 
@@ -193,12 +195,11 @@ public HumanoidProfileEditor(
 
             #endregion Species
 
-            #region Height
+            #region Height and Width
 
             var prototype = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
 
             UpdateHeightWidthSliders();
-            UpdateDimensions(SliderUpdate.Both);
 
             HeightSlider.OnValueChanged += _ => UpdateDimensions(SliderUpdate.Height);
             WidthSlider.OnValueChanged += _ => UpdateDimensions(SliderUpdate.Width);
@@ -492,7 +493,7 @@ public void RefreshFlavorText()
                 if (_flavorText != null)
                     return;
 
-                _flavorText = new FlavorText.FlavorText();
+                _flavorText = new();
                 _flavorText.OnFlavorTextChanged += OnFlavorTextChange;
                 _flavorTextEdit = _flavorText.CFlavorTextInput;
                 CTabContainer.AddTab(_flavorText, Loc.GetString("humanoid-profile-editor-flavortext-tab"));
@@ -763,11 +764,11 @@ public void RefreshJobs()
                 foreach (var job in jobs)
                 {
                     var jobContainer = new BoxContainer { Orientation = LayoutOrientation.Horizontal, };
-                    var selector = new RequirementsSelector { Margin = new Thickness(3f, 3f, 3f, 0f) };
+                    var selector = new RequirementsSelector { Margin = new(3f, 3f, 3f, 0f) };
 
                     var icon = new TextureRect
                     {
-                        TextureScale = new Vector2(2, 2),
+                        TextureScale = new(2, 2),
                         VerticalAlignment = VAlignment.Center
                     };
                     var jobIcon = _prototypeManager.Index<StatusIconPrototype>(job.Icon);
@@ -1349,21 +1350,26 @@ private void UpdateSpawnPriorityControls()
 
         private void UpdateHeightWidthSliders()
         {
+            if (Profile is null)
+                return;
+
             var species = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
 
             HeightSlider.MinValue = species.MinHeight;
             HeightSlider.MaxValue = species.MaxHeight;
-            HeightSlider.Value = Profile?.Height ?? species.DefaultHeight;
+            HeightSlider.SetValueWithoutEvent(Profile?.Height ?? species.DefaultHeight);
 
             WidthSlider.MinValue = species.MinWidth;
             WidthSlider.MaxValue = species.MaxWidth;
-            WidthSlider.Value = Profile?.Width ?? species.DefaultWidth;
+            WidthSlider.SetValueWithoutEvent(Profile?.Width ?? species.DefaultWidth);
 
             var height = MathF.Round(species.AverageHeight * HeightSlider.Value);
             HeightLabel.Text = Loc.GetString("humanoid-profile-editor-height-label", ("height", (int) height));
 
             var width = MathF.Round(species.AverageWidth * WidthSlider.Value);
             WidthLabel.Text = Loc.GetString("humanoid-profile-editor-width-label", ("width", (int) width));
+
+            UpdateDimensions(SliderUpdate.Both);
         }
 
         private enum SliderUpdate
@@ -1375,9 +1381,10 @@ private enum SliderUpdate
 
         private void UpdateDimensions(SliderUpdate updateType)
         {
-            var species = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
+            if (Profile == null)
+                return;
 
-            if (Profile == null) return;
+            var species = _species.Find(x => x.ID == Profile?.Species) ?? _species.First();
 
             var heightValue = Math.Clamp(HeightSlider.Value, species.MinHeight, species.MaxHeight);
             var widthValue = Math.Clamp(WidthSlider.Value, species.MinWidth, species.MaxWidth);
@@ -1386,13 +1393,12 @@ private void UpdateDimensions(SliderUpdate updateType)
 
             if (updateType == SliderUpdate.Height || updateType == SliderUpdate.Both)
                 if (ratio < 1 / sizeRatio || ratio > sizeRatio)
-                    widthValue = heightValue / (ratio < 1 / sizeRatio ? (1 / sizeRatio) : sizeRatio);
+                    widthValue = heightValue * (ratio < 1 / sizeRatio ? (1 / sizeRatio) : sizeRatio);
 
             if (updateType == SliderUpdate.Width || updateType == SliderUpdate.Both)
                 if (ratio < 1 / sizeRatio || ratio > sizeRatio)
                     heightValue = widthValue * (ratio < 1 / sizeRatio ? (1 / sizeRatio) : sizeRatio);
 
-
             heightValue = Math.Clamp(heightValue, species.MinHeight, species.MaxHeight);
             widthValue = Math.Clamp(widthValue, species.MinWidth, species.MaxWidth);
 

Content.Client/MainMenu/MainMenu.cs

@@ -7,6 +7,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared;
 using Robust.Shared.Configuration;
+using Robust.Shared.Console;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
@@ -25,9 +26,11 @@ public sealed class MainScreen : Robust.Client.State.State
         [Dependency] private readonly IGameController _controllerProxy = default!;
         [Dependency] private readonly IResourceCache _resourceCache = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IConsoleHost _console = default!;
 
         private MainMenuControl _mainMenuControl = default!;
         private bool _isConnecting;
+        private bool _shouldGoLobby;
 
         // ReSharper disable once InconsistentNaming
         private static readonly Regex IPv6Regex = new(@"\[(.*:.*:.*)](?::(\d+))?");
@@ -38,15 +41,27 @@ protected override void Startup()
             _mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager);
             _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
 
+            _client.PlayerJoinedGame += OnPlayerJoinedGame;
+
             _mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;
             _mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed;
             _mainMenuControl.DirectConnectButton.OnPressed += DirectConnectButtonPressed;
+            _mainMenuControl.GoToLobbyButton.OnPressed += GoToLobbyButtonPressed;
             _mainMenuControl.AddressBox.OnTextEntered += AddressBoxEntered;
             _mainMenuControl.ChangelogButton.OnPressed += ChangelogButtonPressed;
 
             _client.RunLevelChanged += RunLevelChanged;
         }
 
+        private void OnPlayerJoinedGame(object? sender, PlayerEventArgs e)
+        {
+            if (_shouldGoLobby)
+            {
+                _console.ExecuteCommand("golobby");
+                _shouldGoLobby = false;
+            }
+        }
+
         /// <inheritdoc />
         protected override void Shutdown()
         {
@@ -77,12 +92,18 @@ private void DirectConnectButtonPressed(BaseButton.ButtonEventArgs args)
             TryConnect(input.Text);
         }
 
+        private void GoToLobbyButtonPressed(BaseButton.ButtonEventArgs obj)
+        {
+            var input = _mainMenuControl.AddressBox;
+            TryConnect(input.Text);
+
+            _shouldGoLobby = true;
+        }
+
         private void AddressBoxEntered(LineEdit.LineEditEventArgs args)
         {
             if (_isConnecting)
-            {
                 return;
-            }
 
             TryConnect(args.Text);
         }
@@ -185,6 +206,7 @@ private void _setConnectingState(bool state)
         {
             _isConnecting = state;
             _mainMenuControl.DirectConnectButton.Disabled = state;
+            _mainMenuControl.GoToLobbyButton.Disabled = state;
         }
     }
 }

Content.Client/MainMenu/UI/MainMenuControl.xaml

@@ -30,6 +30,11 @@
                 Text="{Loc 'main-menu-direct-connect-button'}"
                 TextAlign="Center"
                 StyleIdentifier="mainMenu"/>
+        <Button Name="GoToLobbyButton"
+                Access="Public"
+                Text="{Loc 'main-menu-go-lobby-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
         <Button Name="OptionsButton"
                 Access="Public"
                 Text="{Loc 'main-menu-options-button'}"

Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs

@@ -20,9 +20,9 @@ public SalvageMagnetBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
     protected override void Open()
     {
         base.Open();
-        _window = new OfferingWindow();
+
+        _window = this.CreateWindow<OfferingWindow>();
         _window.Title = Loc.GetString("salvage-magnet-window-title");
-        _window.OnClose += Close;
         _window.OpenCenteredLeft();
     }
 

Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs

@@ -1,6 +1,7 @@
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Actions;
 using Content.Shared.Popups;
+using Content.Shared.Chat;
 using Content.Shared.Psionics.Glimmer;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
@@ -12,7 +13,12 @@
 using System.Linq;
 using Robust.Server.Player;
 using Content.Server.Chat.Managers;
-
+using Robust.Shared.Configuration;
+using Content.Shared.CCVar;
+using Content.Server.NPC.Systems;
+using Content.Server.NPC.HTN;
+using Content.Server.Ghost;
+using Content.Server.Mind;
 namespace Content.Server.Abilities.Psionics
 {
     public sealed class PsionicAbilitiesSystem : EntitySystem
@@ -29,6 +35,10 @@ public sealed class PsionicAbilitiesSystem : EntitySystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly PsionicFamiliarSystem _psionicFamiliar = default!;
+        [Dependency] private readonly IConfigurationManager _config = default!;
+        [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
+        [Dependency] private readonly GhostSystem _ghost = default!;
+        [Dependency] private readonly MindSystem _mind = default!;
 
         private ProtoId<WeightedRandomPrototype> _pool = "RandomPsionicPowerPool";
         private const string GenericInitializationMessage = "generic-power-initialization-feedback";
@@ -178,7 +188,39 @@ public void RefreshPsionicModifiers(EntityUid uid)
         /// </summary>
         public void MindBreak(EntityUid uid)
         {
+            if (!HasComp<PsionicComponent>(uid))
+                return;
+
             RemoveAllPsionicPowers(uid, true);
+            if (_config.GetCVar(CCVars.ScarierMindbreaking))
+                ScarierMindbreak(uid);
+        }
+
+        /// <summary>
+        ///     An even more advanced form of Mindbreaking. Turn the victim into an NPC.
+        ///     For the people who somehow didn't intuit from the absolutely horrifying text that mindbreaking people is very fucking bad.
+        /// </summary>
+        public void ScarierMindbreak(EntityUid uid)
+        {
+            if (!_playerManager.TryGetSessionByEntity(uid, out var session) || session is null)
+                return;
+
+            var feedbackMessage = $"[font size=24][color=#ff0000]{"Your characters personhood has been obliterated. If you wish to continue playing, consider respawning as a new character."}[/color][/font]";
+            _chatManager.ChatMessageToOne(
+                ChatChannel.Emotes,
+                feedbackMessage,
+                feedbackMessage,
+                EntityUid.Invalid,
+                false,
+                session.Channel);
+
+            if (!_mind.TryGetMind(session, out var mindId, out var mind))
+                return;
+
+            _ghost.SpawnGhost((mindId, mind), Transform(uid).Coordinates, false);
+            _npcFaction.AddFaction(uid, "SimpleNeutral");
+            var htn = EnsureComp<HTNComponent>(uid);
+            htn.RootTask = new HTNCompoundTask() { Task = "IdleCompound" };
         }
 
         /// <summary>

Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs

@@ -83,10 +83,9 @@ public void RemoveItem(EntityUid uid, EntityUid mech, EntityUid toRemove, MechGr
         var xform = Transform(toRemove);
         _transform.AttachToGridOrMap(toRemove, xform);
         var (mechPos, mechRot) = _transform.GetWorldPositionRotation(mechxform);
-        var toRemoveWorldPos = _transform.GetWorldPosition(xform);
 
         var offset = mechPos + mechRot.RotateVec(component.DepositOffset);
-        _transform.SetWorldPositionRotation(toRemove, toRemoveWorldPos + offset, Angle.Zero);
+        _transform.SetWorldPositionRotation(toRemove, offset, Angle.Zero);
         _mech.UpdateUserInterface(mech);
     }
 
@@ -157,7 +156,7 @@ private void OnInteract(EntityUid uid, MechGrabberComponent component, UserActiv
 
         args.Handled = true;
         var audio = _audio.PlayPvs(component.GrabSound, uid);
-        
+
         if (audio == null)
             return;
 

Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs

@@ -21,7 +21,7 @@ public override void Effect(ReagentEffectArgs args)
 
             var psySys = args.EntityManager.EntitySysManager.GetEntitySystem<PsionicAbilitiesSystem>();
 
-            psySys.RemoveAllPsionicPowers(args.SolutionEntity, true);
+            psySys.MindBreak(args.SolutionEntity);
         }
     }
 }

Content.Server/Shuttles/Systems/ArrivalsSystem.cs

@@ -489,11 +489,6 @@ private void SetupArrivalsStation()
         {
             var template = _random.Pick(_arrivalsBiomeOptions);
             _biomes.EnsurePlanet(mapUid, _protoManager.Index(template));
-            var restricted = new RestrictedRangeComponent
-            {
-                Range = 32f
-            };
-            AddComp(mapUid, restricted);
         }
 
         _mapManager.DoMapInitialize(mapId);

Content.Shared/CCVar/CCVars.cs

@@ -2795,6 +2795,17 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<bool> PresetAutoVoteEnabled =
             CVarDef.Create("vote.preset_autovote_enabled", true, CVar.SERVERONLY);
 
+        #region Psionics
+
+        /// <summary>
+        ///     When mindbroken, permanently eject the player from their own body, and turn their character into an NPC.
+        ///     Congratulations, now they *actually* aren't a person anymore.
+        ///     For people who complained that it wasn't obvious enough from the text that Mindbreaking is a form of Murder.
+        /// </summary>
+        public static readonly CVarDef<bool> ScarierMindbreaking =
+            CVarDef.Create("psionics.scarier_mindbreaking", false, CVar.SERVERONLY);
+        #endregion
+
         /// <summary>
         /// Set to true to enable the dynamic hostname system.
         /// Automatically updates the hostname to include current map and preset.

Content.Shared/Damage/Components/ClothingSlowOnDamageModifierComponent.cs

@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+/// This is used for a clothing item that modifies the slowdown from taking damage.
+/// Used for entities with <see cref="SlowOnDamageComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SlowOnDamageSystem))]
+public sealed partial class ClothingSlowOnDamageModifierComponent : Component
+{
+    /// <summary>
+    /// A coefficient modifier for the slowdown
+    /// </summary>
+    [DataField]
+    public float Modifier = 1;
+}