Upstream sync

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -104,41 +104,12 @@ public void PopulateRecipes()
         RecipeList.Children.Clear();
         foreach (var prototype in sortedRecipesToShow)
         {
-            StringBuilder sb = new();
-            var first = true;
-            foreach (var (id, amount) in prototype.RequiredMaterials)
-            {
-                if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
-                    continue;
-
-                if (first)
-                    first = false;
-                else
-                    sb.Append('\n');
-
-                var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, component.MaterialUseMultiplier);
-                var sheetVolume = _materialStorage.GetSheetVolume(proto);
-
-                var unit = Loc.GetString(proto.Unit);
-                // rounded in locale not here
-                var sheets = adjustedAmount / (float) sheetVolume;
-                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
-                var name = Loc.GetString(proto.Name);
-                sb.Append(Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText)));
-            }
-
-            if (!string.IsNullOrWhiteSpace(prototype.Description))
-            {
-                sb.Append('\n');
-                sb.Append(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
-            }
-
             var icon = prototype.Icon == null
                 ? _spriteSystem.GetPrototypeIcon(prototype.Result).Default
                 : _spriteSystem.Frame0(prototype.Icon);
             var canProduce = _lathe.CanProduce(_owner, prototype, quantity);
 
-            var control = new RecipeControl(prototype, sb.ToString(), canProduce, icon);
+            var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, icon);
             control.OnButtonPressed += s =>
             {
                 if (!int.TryParse(AmountLineEdit.Text, out var amount) || amount <= 0)
@@ -149,6 +120,51 @@ public void PopulateRecipes()
         }
     }
 
+    private string GenerateTooltipText(LatheRecipePrototype prototype)
+    {
+        StringBuilder sb = new();
+
+        foreach (var (id, amount) in prototype.RequiredMaterials)
+        {
+            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto))
+                continue;
+
+            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent<LatheComponent>(_owner).MaterialUseMultiplier);
+            var sheetVolume = _materialStorage.GetSheetVolume(proto);
+
+            var unit = Loc.GetString(proto.Unit);
+            var sheets = adjustedAmount / (float) sheetVolume;
+
+            var availableAmount = _materialStorage.GetMaterialAmount(_owner, id);
+            var missingAmount = Math.Max(0, adjustedAmount - availableAmount);
+            var missingSheets = missingAmount / (float) sheetVolume;
+
+            var name = Loc.GetString(proto.Name);
+
+            string tooltipText;
+            if (missingSheets > 0)
+            {
+                tooltipText = Loc.GetString("lathe-menu-material-amount-missing", ("amount", sheets), ("missingAmount", missingSheets), ("unit", unit), ("material", name));
+            }
+            else
+            {
+                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
+                tooltipText = Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText));
+            }
+
+            sb.AppendLine(tooltipText);
+        }
+
+        if (!string.IsNullOrWhiteSpace(prototype.Description))
+            sb.AppendLine(Loc.GetString("lathe-menu-description-display", ("description", prototype.Description)));
+
+        // Remove last newline
+        if (sb.Length > 0)
+            sb.Remove(sb.Length - 1, 1);
+
+        return sb.ToString();
+    }
+
     public void UpdateCategories()
     {
         var currentCategories = new List<ProtoId<LatheCategoryPrototype>>();

Content.Client/Lathe/UI/RecipeControl.xaml.cs

@@ -11,17 +11,16 @@ namespace Content.Client.Lathe.UI;
 public sealed partial class RecipeControl : Control
 {
     public Action<string>? OnButtonPressed;
+    public Func<string> TooltipTextSupplier;
 
-    public string TooltipText;
-
-    public RecipeControl(LatheRecipePrototype recipe, string tooltip, bool canProduce, Texture? texture = null)
+    public RecipeControl(LatheRecipePrototype recipe, Func<string> tooltipTextSupplier, bool canProduce, Texture? texture = null)
     {
         RobustXamlLoader.Load(this);
 
         RecipeName.Text = recipe.Name;
         RecipeTexture.Texture = texture;
         Button.Disabled = !canProduce;
-        TooltipText = tooltip;
+        TooltipTextSupplier = tooltipTextSupplier;
         Button.TooltipSupplier = SupplyTooltip;
 
         Button.OnPressed += (_) =>
@@ -32,6 +31,6 @@ public RecipeControl(LatheRecipePrototype recipe, string tooltip, bool canProduc
 
     private Control? SupplyTooltip(Control sender)
     {
-        return new RecipeTooltip(TooltipText);
+        return new RecipeTooltip(TooltipTextSupplier());
     }
 }

Content.Client/RCD/RCDMenu.xaml.cs

@@ -1,8 +1,10 @@
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Popups;
 using Content.Shared.RCD;
 using Content.Shared.RCD.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -16,17 +18,24 @@ public sealed partial class RCDMenu : RadialMenu
 {
     [Dependency] private readonly EntityManager _entManager = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
 
     private readonly SpriteSystem _spriteSystem;
+    private readonly SharedPopupSystem _popup;
 
     public event Action<ProtoId<RCDPrototype>>? SendRCDSystemMessageAction;
 
+    private EntityUid _owner;
+
     public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
     {
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
         _spriteSystem = _entManager.System<SpriteSystem>();
+        _popup = _entManager.System<SharedPopupSystem>();
+
+        _owner = owner;
 
         // Find the main radial container
         var main = FindControl<RadialContainer>("Main");
@@ -51,14 +60,21 @@ public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui)
             if (parent == null)
                 continue;
 
-            var name = Loc.GetString(proto.SetName);
-            name = char.ToUpper(name[0]) + name.Remove(0, 1);
+            var tooltip = Loc.GetString(proto.SetName);
+
+            if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) &&
+                proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto))
+            {
+                tooltip = Loc.GetString(entProto.Name);
+            }
+
+            tooltip = char.ToUpper(tooltip[0]) + tooltip.Remove(0, 1);
 
             var button = new RCDMenuButton()
             {
                 StyleClasses = { "RadialMenuButton" },
                 SetSize = new Vector2(64f, 64f),
-                ToolTip = name,
+                ToolTip = tooltip,
                 ProtoId = protoId,
             };
 
@@ -120,6 +136,27 @@ private void AddRCDMenuButtonOnClickActions(Control control)
             castChild.OnButtonUp += _ =>
             {
                 SendRCDSystemMessageAction?.Invoke(castChild.ProtoId);
+
+                if (_playerManager.LocalSession?.AttachedEntity != null &&
+                    _protoManager.TryIndex(castChild.ProtoId, out var proto))
+                {
+                    var msg = Loc.GetString("rcd-component-change-mode", ("mode", Loc.GetString(proto.SetName)));
+
+                    if (proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject)
+                    {
+                        var name = Loc.GetString(proto.SetName);
+
+                        if (proto.Prototype != null &&
+                            _protoManager.TryIndex(proto.Prototype, out var entProto))
+                            name = entProto.Name;
+
+                        msg = Loc.GetString("rcd-component-change-build-mode", ("name", name));
+                    }
+
+                    // Popup message
+                    _popup.PopupClient(msg, _owner, _playerManager.LocalSession.AttachedEntity);
+                }
+
                 Close();
             };
         }

Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs

