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-2025-03-03-upstream-stable-2

Browse Source 
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
This commit is contained in:
Ed
2025-03-03 23:23:40 +03:00
parent 2855cc906b 3d9ce10f58
commit acc9886242
314 changed files with 5403 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Ghost/GhostSystem.cs
View File

@@ -155,7 +155,7 @@ namespace Content.Client.Ghost
private void OnGhostState(EntityUid uid, GhostComponent component, ref AfterAutoHandleStateEvent args)
{
if (TryComp<SpriteComponent>(uid, out var sprite))
sprite.LayerSetColor(0, component.color);
sprite.LayerSetColor(0, component.Color);
if (uid != _playerManager.LocalEntity)
return;