juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-29-09-2025-upstream

Browse Source 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/IdentityManagement/IdentitySystem.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
This commit is contained in:
Ed
2025-09-29 14:00:54 +03:00
parent fe0853a1f3 b8ed3f9664
commit d6a8c169b2
500 changed files with 22834 additions and 10208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/UserInterface/Controls/MainViewport.cs
View File

@@ -66,7 +66,8 @@ namespace Content.Client.UserInterface.Controls
Viewport.StretchMode = filterMode switch
{
"nearest" => ScalingViewportStretchMode.Nearest,
"bilinear" => ScalingViewportStretchMode.Bilinear
"bilinear" => ScalingViewportStretchMode.Bilinear,
_ => ScalingViewportStretchMode.Nearest
};
Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;

4
Content.Client/UserInterface/Controls/SplitBar.xaml.cs
View File

@@ -1,4 +1,4 @@
using System.Numerics;
using System.Numerics;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
@@ -19,7 +19,7 @@ namespace Content.Client.UserInterface.Controls
public void Clear()
{
DisposeAllChildren();
RemoveAllChildren();
}
public void AddEntry(float amount, Color color, string? tooltip = null)

2
Content.Client/UserInterface/StatsWindow.xaml.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Client.UserInterface
public void UpdateValues(List<string> headers, List<string[]> values)
{
Values.DisposeAllChildren();
Values.RemoveAllChildren();
Values.Columns = headers.Count;
for (var i = 0; i < headers.Count; i++)

2
Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls
public void Populate()
{
ButtonContainer.DisposeAllChildren();
ButtonContainer.RemoveAllChildren();
AddButtons();
}

16
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
View File

@@ -90,23 +90,25 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
var spriteSystem = sysManager.GetEntitySystem<SpriteSystem>();
var requirementsManager = IoCManager.Resolve<JobRequirementsManager>();
// TODO: role.Requirements value doesn't work at all as an equality key, this must be fixed
// Grouping roles
var groupedRoles = ghostState.GhostRoles.GroupBy(
role => (role.Name, role.Description, role.Requirements));
role => (
role.Name,
role.Description,
// Check the prototypes for role requirements and bans
requirementsManager.IsAllowed(role.RolePrototypes.Item1, role.RolePrototypes.Item2, null, out var reason),
reason));
// Add a new entry for each role group
foreach (var group in groupedRoles)
{
var reason = group.Key.reason;
var name = group.Key.Name;
var description = group.Key.Description;
var hasAccess = requirementsManager.CheckRoleRequirements(
group.Key.Requirements,
null,
out var reason);
var prototypesAllowed = group.Key.Item3;
// Adding a new role
_window.AddEntry(name, description, hasAccess, reason, group, spriteSystem);
_window.AddEntry(name, description, prototypesAllowed, reason, group, spriteSystem);
}
// Restore the Collapsible box state if it is saved

2
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
public void ClearEntries()
{
NoRolesMessage.Visible = true;
EntryContainer.DisposeAllChildren();
EntryContainer.RemoveAllChildren();
_collapsibleBoxes.Clear();
}

4
Content.Client/UserInterface/Systems/Hands/Controls/HandsContainer.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Client.UserInterface.Systems.Inventory.Controls;
using Robust.Client.UserInterface.Controls;
@@ -74,7 +74,7 @@ public sealed class HandsContainer : ItemSlotUIContainer<HandButton>
public void Clear()
{
ClearButtons();
_grid.DisposeAllChildren();
_grid.RemoveAllChildren();
}
public IEnumerable<HandButton> GetButtons()