@@ -56,7 +56,7 @@ public async Task CraftSpear()
 
         // Player's hands should be full of the remaining rods, except those dropped during the failed crafting attempt.
         // Spear and left over stacks should be on the floor.
-        await AssertEntityLookup((Rod, 2), (Cable, 8), (ShardGlass, 2), (Spear, 1));
+        await AssertEntityLookup((Rod, 2), (Cable, 7), (ShardGlass, 2), (Spear, 1));
     }
 
     // The following is wrapped in an if DEBUG. This is because of cursed state handling bugs. Tests don't (de)serialize
@@ -100,7 +100,7 @@ public async Task CancelCraft()
             Assert.That(sys.IsEntityInContainer(rods), Is.False);
             Assert.That(sys.IsEntityInContainer(wires), Is.False);
             Assert.That(rodStack, Has.Count.EqualTo(8));
-            Assert.That(wireStack, Has.Count.EqualTo(8));
+            Assert.That(wireStack, Has.Count.EqualTo(7));
 
             await FindEntity(Spear, shouldSucceed: false);
         });

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -54,6 +54,7 @@ public sealed class PostMapInitTest
 			"CorvaxMaus",
 			"CorvaxIshimura",
 			"CorvaxPaper",
+            "CorvaxSplit",
             // Corvax-End
             "Dev",
             "TestTeg",

Content.Server/Backmen/Research/Oracle/OracleSystem.cs

@@ -74,7 +74,7 @@ public sealed class OracleSystem : EntitySystem
         "BluespaceCrystal",
         "InsulativeHeadcage",
         "CrystalNormality",
-        "BodyBag_Folded",
+        "BodyBagFolded",
         "BodyBag",
         "LockboxDecloner",
         "MopBucket",

