NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into centcom-sprites-and-locale

Browse source
This commit is contained in:
_Svist_ 2026-09-30 18:21:30 +04:00
commit c5ce4cc16e
4990 changed files with 70769 additions and 48129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/CODEOWNERS vendored
View file

@ -8,4 +8,4 @@
/Resources/Maps/** @Morb0 @DIMMoon1 @kvant8
# Sprites
/Resources/Textures/** @Morb0 @DIMMoon1 @MureixloI
/Resources/Textures/** @Morb0 @DIMMoon1 @Svist666s

2
.github/labeler.yml vendored
View file

@ -1,4 +1,4 @@
"Changes: Sprites":
"Changes: Sprites":
- changed-files:
- any-glob-to-any-file: '**/*.rsi/*.png'

2
.github/workflows/build-map-renderer.yml vendored
View file

@ -1,4 +1,4 @@
name: Build & Test Map Renderer
name: Build & Test Map Renderer
on:
push:

2
.github/workflows/build-test-debug.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 30
timeout-minutes: 50
steps:
- name: Checkout Master

2
.github/workflows/check-crlf.yml vendored
View file

@ -1,4 +1,4 @@
name: CRLF Check
name: CRLF Check
on:
pull_request:

2
.github/workflows/labeler-needsreview.yml vendored
View file

@ -1,4 +1,4 @@
name: "Labels: Review"
name: "Labels: Review"
on:
pull_request_target:

2
.github/workflows/labeler-pr.yml vendored
View file

@ -1,4 +1,4 @@
name: "Labels: PR"
name: "Labels: PR"
on:
- pull_request_target

2
.github/workflows/labeler-untriaged.yml vendored
View file

@ -1,4 +1,4 @@
name: "Labels: Untriaged"
name: "Labels: Untriaged"
on:
issues:

4
.github/workflows/publish-testing.yml vendored
View file

@ -17,6 +17,8 @@ jobs:
- uses: actions/checkout@v7
with:
submodules: 'recursive'
fetch-depth: 0
filter: blob:none
- name: Setup .NET Core
uses: actions/setup-dotnet@v5
with:
@ -35,7 +37,7 @@ jobs:
- name: Update changelog
run: |
dotnet tool install --global SpaceWizards.ChangelogTool --version 1.0.7
dotnet tool install --global SpaceWizards.ChangelogTool --version 1.0.8
ss14-changelog update -d Resources/Changelog
env:
REPO: ${{ github.repository }}

2
.vscode/launch.json vendored
View file

@ -52,4 +52,4 @@
"preLaunchTask": "build"
}
]
}
}

2
Content.Benchmarks/ComponentQueryBenchmark.cs
View file

@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.IO;
using System.Runtime.CompilerServices;

2
Content.Benchmarks/DestructibleBenchmark.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;

72
Content.Benchmarks/DeviceNetworkingBenchmark.cs
View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
@ -6,7 +6,6 @@ using Content.IntegrationTests;
using Content.IntegrationTests.Pair;
using Content.IntegrationTests.Tests.DeviceNetwork;
using Content.Server.DeviceNetwork.Systems;
using Content.Shared.DeviceNetwork;
using Robust.Shared;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
@ -26,9 +25,6 @@ public class DeviceNetworkingBenchmark
private readonly List<EntityUid> _targetEntities = new();
private readonly List<EntityUid> _targetWirelessEntities = new();
private NetworkPayload _payload = default!;
[TestPrototypes]
private const string Prototypes = @"
- type: entity
@ -54,7 +50,7 @@ public class DeviceNetworkingBenchmark
//public static IEnumerable<int> EntityCountSource { get; set; }
//[ParamsSource(nameof(EntityCountSource))]
public int EntityCount = 500;
public int EntityCount = 1000;
[GlobalSetup]
public async Task SetupAsync()
@ -70,14 +66,6 @@ public class DeviceNetworkingBenchmark
_deviceNetworkSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkSystem>();
_deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
var testValue = "test";
_payload = new NetworkPayload
{
["Test"] = testValue,
["testnumber"] = 1,
["testbool"] = true
};
_sourceEntity = entityManager.SpawnEntity("DummyNetworkDevicePrivate", MapCoordinates.Nullspace);
_sourceWirelessEntity = entityManager.SpawnEntity("DummyWirelessNetworkDevice", MapCoordinates.Nullspace);
@ -120,7 +108,13 @@ public class DeviceNetworkingBenchmark
_pair.Server.Post(() =>
{
_deviceNetworkSystem.QueuePacket(_sourceEntity, null, _payload, 100);
var payload = new TestPayload
{
TestString = "test",
TestNumber = 1,
TestBool = true,
};
_deviceNetworkSystem.SendPacket(_sourceEntity, null, ref payload, 100);
});
await server.WaitRunTicks(1);
@ -134,7 +128,53 @@ public class DeviceNetworkingBenchmark
_pair.Server.Post(() =>
{
_deviceNetworkSystem.QueuePacket(_sourceWirelessEntity, null, _payload, 100);
var payload = new TestPayload
{
TestString = "test",
TestNumber = 1,
TestBool = true,
};
_deviceNetworkSystem.SendPacket(_sourceWirelessEntity, null, ref payload, 100);
});
await server.WaitRunTicks(1);
await server.WaitIdleAsync();
}
[Benchmark(Description = "Device Net Broadcast No Connection Checks (Class payload)")]
public async Task DeviceNetworkBroadcastNoConnectionChecksClass()
{
var server = _pair.Server;
_pair.Server.Post(() =>
{
var payload = new TestPayloadClass
{
TestString = "test",
TestNumber = 1,
TestBool = true,
};
_deviceNetworkSystem.SendPacket(_sourceEntity, null, ref payload, 100);
});
await server.WaitRunTicks(1);
await server.WaitIdleAsync();
}
[Benchmark(Description = "Device Net Broadcast Wireless Connection Checks (Class payload)")]
public async Task DeviceNetworkBroadcastWirelessConnectionChecksClass()
{
var server = _pair.Server;
_pair.Server.Post(() =>
{
var payload = new TestPayloadClass
{
TestString = "test",
TestNumber = 1,
TestBool = true,
};
_deviceNetworkSystem.SendPacket(_sourceWirelessEntity, null, ref payload, 100);
});
await server.WaitRunTicks(1);

2
Content.Benchmarks/HeatCapacityBenchmark.cs
View file

@ -1,4 +1,4 @@
using System.IO;
using System.IO;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using Content.IntegrationTests;

2
Content.Benchmarks/NetSerializerIntBenchmark.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Buffers.Binary;
using System.IO;
using BenchmarkDotNet.Attributes;

2
Content.Benchmarks/Program.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using BenchmarkDotNet.Running;
using BenchmarkDotNet.Configs;
using Robust.Benchmarks.Configs;

2
Content.Benchmarks/PvsBenchmark.cs
View file

@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.IO;
using System.Linq;

2
Content.Benchmarks/RaiseEventBenchmark.cs
View file

@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;

4
Content.Benchmarks/SpawnEquipDeleteBenchmark.cs
View file

@ -1,10 +1,10 @@
using System.IO;
using System.IO;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using Content.IntegrationTests;
using Content.IntegrationTests.Pair;
using Content.Server.Station.Systems;
using Content.Shared.Roles;
using Content.Shared.Station.Systems;
using Robust.Shared;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;

2
Content.Client/Access/AccessOverlay.cs
View file

@ -88,7 +88,7 @@ public sealed class AccessOverlay : Overlay
var accessInfoText = textBuffer.ToString();
var screenPos = args.ViewportControl.WorldToScreen(_transformSystem.GetWorldPosition(transform));
args.ScreenHandle.DrawString(_font, screenPos, accessInfoText, Color.Gold);
args.ScreenHandle.DrawString(_font, screenPos, accessInfoText, 1, Color.Gold, TextOutline.Default);
}
}
}

2
Content.Client/Access/IdCardSystem.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Access.Systems;
using Content.Shared.Access.Systems;
namespace Content.Client.Access;

6
Content.Client/Access/Systems/JobStatusSystem.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Overlays;
using Content.Client.Overlays;
using Content.Shared.Access.Systems;
using Content.Shared.StatusIcon;
using Content.Shared.StatusIcon.Components;
@ -11,8 +11,8 @@ public sealed partial class JobStatusSystem : SharedJobStatusSystem
[Dependency] private ShowJobIconsSystem _showJobIcons = default!;
[Dependency] private ShowCrewIconsSystem _showCrewIcons = default!;
private static readonly ProtoId<SecurityIconPrototype> CrewBorderIcon = "CrewBorderIcon";
private static readonly ProtoId<SecurityIconPrototype> CrewUncertainBorderIcon = "CrewUncertainBorderIcon";
private static readonly ProtoId<StatusIconPrototype> CrewBorderIcon = "CrewBorderIcon";
private static readonly ProtoId<StatusIconPrototype> CrewUncertainBorderIcon = "CrewUncertainBorderIcon";
public override void Initialize()
{

2
Content.Client/Access/UI/AgentIDCardWindow.xaml
View file

@ -38,7 +38,7 @@
<GridContainer Name="JobGroupGrid" Columns="3" />
<!-- Group buttons are generated in code -->
</BoxContainer>
<PanelContainer StyleClasses="LowDivider" VerticalExpand="True" />
<controls:Separator StyleClasses="LowDivider" VerticalExpand="True" Orientation="Vertical" MinHeight="2"/>
<PanelContainer StyleClasses="PanelInsetDark" HorizontalExpand="True">
<BoxContainer Margin="8">
<GridContainer Name="IconGrid" Columns="4" />

8
Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml
View file

@ -1,5 +1,5 @@
<BoxContainer xmlns="https://spacestation14.io"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Orientation="Horizontal"
Margin="10 10 10 10"
VerticalExpand="True"
@ -11,11 +11,7 @@
<!-- Populated with C# code -->
</BoxContainer>
<PanelContainer StyleClasses="LowDivider" VerticalExpand="True" Margin="0 0 0 0" SetWidth="2">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#FFFFFF" />
</PanelContainer.PanelOverride>
</PanelContainer>
<controls:Separator StyleClasses="LowDivider" VerticalExpand="True" SetWidth="2" Orientation="Vertical" MinHeight="2" ColorOverride="#FFFFFF"/>
<!-- Access levels -->
<ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="10 0 0 0">

19
Content.Client/Administration/AdminNameOverlay.cs
View file

@ -2,7 +2,7 @@ using System.Collections.Frozen;
using System.Linq;
using System.Numerics;
using Content.Client.Administration.Systems;
using Content.Client.Stylesheets;
using Content.Client.Stylesheets.Fonts;
using Content.Shared.Administration;
using Content.Shared.CCVar;
using Content.Shared.Ghost.Components;
@ -64,8 +64,9 @@ internal sealed class AdminNameOverlay : Overlay
_prototypeManager = prototypeManager;
ZIndex = 200;
// Setting these to a specific ttf would break the antag symbols
_font = resourceCache.NotoStack();
_fontBold = resourceCache.NotoStack(variation: "Bold");
var fontStack = new NotoFontFamilyStack(resourceCache);
_font = fontStack.GetFont(10);
_fontBold = fontStack.GetFont(10, FontKind.Bold);
config.OnValueChanged(CCVars.AdminOverlayAntagFormat, (show) => { _overlayFormat = UpdateOverlayFormat(show); }, true);
config.OnValueChanged(CCVars.AdminOverlaySymbolStyle, (show) => { _overlaySymbolStyle = UpdateOverlaySymbolStyle(show); }, true);
@ -187,16 +188,18 @@ internal sealed class AdminNameOverlay : Overlay
}
}
var outline = TextOutline.Default with { Color = TextOutline.Default.Color.WithAlpha(alpha) };
// Character name
var color = Color.Aquamarine;
color.A = alpha;
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.CharacterName, uiScale, playerInfo.Connected ? color : colorDisconnected);
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.CharacterName, uiScale, playerInfo.Connected ? color : colorDisconnected, outline);
currentOffset += lineoffset;
// Username
color = Color.Yellow;
color.A = alpha;
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.Username, uiScale, playerInfo.Connected ? color : colorDisconnected);
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.Username, uiScale, playerInfo.Connected ? color : colorDisconnected, outline);
currentOffset += lineoffset;
// Playtime
@ -204,7 +207,7 @@ internal sealed class AdminNameOverlay : Overlay
{
color = Color.Orange;
color.A = alpha;
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.PlaytimeString, uiScale, playerInfo.Connected ? color : colorDisconnected);
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.PlaytimeString, uiScale, playerInfo.Connected ? color : colorDisconnected, outline);
currentOffset += lineoffset;
}
@ -213,7 +216,7 @@ internal sealed class AdminNameOverlay : Overlay
{
color = Color.GreenYellow;
color.A = alpha;
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.StartingJob, uiScale, playerInfo.Connected ? color : colorDisconnected);
args.ScreenHandle.DrawString(_font, screenCoordinates + currentOffset, playerInfo.StartingJob, uiScale, playerInfo.Connected ? color : colorDisconnected, outline);
currentOffset += lineoffset;
}
@ -264,7 +267,7 @@ internal sealed class AdminNameOverlay : Overlay
var label = !string.IsNullOrEmpty(symbol)
? Loc.GetString("player-tab-character-name-antag-symbol", ("symbol", symbol), ("name", text))
: text;
args.ScreenHandle.DrawString(_fontBold, screenCoordinates + currentOffset, label, uiScale, color);
args.ScreenHandle.DrawString(_fontBold, screenCoordinates + currentOffset, label, uiScale, color, outline);
currentOffset += lineoffset;
//Save the coordinates and size of the text block, for stack merge check

2
Content.Client/Administration/AdminOverlayCommand.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Administration.Systems;
using Content.Client.Administration.Systems;
using Content.Shared.Commands;
using Robust.Shared.Console;

6
Content.Client/Administration/AdminQuickInfoSystem.cs
View file

@ -1,3 +1,4 @@
using Content.Client.UserInterface.Controls;
using System.Linq;
using Content.Client.Administration.Systems;
using Content.Client.Stylesheets;
@ -5,7 +6,6 @@ using Content.Shared.Administration;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Console;
using Robust.Shared.Prototypes;
using Robust.Shared.RichText;
using Robust.Shared.Utility;
@ -59,7 +59,7 @@ internal sealed partial class AdminQuickInfoSystem : EntitySystem
public void OpenPopupFor(NetEntity[] entities)
{
var vBox = new VBox() { SeparationOverride = 6 };;
var vBox = new VBox() { SeparationOverride = 6 };
var popup = new Popup
{
Children =
@ -79,7 +79,7 @@ internal sealed partial class AdminQuickInfoSystem : EntitySystem
{
if (!first)
{
vBox.AddChild(new PanelContainer
vBox.AddChild(new Separator
{
StyleClasses = { StyleClass.LowDivider },
HorizontalExpand = true,

2
Content.Client/Administration/Managers/IClientAdminManager.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration;
using Content.Shared.Administration;
namespace Content.Client.Administration.Managers
{

2
Content.Client/Administration/Systems/BwoinkSystem.cs
View file

@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using Content.Shared.Administration;
using JetBrains.Annotations;
using Robust.Shared.Network;

2
Content.Client/Administration/Systems/HeadstandSystem.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.Components;
using Content.Shared.Administration.Components;
using Robust.Client.GameObjects;
namespace Content.Client.Administration.Systems;

2
Content.Client/Administration/Systems/KillSignSystem.cs
View file

@ -1,4 +1,4 @@
using System.Numerics;
using System.Numerics;
using Content.Shared.Administration.Components;
using Robust.Client.GameObjects;
using Robust.Client.Player;

2
Content.Client/Administration/UI/BanList/BanListEui.cs
View file

@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using System.Numerics;
using Content.Client.Administration.UI.BanList.Bans;
using Content.Client.Administration.UI.BanList.RoleBans;

2
Content.Client/Administration/UI/BanList/BanListIdsPopup.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

2
Content.Client/Administration/UI/BanList/BanListWindow.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

5
Content.Client/Administration/UI/BanList/Bans/BanListControl.xaml.cs
View file

@ -1,4 +1,5 @@
using Content.Client.Administration.UI.CustomControls;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Controls;
using Content.Shared.Administration.BanList;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
@ -25,7 +26,7 @@ public sealed partial class BanListControl : Control
foreach (var ban in bans)
{
Bans.AddChild(new HSeparator());
Bans.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
var line = new BanListLine(ban);
line.IdsClicked += LineIdsClicked;

12
Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml
View file

@ -1,6 +1,6 @@
<ContainerButton
<ContainerButton
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
<PanelContainer Name="BackgroundPanel" Access="Public">
<BoxContainer
Orientation="Horizontal"
@ -9,19 +9,19 @@
<Label Text="{Loc ban-list-header-ids}"
SizeFlagsStretchRatio="1"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-reason}"
SizeFlagsStretchRatio="6"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-time}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-expires}"
SizeFlagsStretchRatio="4"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-banning-admin}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>

2
Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

12
Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml
View file

@ -1,6 +1,6 @@
<BoxContainer
<BoxContainer
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Orientation="Horizontal"
HorizontalExpand="True"
SeparationOverride="4">
@ -14,25 +14,25 @@
VerticalExpand="True"
MouseFilter="Pass"/>
</BoxContainer>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="Reason"
Access="Public"
SizeFlagsStretchRatio="6"
HorizontalExpand="True"
VerticalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="BanTime"
Access="Public"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="Expires"
Access="Public"
SizeFlagsStretchRatio="4"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="BanningAdmin"
Access="Public"
SizeFlagsStretchRatio="2"

2
Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.BanList;
using Content.Shared.Administration.BanList;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

2
Content.Client/Administration/UI/BanList/IBanListLine.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.BanList;
using Content.Shared.Administration.BanList;
using Robust.Client.UserInterface.Controls;
namespace Content.Client.Administration.UI.BanList;

5
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListControl.xaml.cs
View file

@ -1,4 +1,5 @@
using Content.Client.Administration.UI.CustomControls;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Controls;
using Content.Shared.Administration.BanList;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
@ -25,7 +26,7 @@ public sealed partial class RoleBanListControl : Control
foreach (var ban in bans)
{
RoleBans.AddChild(new HSeparator());
RoleBans.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
var line = new RoleBanListLine(ban);
line.IdsClicked += LineIdsClicked;

14
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml
View file

@ -1,6 +1,6 @@
<ContainerButton
<ContainerButton
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
<PanelContainer Name="BackgroundPanel" Access="Public">
<BoxContainer
Orientation="Horizontal"
@ -9,23 +9,23 @@
<Label Text="{Loc ban-list-header-ids}"
SizeFlagsStretchRatio="1"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-reason}"
SizeFlagsStretchRatio="4.5"
HorizontalExpand="True"/>
<cc:VSeparator Name="ReasonSeparator" Access="Public"/>
<controls:Separator StyleClasses="LowDivider" Name="ReasonSeparator" Access="Public" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-role}"
SizeFlagsStretchRatio="1.5"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-time}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-expires}"
SizeFlagsStretchRatio="4"
HorizontalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Text="{Loc ban-list-header-banning-admin}"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"/>

2
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListHeader.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

14
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml
View file

@ -1,6 +1,6 @@
<BoxContainer
<BoxContainer
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Orientation="Horizontal"
HorizontalExpand="True"
SeparationOverride="4">
@ -14,30 +14,30 @@
VerticalExpand="True"
MouseFilter="Pass"/>
</BoxContainer>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="Reason"
Access="Public"
SizeFlagsStretchRatio="4.5"
HorizontalExpand="True"
VerticalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="Role"
SizeFlagsStretchRatio="1.5"
HorizontalExpand="True"
VerticalExpand="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="BanTime"
Access="Public"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="Expires"
Access="Public"
SizeFlagsStretchRatio="4"
HorizontalExpand="True"
ClipText="True"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="BanningAdmin"
Access="Public"
SizeFlagsStretchRatio="2"

2
Content.Client/Administration/UI/BanList/RoleBans/RoleBanListLine.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.BanList;
using Content.Shared.Administration.BanList;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

3
Content.Client/Administration/UI/BanPanel/BanPanel.xaml
View file

@ -1,6 +1,7 @@
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc ban-panel-title}" MinSize="410 500">
<BoxContainer Orientation="Vertical">
<TabContainer Name="Tabs" VerticalExpand="True">
@ -35,7 +36,7 @@
<Label Text="{Loc ban-panel-severity}" />
<OptionButton Name="SeverityOption" />
</BoxContainer>
<cc:HSeparator Margin="1"/>
<controls:Separator StyleClasses="LowDivider" Margin="1"/>
<TextEdit Name="ReasonTextEdit" MinHeight="100" VerticalExpand="True" HorizontalExpand="True" />
</BoxContainer>
<!-- Player List -->

5
Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
View file

@ -2,7 +2,8 @@ using System.Linq;
using System.Net;
using System.Net.Sockets;
using System.Numerics;
using Content.Client.Administration.UI.CustomControls;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Controls;
using Content.Shared.Administration;
using Content.Shared.CCVar;
using Content.Shared.Database;
@ -218,7 +219,7 @@ public sealed partial class BanPanel : DefaultWindow
}
});
RolesContainer.AddChild(outerContainer);
RolesContainer.AddChild(new HSeparator());
RolesContainer.AddChild(new Separator { StyleClasses = { StyleClass.LowDivider } });
}
private Button CreateRoleGroupHeader(string groupName, BoxContainer header, Color color, GridContainer innerContainer)

2
Content.Client/Administration/UI/CustomControls/AdminLogImpactButton.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.Logs;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Robust.Client.UserInterface.Controls;

7
Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs
View file

@ -1,4 +1,5 @@
using Content.Shared.Administration.Logs;
using Content.Client.UserInterface.Controls;
using Content.Shared.Administration.Logs;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
@ -6,7 +7,7 @@ namespace Content.Client.Administration.UI.CustomControls;
public sealed class AdminLogLabel : RichTextLabel
{
public AdminLogLabel(ref SharedAdminLog log, HSeparator separator)
public AdminLogLabel(ref SharedAdminLog log, Separator separator)
{
Log = log;
Separator = separator;
@ -19,7 +20,7 @@ public sealed class AdminLogLabel : RichTextLabel
public new SharedAdminLog Log { get; }
public HSeparator Separator { get; }
public Separator Separator { get; }
private void VisibilityChanged(Control control)
{

2
Content.Client/Administration/UI/CustomControls/AdminLogPlayerButton.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using Robust.Client.UserInterface.Controls;
namespace Content.Client.Administration.UI.CustomControls;

2
Content.Client/Administration/UI/CustomControls/AdminLogTypeButton.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.Logs;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Robust.Client.UserInterface.Controls;

25
Content.Client/Administration/UI/CustomControls/HSeparator.cs
View file

@ -1,25 +0,0 @@
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Maths;
namespace Content.Client.Administration.UI.CustomControls;
public sealed class HSeparator : Control
{
private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
public HSeparator(Color color)
{
AddChild(new PanelContainer
{
PanelOverride = new StyleBoxFlat
{
BackgroundColor = color,
ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2
}
});
}
public HSeparator() : this(SeparatorColor) { }
}

2
Content.Client/Administration/UI/CustomControls/UICommandButton.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;

26
Content.Client/Administration/UI/CustomControls/VSeparator.cs
View file

@ -1,26 +0,0 @@
using System.Numerics;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Maths;
namespace Content.Client.Administration.UI.CustomControls;
public sealed class VSeparator : PanelContainer
{
private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
public VSeparator(Color color)
{
MinSize = new Vector2(2, 5);
AddChild(new PanelContainer
{
PanelOverride = new StyleBoxFlat
{
BackgroundColor = color
}
});
}
public VSeparator() : this(SeparatorColor) { }
}

2
Content.Client/Administration/UI/EventLog/AdminEventLogEui.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Eui;
using Content.Client.Eui;
using Content.Shared.Administration.AdminEventLog;
using Content.Shared.Eui;
using JetBrains.Annotations;

8
Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
View file

@ -1,5 +1,5 @@
<Control xmlns="https://spacestation14.io"
xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls">
<Control xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
<PanelContainer StyleClasses="BackgroundDark">
<BoxContainer Orientation="Horizontal">
<BoxContainer Orientation="Vertical">
@ -24,7 +24,7 @@
<BoxContainer Name="TypesContainer" Access="Public" Orientation="Vertical"/>
</ScrollContainer>
</BoxContainer>
<aui:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<BoxContainer Orientation="Vertical" MinWidth="200">
<LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
@ -40,7 +40,7 @@
<BoxContainer Name="PlayersContainer" Access="Public" Orientation="Vertical"/>
</ScrollContainer>
</BoxContainer>
<aui:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
</BoxContainer>
</BoxContainer>
<BoxContainer Orientation="Vertical" HorizontalExpand="True">

6
Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
View file

@ -1,6 +1,8 @@
using System.Linq;
using System.Linq;
using System.Runtime.InteropServices;
using Content.Client.Administration.UI.CustomControls;
using Content.Client.Stylesheets;
using Content.Client.UserInterface.Controls;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Robust.Client.AutoGenerated;
@ -486,7 +488,7 @@ public sealed partial class AdminLogsControl : Control
for (var i = 0; i < span.Length; i++)
{
ref var log = ref span[i];
var separator = new HSeparator();
var separator = new Separator { StyleClasses = { StyleClass.LowDivider } };
var label = new AdminLogLabel(ref log, separator);
label.Visible = ShouldShowLog(label);

2
Content.Client/Administration/UI/Logs/AdminLogsEui.cs
View file

@ -1,4 +1,4 @@
using System.IO;
using System.IO;
using System.Linq;
using Content.Client.Administration.UI.CustomControls;
using Content.Client.Eui;

2
Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

14
Content.Client/Administration/UI/Notes/AdminNotesLine.xaml
View file

@ -1,23 +1,23 @@
<BoxContainer xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Orientation="Vertical">
<BoxContainer Name ="MetadataContainer" Orientation="Horizontal">
<TextureRect Name="SeverityRect" Margin="2"/>
<Label Name="TimeLabel" Margin="4 0" />
<cc:HSeparator Margin="4 0" />
<controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
<Label Name="ServerLabel" />
<cc:HSeparator Margin="4 0" />
<controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
<Label Name="RoundLabel" />
<cc:HSeparator Margin="4 0" />
<controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
<Label Name="AdminLabel" />
<cc:HSeparator Margin="4 0" />
<controls:Separator StyleClasses="LowDivider" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
<Label Name="PlaytimeLabel" />
<cc:HSeparator Name="SecretSeparator" Visible="False" Margin="4 0" />
<controls:Separator StyleClasses="LowDivider" Name="SecretSeparator" Visible="False" Margin="4 0" Orientation="Vertical" MinHeight="2"/>
<Label Name="SecretLabel" Text="{Loc admin-notes-secret} " Visible="False" />
</BoxContainer>
<RichTextLabel Name="NoteLabel" />
<Label Name="ExpiresLabel" Text="{Loc admin-note-editor-expiry-label}" Visible="False" />
<Label Name="ExtraLabel" Visible="False" Modulate="#1AA7EC" />
<Label Name="EditedLabel" Visible="False" />
<cc:HSeparator Name="Separator" />
<controls:Separator StyleClasses="LowDivider" Name="Separator"/>
</BoxContainer>

2
Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration.Notes;
using Content.Shared.Administration.Notes;
using Content.Shared.Database;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;

2
Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
View file

@ -362,4 +362,4 @@ public sealed partial class NoteEdit : FancyWindow
SubmitPressed = null;
}
}
}

35
Content.Client/Administration/UI/PermissionsEui.cs
View file

@ -211,16 +211,7 @@ namespace Content.Client.Administration.UI
var al = _menu.AdminsList;
var name = admin.UserName ?? admin.UserId.ToString();
al.AddChild(new Label { Text = name });
var titleControl = new Label { Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant() };
if (admin.Title == null) // none
{
titleControl.StyleClasses.Add(StyleClass.Italic);
}
al.AddChild(titleControl);
// Compute rank and combined flags first so we can create the edit button before other columns.
bool italic;
string rank;
var combinedFlags = admin.PosFlags;
@ -237,6 +228,25 @@ namespace Content.Client.Administration.UI
rank = Loc.GetString("permissions-eui-edit-no-rank-text").ToLowerInvariant();
}
var editButton = new Button { Text = Loc.GetString("permissions-eui-edit-title-button") };
editButton.OnPressed += _ => OnEditPressed(admin);
// Add the edit button as the first column
al.AddChild(editButton);
// Name (C-key)
al.AddChild(new Label { Text = name });
// Prefix / Title
var titleControl = new Label { Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant() };
if (admin.Title == null) // none
{
titleControl.StyleClasses.Add(StyleClass.Italic);
}
al.AddChild(titleControl);
// Rank
var rankControl = new Label { Text = rank };
if (italic)
{
@ -245,6 +255,7 @@ namespace Content.Client.Administration.UI
al.AddChild(rankControl);
// Flags / Additional rights
var flagsText = AdminFlagsHelper.PosNegFlagsText(admin.PosFlags, admin.NegFlags);
al.AddChild(new Label
@ -254,10 +265,6 @@ namespace Content.Client.Administration.UI
HorizontalAlignment = Control.HAlignment.Center,
});
var editButton = new Button { Text = Loc.GetString("permissions-eui-edit-title-button") };
editButton.OnPressed += _ => OnEditPressed(admin);
al.AddChild(editButton);
if (!_adminManager.HasFlag(combinedFlags))
{
editButton.Disabled = true;

4
Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
View file

@ -113,7 +113,7 @@ public sealed partial class ExplosionDebugOverlay : Overlay
else
screenCenter += new Vector2(-8, -8);
handle.DrawString(_font, screenCenter, Intensity[i].ToString("F2"));
handle.DrawString(_font, screenCenter, Intensity[i].ToString("F2"), 1, Color.White, TextOutline.Default);
}
}
@ -123,7 +123,7 @@ public sealed partial class ExplosionDebugOverlay : Overlay
var worldCenter = Vector2.Transform((epicenter + Vector2Helpers.Half) * tileSize, transform);
var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
handle.DrawString(_font, screenCenter, text);
handle.DrawString(_font, screenCenter, text, 1, Color.White, TextOutline.Default);
}
}

5
Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml
View file

@ -6,10 +6,9 @@
<BoxContainer Orientation="Horizontal" HorizontalExpand="True">
<LineEdit Name="_callShuttleTime" Text="4:00" PlaceHolder="m:ss" HorizontalExpand="True" SizeFlagsStretchRatio="2"/>
<Control HorizontalExpand="True" SizeFlagsStretchRatio="1"/>
<cc:CommandButton Command="callshuttle 4:00" Name="_callShuttleButton" Text="{Loc 'comms-console-menu-call-shuttle'}" HorizontalExpand="True" SizeFlagsStretchRatio="2" />
<!-- Corvax: Move button -->
<cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'comms-console-menu-recall-shuttle'}" HorizontalAlignment="Center" SizeFlagsStretchRatio="3" />
<cc:CommandButton Command="callshuttle 4:00" Name="_callShuttleButton" Text="{Loc 'admin-shuttle-window-call-shuttle'}" HorizontalExpand="True" SizeFlagsStretchRatio="2" />
</BoxContainer>
<cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'admin-shuttle-window-recall-shuttle'}" HorizontalAlignment="Center"/>
</BoxContainer>
</DefaultWindow>

33
Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs
View file

@ -1,31 +1,26 @@
using System;
using Content.Shared.Localizations;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
namespace Content.Client.Administration.UI.Tabs.AdminTab
namespace Content.Client.Administration.UI.Tabs.AdminTab;
[GenerateTypedNameReferences]
public sealed partial class AdminShuttleWindow : DefaultWindow
{
[GenerateTypedNameReferences]
public sealed partial class AdminShuttleWindow : DefaultWindow
public AdminShuttleWindow()
{
public AdminShuttleWindow()
{
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
_callShuttleTime.OnTextChanged += CallShuttleTimeOnOnTextChanged;
}
_callShuttleTime.OnTextChanged += CallShuttleTimeOnOnTextChanged;
}
private void CallShuttleTimeOnOnTextChanged(LineEdit.LineEditEventArgs obj)
{
var loc = IoCManager.Resolve<ILocalizationManager>();
_callShuttleButton.Disabled = !TimeSpan.TryParseExact(obj.Text, ContentLocalizationManager.TimeSpanMinutesFormats, loc.DefaultCulture, out _);
_callShuttleButton.Command = $"callshuttle {obj.Text}";
}
private void CallShuttleTimeOnOnTextChanged(LineEdit.LineEditEventArgs obj)
{
var loc = IoCManager.Resolve<ILocalizationManager>();
_callShuttleButton.Disabled = !TimeSpan.TryParseExact(obj.Text, ContentLocalizationManager.TimeSpanMinutesFormats, loc.DefaultCulture, out _);
_callShuttleButton.Command = $"callshuttle {obj.Text}";
}
}

2
Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
namespace Content.Client.Administration.UI.Tabs.AdminTab

2
Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Administration.Managers;
using Content.Client.Administration.Managers;
using Content.Client.UserInterface.Systems.DecalPlacer;
using Content.Shared.Administration;
using Robust.Client.AutoGenerated;

2
Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
namespace Content.Client.Administration.UI.Tabs.AtmosTab

7
Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml
View file

@ -1,5 +1,4 @@
<Control xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
<Control xmlns="https://spacestation14.io"
xmlns:ot="clr-namespace:Content.Client.Administration.UI.Tabs.ObjectsTab"
xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
<BoxContainer Orientation="Vertical">
@ -10,10 +9,10 @@
SizeFlagsStretchRatio="1" />
<Button Name="RefreshListButton" Text="{Loc object-tab-refresh-button}" ToggleMode="False" />
</BoxContainer>
<cc:HSeparator />
<co:Separator StyleClasses="LowDivider" MinWidth="2" />
<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
<ot:ObjectsTabHeader Name="ListHeader" />
<cc:HSeparator />
<co:Separator StyleClasses="LowDivider" MinWidth="2" />
<co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True" />
</BoxContainer>
</BoxContainer>

6
Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
View file

@ -1,6 +1,6 @@
using Content.Client.Administration.Managers;
using Content.Client.Station;
using Content.Client.UserInterface.Controls;
using Content.Shared.Station.Systems;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
using Robust.Client.Graphics;
@ -79,7 +79,7 @@ public sealed partial class ObjectsTab : Control
// teleport to the station's largest grid, not to the station entity (which is in nullspace)
if (!_entityManager.TryGetEntity(nent, out var station))
break;
var largestGrid = _entityManager.EntitySysManager.GetEntitySystem<StationSystem>().GetLargestGrid(station.Value);
var largestGrid = _entityManager.System<StationSystem>().GetLargestGrid(station.Value);
if (largestGrid == null)
break;
_console.ExecuteCommand($"tpto {largestGrid.Value}");
@ -107,7 +107,7 @@ public sealed partial class ObjectsTab : Control
switch (selection)
{
case ObjectsTabSelection.Stations:
entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().GetStationNames());
entities.AddRange(_entityManager.System<StationSystem>().GetStationNames());
break;
case ObjectsTabSelection.Grids:
{

9
Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
View file

@ -1,5 +1,4 @@
<PanelContainer xmlns="https://spacestation14.io"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
<PanelContainer xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Name="BackgroundColorPanel">
<BoxContainer Orientation="Horizontal"
@ -9,18 +8,18 @@
SizeFlagsStretchRatio="5"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="EIDLabel"
SizeFlagsStretchRatio="5"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Button Name="TeleportButton"
Text="{Loc object-tab-entity-teleport}"
SizeFlagsStretchRatio="3"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<controls:ConfirmButton Name="DeleteButton"
Text="{Loc object-tab-entity-delete}"
SizeFlagsStretchRatio="3"

4
Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml
View file

@ -1,5 +1,5 @@
<Control xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
<PanelContainer Name="BackgroundColorPanel" Access="Public"/>
<BoxContainer Orientation="Horizontal"
HorizontalExpand="True"
@ -10,7 +10,7 @@
ClipText="True"
Text="{Loc object-tab-object-name}"
MouseFilter="Pass"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="EntityIDLabel"
SizeFlagsStretchRatio="5"
HorizontalExpand="True"

2
Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerStatusWindow.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

2
Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Corvax.Interfaces.Shared;
using Content.Corvax.Interfaces.Shared;
using Content.Shared.Administration.Events;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;

5
Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml
View file

@ -1,6 +1,5 @@
<Control xmlns="https://spacestation14.io"
<Control xmlns="https://spacestation14.io"
xmlns:pt="clr-namespace:Content.Client.Administration.UI.Tabs.PlayerTab"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:co="clr-namespace:Content.Client.UserInterface.Controls">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
@ -13,7 +12,7 @@
</BoxContainer>
<Control MinSize="0 5"/>
<pt:PlayerTabHeader Name="ListHeader"/>
<cc:HSeparator/>
<co:Separator StyleClasses="LowDivider" MinWidth="2" />
<co:SearchListContainer Name="SearchList" Access="Public" VerticalExpand="True"/>
</BoxContainer>
</Control>

12
Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
View file

@ -1,5 +1,5 @@
<PanelContainer xmlns="https://spacestation14.io"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
<PanelContainer xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Name="BackgroundColorPanel">
<BoxContainer Orientation="Horizontal"
HorizontalExpand="True"
@ -8,22 +8,22 @@
SizeFlagsStretchRatio="3"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="CharacterLabel"
SizeFlagsStretchRatio="3"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="JobLabel"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="RoleTypeLabel"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"/>
<customControls:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="OverallPlaytimeLabel"
SizeFlagsStretchRatio="1"
HorizontalExpand="True"

2
Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Administration;
using Content.Shared.Administration;
using Content.Shared.Mind;
using Content.Shared.Roles;
using Robust.Client.AutoGenerated;

12
Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
View file

@ -1,5 +1,5 @@
<Control xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
<Control xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
<PanelContainer Name="BackgroundColorPanel" Access="Public"/>
<BoxContainer Orientation="Horizontal"
HorizontalExpand="True"
@ -10,28 +10,28 @@
ClipText="True"
Text="{Loc player-tab-username}"
MouseFilter="Pass"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="CharacterLabel"
SizeFlagsStretchRatio="3"
HorizontalExpand="True"
ClipText="True"
Text="{Loc player-tab-character}"
MouseFilter="Pass"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="JobLabel"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"
Text="{Loc player-tab-job}"
MouseFilter="Pass"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="RoleTypeLabel"
SizeFlagsStretchRatio="2"
HorizontalExpand="True"
ClipText="True"
Text="{Loc player-tab-roletype}"
MouseFilter="Pass"/>
<cc:VSeparator/>
<controls:Separator StyleClasses="LowDivider" Orientation="Vertical" MinHeight="5"/>
<Label Name="PlaytimeLabel"
SizeFlagsStretchRatio="1"
HorizontalExpand="True"

2
Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

2
Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;

2
Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
View file

@ -1,4 +1,4 @@
using System.Globalization;
using System.Globalization;
using Content.Shared.CCVar;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;

2
Content.Client/Animations/EntityPickupAnimationComponent.cs
View file

@ -1,4 +1,4 @@
namespace Content.Client.Animations;
namespace Content.Client.Animations;
/// <summary>
/// Applied to client-side clone entities to animate them approaching the player that

2
Content.Client/Animations/EntityPickupAnimationSystem.cs
View file

@ -1,4 +1,4 @@
using System.Numerics;
using System.Numerics;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Shared.Animations;

2
Content.Client/Anomaly/Effects/GravityAnomalySystem.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Anomaly.Effects;
using Content.Shared.Anomaly.Effects;
namespace Content.Client.Anomaly.Effects;

2
Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml
View file

@ -49,7 +49,7 @@
<!-- Footer -->
<BoxContainer Orientation="Vertical">
<PanelContainer StyleClasses="LowDivider" />
<controls:Separator StyleClasses="LowDivider"/>
<BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
<Label Text="{Loc 'anomaly-generator-flavor-left'}" StyleClasses="WindowFooterText" />
<Label Text="{Loc 'anomaly-generator-flavor-right'}" StyleClasses="WindowFooterText"

2
Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Message;
using Content.Client.Message;
using Content.Shared.Anomaly;
using Robust.Client.AutoGenerated;
using Robust.Client.GameObjects;

2
Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Message;
using Content.Client.Message;
using Content.Client.UserInterface.Controls;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;

32
Content.Client/Antag/ClientAntagSelectionSystem.cs Normal file
View file

@ -0,0 +1,32 @@
using Content.Shared.Antag;
using Content.Shared.Antag.Components;
using Content.Shared.Roles;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Client.Antag;
/// <inheritdoc/>
public sealed partial class ClientAntagSelectionSystem : AntagSelectionSystem
{
public override void SendBriefing(ICommonSession? session, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
{
}
public override IEnumerable<ProtoId<AntagPrototype>> GetValidAntagPreferences(ICommonSession session, List<ProtoId<AntagPrototype>>? filter = null)
{
yield break;
}
public override bool IsAntagBanned(ICommonSession session, AntagSpecifierPrototype definition)
{
return false;
}
protected override Entity<AntagSelectionComponent>? ForceGetGameRuleEnt<T>(string id)
{
return null;
}
}

5
Content.Client/Arcade/SpaceVillainArcadeMenu.xaml
View file

@ -1,5 +1,6 @@
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'spacevillain-menu-title'}"
MinWidth="540"
MinHeight="225">
@ -33,8 +34,8 @@
</BoxContainer>
</BoxContainer>
<!-- Divider -->
<PanelContainer
StyleClasses="LowDivider"/>
<controls:Separator
StyleClasses="LowDivider" Orientation="Vertical" MinHeight="2"/>
<!-- Villain -->
<BoxContainer
Orientation="Vertical"

2
Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Arcade;
using Content.Shared.Arcade;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;

2
Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
View file

@ -1,4 +1,4 @@
using Robust.Client.GameObjects;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;

2
Content.Client/Armor/ArmorSystem.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Armor;
using Content.Shared.Armor;
namespace Content.Client.Armor;

2
Content.Client/Atmos/Components/MaxPressureVisualsComponent.cs
View file

@ -1,4 +1,4 @@
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.EntitySystems;
namespace Content.Client.Atmos.Components;

15
Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
View file

@ -1,4 +1,5 @@
using Content.Client.Stylesheets;
using Content.Client.Stylesheets.Palette;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.EntitySystems;
@ -135,7 +136,7 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
{
Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
FontOverride = normalFont,
FontColorOverride = StyleNano.DisabledFore,
FontColorOverride = Palettes.Neutral.Base,
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center,
HorizontalExpand = true,
@ -175,13 +176,13 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
public void SetAsFocus()
{
FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
FocusButton.AddStyleClass(StyleClass.Positive);
ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
}
public void RemoveAsFocus()
{
FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
FocusButton.RemoveStyleClass(StyleClass.Positive);
ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
FocusContainer.Visible = false;
}
@ -191,13 +192,13 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
switch (alarmType)
{
case AtmosAlarmType.Normal:
return StyleNano.GoodGreenFore;
return Palettes.Status.Good;
case AtmosAlarmType.Warning:
return StyleNano.ConcerningOrangeFore;
return Palettes.Status.Warning;
case AtmosAlarmType.Danger:
return StyleNano.DangerousRedFore;
return Palettes.Status.Critical;
}
return StyleNano.DisabledFore;
return Palettes.Neutral.Base;
}
}

2
Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml
View file

@ -94,7 +94,7 @@
<!-- Footer -->
<BoxContainer Orientation="Vertical">
<PanelContainer StyleClasses="LowDivider" />
<controls:Separator StyleClasses="LowDivider"/>
<BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
<Label Text="{Loc 'atmos-alerts-window-flavor-left'}" StyleClasses="WindowFooterText" />
<Label Text="{Loc 'atmos-alerts-window-flavor-right'}" StyleClasses="WindowFooterText"

6
Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
View file

@ -1,6 +1,6 @@
using Content.Client.Message;
using Content.Client.Pinpointer.UI;
using Content.Client.Stylesheets;
using Content.Client.Stylesheets.Palette;
using Content.Client.UserInterface.Controls;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.Monitor;
@ -49,8 +49,8 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
private Color _monitorBlipColor = Color.Cyan;
private Color _untrackedEntColor = Color.DimGray;
private Color _regionBaseColor = new Color(154, 154, 154);
private Color _inactiveColor = StyleNano.DisabledFore;
private Color _statusTextColor = StyleNano.GoodGreenFore;
private Color _inactiveColor = Palettes.Neutral.Base;
private Color _statusTextColor = Palettes.Status.Good;
private Color _goodColor = Color.LimeGreen;
private Color _warningColor = new Color(255, 182, 72);
private Color _dangerColor = new Color(255, 67, 67);

3
Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
View file

@ -1,7 +1,6 @@
<controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:ui="clr-namespace:Content.Client.Atmos.Consoles"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
Title="{Loc 'atmos-monitoring-window-title'}"
Resizable="False"
SetSize="1120 750"
@ -86,7 +85,7 @@
<!-- Footer -->
<BoxContainer Orientation="Vertical">
<PanelContainer StyleClasses="LowDivider" />
<controls:Separator StyleClasses="LowDivider"/>
<BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
<Label Text="{Loc 'atmos-monitoring-window-flavor-left'}" StyleClasses="WindowFooterText" />
<Label Text="{Loc 'atmos-monitoring-window-flavor-right'}" StyleClasses="WindowFooterText"

14
Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
View file

@ -1,5 +1,5 @@
using Content.Client.Stylesheets;
using Content.Shared.Atmos;
using Content.Client.Stylesheets.Palette;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.EntitySystems;
using Content.Shared.FixedPoint;
@ -96,15 +96,15 @@ public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
Loc.GetString("atmos-alerts-window-temperature-value", ("valueInC", tempC), ("valueInK", tempK)) :
Loc.GetString("atmos-alerts-window-invalid-value");
TemperatureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
TemperatureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : Palettes.Neutral.Base;
// Update pressure
PressureLabel.Text = Loc.GetString("atmos-alerts-window-pressure-value", ("value", (FixedPoint2)updatedData.PressureData));
PressureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
PressureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : Palettes.Neutral.Base;
// Update total mol
TotalMolLabel.Text = Loc.GetString("atmos-alerts-window-total-mol-value", ("value", (FixedPoint2)updatedData.TotalMolData));
TotalMolLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
TotalMolLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : Palettes.Neutral.Base;
// Update other present gases
GasGridContainer.RemoveAllChildren();
@ -116,7 +116,7 @@ public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
{
Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
FontOverride = normalFont,
FontColorOverride = StyleNano.DisabledFore,
FontColorOverride = Palettes.Neutral.Base,
HorizontalAlignment = HAlignment.Center,
VerticalAlignment = VAlignment.Center,
HorizontalExpand = true,
@ -155,14 +155,14 @@ public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
public void SetAsFocus()
{
FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
FocusButton.AddStyleClass(StyleClass.Positive);
ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
FocusContainer.Visible = true;
}
public void RemoveAsFocus()
{
FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
FocusButton.RemoveStyleClass(StyleClass.Positive);
ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
FocusContainer.Visible = false;
}

2
Content.Client/Atmos/EntitySystems/AtmosphereSystem.cs
View file

@ -1,4 +1,4 @@
using Content.Client.Atmos.Components;
using Content.Client.Atmos.Components;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.EntitySystems;
using Robust.Shared.GameStates;

Some files were not shown because too many files have changed in this diff Show more