diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index defe08ef23..4a3b16c499 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,12 +36,4 @@ /Pow3r/ @PJB3005 /Content.Server/Power/Pow3r/ @PJB3005 - -# Sloth -/Content.*/Audio @metalgearsloth -/Content.*/Movement @metalgearsloth -/Content.*/NPC @metalgearsloth -/Content.*/Shuttles @metalgearsloth -/Content.*/Weapons @metalgearsloth - /Content.Server/Discord/ @Simyon264 diff --git a/Content.Client/Administration/Components/KillSignComponent.cs b/Content.Client/Administration/Components/KillSignComponent.cs deleted file mode 100644 index 91c44ef3f2..0000000000 --- a/Content.Client/Administration/Components/KillSignComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -using Content.Shared.Administration.Components; -using Robust.Shared.GameStates; - -namespace Content.Client.Administration.Components; - -[RegisterComponent] -public sealed partial class KillSignComponent : SharedKillSignComponent; diff --git a/Content.Client/Administration/Systems/BufferingSystem.cs b/Content.Client/Administration/Systems/BufferingSystem.cs new file mode 100644 index 0000000000..e511bbff36 --- /dev/null +++ b/Content.Client/Administration/Systems/BufferingSystem.cs @@ -0,0 +1,7 @@ +using Content.Shared.Administration.Systems; + +namespace Content.Client.Administration.Systems; + +public sealed class BufferingSystem : SharedBufferingSystem +{ +} diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs index c12f65f1f0..f15cfe6442 100644 --- a/Content.Client/Administration/Systems/KillSignSystem.cs +++ b/Content.Client/Administration/Systems/KillSignSystem.cs @@ -1,5 +1,5 @@ using System.Numerics; -using Content.Client.Administration.Components; +using Content.Shared.Administration.Components; using Robust.Client.GameObjects; using Robust.Shared.Utility; diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs index d91cc29e4c..eeb10b54d0 100644 --- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs @@ -3,6 +3,7 @@ using Content.Client.Atmos.Components; using Content.Client.Atmos.EntitySystems; using Content.Shared.Atmos; using Content.Shared.Atmos.Components; +using Content.Shared.Atmos.EntitySystems; using Content.Shared.Atmos.Prototypes; using Robust.Client.GameObjects; using Robust.Client.Graphics; @@ -23,6 +24,7 @@ namespace Content.Client.Atmos.Overlays private readonly IEntityManager _entManager; private readonly IMapManager _mapManager; + private readonly SharedAtmosphereSystem _atmosphereSystem; private readonly SharedMapSystem _mapSystem; private readonly SharedTransformSystem _xformSys; @@ -54,6 +56,7 @@ namespace Content.Client.Atmos.Overlays { _entManager = entManager; _mapManager = IoCManager.Resolve(); + _atmosphereSystem = entManager.System(); _mapSystem = entManager.System(); _xformSys = xformSys; _shader = protoMan.Index(UnshadedShader).Instance(); @@ -67,7 +70,7 @@ namespace Content.Client.Atmos.Overlays for (var i = 0; i < _gasCount; i++) { - var gasPrototype = protoMan.Index(system.VisibleGasId[i].ToString()); + var gasPrototype = _atmosphereSystem.GetGas(system.VisibleGasId[i]); SpriteSpecifier overlay; diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs index 2b8020924c..ecaaca3005 100644 --- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs @@ -52,14 +52,18 @@ namespace Content.Client.Atmos.UI private void OnSelectGasPressed() { - if (_window is null) return; + if (_window is null) + return; + if (_window.SelectedGas is null) { SendMessage(new GasFilterSelectGasMessage(null)); } else { - if (!int.TryParse(_window.SelectedGas, out var gas)) return; + if (!Enum.TryParse(_window.SelectedGas, out var gas)) + return; + SendMessage(new GasFilterSelectGasMessage(gas)); } } diff --git a/Content.Client/Bed/BedSystem.cs b/Content.Client/Bed/BedSystem.cs deleted file mode 100644 index 9c6f28290f..0000000000 --- a/Content.Client/Bed/BedSystem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Shared.Bed; - -namespace Content.Client.Bed; - -public sealed class BedSystem : SharedBedSystem -{ - -} diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index b9f0e0e8e6..2266b30c51 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -112,7 +112,6 @@ namespace Content.Client.Entry _prototypeManager.RegisterIgnore("htnPrimitive"); _prototypeManager.RegisterIgnore("gameMap"); _prototypeManager.RegisterIgnore("gameMapPool"); - _prototypeManager.RegisterIgnore("lobbyBackground"); _prototypeManager.RegisterIgnore("gamePreset"); _prototypeManager.RegisterIgnore("noiseChannel"); _prototypeManager.RegisterIgnore("playerConnectionWhitelist"); diff --git a/Content.Client/Fluids/SpraySystem.cs b/Content.Client/Fluids/SpraySystem.cs new file mode 100644 index 0000000000..877a2a0592 --- /dev/null +++ b/Content.Client/Fluids/SpraySystem.cs @@ -0,0 +1,7 @@ +using Content.Shared.Fluids.Components; +using Content.Shared.Fluids.EntitySystems; +using Robust.Shared.Map; + +namespace Content.Client.Fluids; + +public sealed class SpraySystem : SharedSpraySystem; diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs index 4bd91bd06c..443c6c20a8 100644 --- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs +++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs @@ -11,6 +11,7 @@ using Robust.Client.State; using Robust.Client.UserInterface; using Robust.Shared.Prototypes; using Robust.Shared.Audio; +using Content.Shared.GameTicking.Prototypes; namespace Content.Client.GameTicking.Managers { @@ -28,7 +29,7 @@ namespace Content.Client.GameTicking.Managers [ViewVariables] public bool AreWeReady { get; private set; } [ViewVariables] public bool IsGameStarted { get; private set; } [ViewVariables] public ResolvedSoundSpecifier? RestartSound { get; private set; } - [ViewVariables] public string? LobbyBackground { get; private set; } + [ViewVariables] public ProtoId? LobbyBackground { get; private set; } [ViewVariables] public bool DisallowedLateJoin { get; private set; } [ViewVariables] public string? ServerInfoBlob { get; private set; } [ViewVariables] public TimeSpan StartTime { get; private set; } diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 538266e1a2..9696da3bc2 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -13,6 +13,7 @@ using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Configuration; +using Robust.Shared.Prototypes; using Robust.Shared.Timing; namespace Content.Client.Lobby @@ -28,6 +29,7 @@ namespace Content.Client.Lobby [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IVoteManager _voteManager = default!; [Dependency] private readonly ClientsidePlaytimeTrackingManager _playtimeTracking = default!; + [Dependency] private readonly IPrototypeManager _protoMan = default!; private ClientGameTicker _gameTicker = default!; private ContentAudioSystem _contentAudioSystem = default!; @@ -250,15 +252,22 @@ namespace Content.Client.Lobby private void UpdateLobbyBackground() { - if (_gameTicker.LobbyBackground != null) + if (_protoMan.TryIndex(_gameTicker.LobbyBackground, out var proto)) { - Lobby!.Background.Texture = _resourceCache.GetResource(_gameTicker.LobbyBackground ); + Lobby!.Background.Texture = _resourceCache.GetResource(proto.Background); + + var markup = Loc.GetString("lobby-state-background-text", + ("backgroundTitle", Loc.GetString(proto.Title)), + ("backgroundArtist", Loc.GetString(proto.Artist))); + + Lobby!.LobbyBackground.SetMarkup(markup); } else { Lobby!.Background.Texture = null; - } + Lobby!.LobbyBackground.SetMarkup(Loc.GetString("lobby-state-background-no-background-text")); + } } private void SetReady(bool newReady) diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index 9b5c761644..a716ae7c95 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -51,10 +51,13 @@ - + - - + + + + + diff --git a/Content.Client/NameIdentifier/NameIdentifierSystem.cs b/Content.Client/NameIdentifier/NameIdentifierSystem.cs new file mode 100644 index 0000000000..c699ca6419 --- /dev/null +++ b/Content.Client/NameIdentifier/NameIdentifierSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.NameIdentifier; + +namespace Content.Client.NameIdentifier; + +public sealed class NameIdentifierSystem : SharedNameIdentifierSystem; diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml b/Content.Client/Power/APC/UI/ApcMenu.xaml index 4c14dcc0ad..682aea55d2 100644 --- a/Content.Client/Power/APC/UI/ApcMenu.xaml +++ b/Content.Client/Power/APC/UI/ApcMenu.xaml @@ -19,7 +19,7 @@