Content.Server/Connection/ConnectionManager.cs

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Runtime.InteropServices;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using Content.Corvax.Interfaces.Server;
@@ -12,6 +13,7 @@
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Timing;
 
 
 namespace Content.Server.Connection
@@ -20,6 +22,18 @@ public interface IConnectionManager
     {
         void Initialize();
         Task<bool> HavePrivilegedJoin(NetUserId userId); // Corvax-Queue
+
+        /// <summary>
+        /// Temporarily allow a user to bypass regular connection requirements.
+        /// </summary>
+        /// <remarks>
+        /// The specified user will be allowed to bypass regular player cap,
+        /// whitelist and panic bunker restrictions for <paramref name="duration"/>.
+        /// Bans are not bypassed.
+        /// </remarks>
+        /// <param name="user">The user to give a temporary bypass.</param>
+        /// <param name="duration">How long the bypass should last for.</param>
+        void AddTemporaryConnectBypass(NetUserId user, TimeSpan duration);
     }
 
     /// <summary>
@@ -37,15 +51,32 @@ public sealed class ConnectionManager : IConnectionManager
         private IServerSponsorsManager? _sponsorsMgr; // Corvax-Sponsors
         private IServerVPNGuardManager? _vpnGuardMgr; // Corvax-VPNGuard
 
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
+        private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];
+        private ISawmill _sawmill = default!;
+
         public void Initialize()
         {
             IoCManager.Instance!.TryResolveType(out _sponsorsMgr); // Corvax-Sponsors
+            _sawmill = _logManager.GetSawmill("connections");
+
             _netMgr.Connecting += NetMgrOnConnecting;
             _netMgr.AssignUserIdCallback = AssignUserIdCallback;
             // Approval-based IP bans disabled because they don't play well with Happy Eyeballs.
             // _netMgr.HandleApprovalCallback = HandleApproval;
         }
 
+        public void AddTemporaryConnectBypass(NetUserId user, TimeSpan duration)
+        {
+            ref var time = ref CollectionsMarshal.GetValueRefOrAddDefault(_temporaryBypasses, user, out _);
+            var newTime = _gameTiming.RealTime + duration;
+            // Make sure we only update the time if we wouldn't shrink it.
+            if (newTime > time)
+                time = newTime;
+        }
+
         /*
         private async Task<NetApproval> HandleApproval(NetApprovalEventArgs eventArgs)
         {
@@ -115,6 +146,20 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 hwId = null;
             }
 
+            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
+            if (bans.Count > 0)
+            {
+                var firstBan = bans[0];
+                var message = firstBan.FormatBanMessage(_cfg, _loc);
+                return (ConnectionDenyReason.Ban, message, bans);
+            }
+
+            if (HasTemporaryBypass(userId))
+            {
+                _sawmill.Verbose("User {UserId} has temporary bypass, skipping further connection checks", userId);
+                return null;
+            }
+
             var adminData = await _dbManager.GetAdminDataForAsync(e.UserId);
 
             // Corvax-Start: Allow privileged players bypass bunker
@@ -192,14 +237,6 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null);
             }
 
-            var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
-            if (bans.Count > 0)
-            {
-                var firstBan = bans[0];
-                var message = firstBan.FormatBanMessage(_cfg, _loc);
-                return (ConnectionDenyReason.Ban, message, bans);
-            }
-
             if (_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
                 var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
@@ -220,6 +257,11 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             return null;
         }
 
+        private bool HasTemporaryBypass(NetUserId user)
+        {
+            return _temporaryBypasses.TryGetValue(user, out var time) && time > _gameTiming.RealTime;
+        }
+
         private async Task<NetUserId?> AssignUserIdCallback(string name)
         {
             if (!_cfg.GetCVar(CCVars.GamePersistGuests))
@@ -239,11 +281,14 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
         }
 
         // Corvax-Queue-Start: Make these conditions in one place, for checks in the connection and in the queue
+        [Dependency] private readonly IEntityManager _entityManager = default!;
         public async Task<bool> HavePrivilegedJoin(NetUserId userId)
         {
+            if (HasTemporaryBypass(userId))
+                return true;
             var adminBypass = _cfg.GetCVar(CCVars.AdminBypassMaxPlayers) && await _dbManager.GetAdminDataForAsync(userId) != null;
             var havePriorityJoin = _sponsorsMgr != null && _sponsorsMgr.HavePriorityJoin(userId); // Corvax-Sponsors
-            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
+            var wasInGame = _entityManager.TrySystem<GameTicker>(out var ticker) &&
                             ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
                             status == PlayerGameStatus.JoinedGame;
             return adminBypass ||