This commit is contained in:
Charlotte Tezuka
2026-05-11 03:33:25 +02:00
parent 2f9bfbecfc
commit 1e59562465
70 changed files with 232 additions and 229 deletions
@@ -14,15 +14,15 @@ using Color = Robust.Shared.Maths.Color;
namespace Content.Client.Corvax.ExportSprites;
public sealed class EntityScreenshotRenderService
public sealed partial class EntityScreenshotRenderService
{
[Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IResourceManager _resourceManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly IUserInterfaceManager _ui = default!;
[Dependency] private IClyde _clyde = default!;
[Dependency] private IEntityManager _entityManager = default!;
[Dependency] private IEntitySystemManager _entitySystemManager = default!;
[Dependency] private IResourceManager _resourceManager = default!;
[Dependency] private IGameTiming _timing = default!;
[Dependency] private ILogManager _logManager = default!;
[Dependency] private IUserInterfaceManager _ui = default!;
private EntityScreenshotRenderControl? _control;
private bool _initialized;
@@ -609,13 +609,13 @@ public sealed class EntityScreenshotRenderService
private readonly record struct PixelRect(int Left, int Top, int Width, int Height);
private sealed class EntityScreenshotRenderControl : Control
private sealed partial class EntityScreenshotRenderControl : Control
{
private static readonly Color ExportBackgroundColor = new(128, 128, 128, 0);
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly IResourceManager _resourceManager = default!;
[Dependency] private IEntityManager _entityManager = default!;
[Dependency] private ILogManager _logManager = default!;
[Dependency] private IResourceManager _resourceManager = default!;
internal readonly Queue<(
IRenderTexture Texture,
+3 -3
View File
@@ -14,10 +14,10 @@ using Robust.Shared.Utility;
namespace Content.Client.Corvax.Ipc;
public sealed class IpcFaceMenu : FancyWindow
public sealed partial class IpcFaceMenu : FancyWindow
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private IPrototypeManager _prototype = default!;
[Dependency] private IEntityManager _entMan = default!;
private readonly SpriteSystem _sprite;
private readonly ItemList _list;
@@ -5,9 +5,9 @@ using Robust.Shared.Prototypes;
namespace Content.Client.Overlays;
public sealed class ShowSquadIconsSystem : EquipmentHudSystem<ShowSquadIconsComponent>
public sealed partial class ShowSquadIconsSystem : EquipmentHudSystem<ShowSquadIconsComponent>
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private IPrototypeManager _prototype = default!;
public override void Initialize()
{
@@ -17,15 +17,14 @@ using Robust.Shared.Utility;
namespace Content.Client.Corvax.SecApartment;
[Virtual]
[GenerateTypedNameReferences]
public sealed partial class SecApartmentWindow : BaseWindow
{
[Dependency] private readonly IUserInterfaceManager _ui = default!;
[Dependency] private readonly IResourceCache _resCache = default!;
[Dependency] private readonly IEntitySystemManager _entitySystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private IUserInterfaceManager _ui = default!;
[Dependency] private IResourceCache _resCache = default!;
[Dependency] private IEntitySystemManager _entitySystem = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private IGameTiming _gameTiming = default!;
private readonly ClientGameTicker _gameTicker;
private readonly SpriteSystem _sprite;
+1
View File
@@ -80,6 +80,7 @@ namespace Content.Client.Entry
[Dependency] private IEntitySystemManager _entitySystemManager = default!;
[Dependency] private ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!;
[Dependency] private ClientFeedbackManager _feedbackManager = null!;
[Dependency] private EntityScreenshotGenerator _entityScreenshotGenerator = default!; // Corvax-Wiki
public override void PreInit()
{
@@ -11,7 +11,7 @@ public sealed partial class BlackAndWhiteOverlay : Overlay
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!; //Corvax-WL-Changes
[Dependency] private IEntityManager _entManager = default!; //Corvax-WL-Changes
private readonly IgnoreGlobalOverlaysSystem _ignore; //Corvax-WL-Changes
public override OverlaySpace Space => OverlaySpace.WorldSpace;
+1 -1
View File
@@ -11,7 +11,7 @@ public sealed partial class NoirOverlay : Overlay
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!; //Corvax-WL-Changes
[Dependency] private IEntityManager _entManager = default!; //Corvax-WL-Changes
private readonly IgnoreGlobalOverlaysSystem _ignore; //Corvax-WL-Changes
public override OverlaySpace Space => OverlaySpace.WorldSpace;
+2 -2
View File
@@ -4,10 +4,10 @@ using Content.Shared.Roles;
namespace Content.Client.Roles;
public sealed class RoleSystem : SharedRoleSystem
public sealed partial class RoleSystem : SharedRoleSystem
{
//WL-changes-start
[Dependency] private readonly IClientPreferencesManager _prefMan = default!;
[Dependency] private IClientPreferencesManager _prefMan = default!;
public string? GetChosenSubname(string jobId)
{
@@ -29,7 +29,7 @@ public sealed partial class EscapeUIController : UIController, IOnStateEntered<G
[Dependency] private GuidebookUIController _guidebook = default!;
[Dependency] private FeedbackPopupUIController _feedback = null!;
//WL-Changes-start
[Dependency] private readonly PlayerSessionInfoUIController _sessionInfo = default!;
[Dependency] private PlayerSessionInfoUIController _sessionInfo = default!;
//WL-Changes-end
private Options.UI.EscapeMenu? _escapeWindow;
@@ -26,7 +26,7 @@ public sealed partial class GameTopMenuBarUIController : UIController
[Dependency] private GuidebookUIController _guidebook = default!;
[Dependency] private EmotesUIController _emotes = default!;
[Dependency] private readonly LanguagesUIController _languages = default!; //WL-Changes: Languages
[Dependency] private LanguagesUIController _languages = default!; //WL-Changes: Languages
private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull<GameTopMenuBar>();
@@ -1,4 +1,4 @@
using Content.Shared.Corvax.CCCVars;
using Content.Shared.Corvax.CCCVars;
using Content.Shared._CorvaxGoob.OfferItem;
using Robust.Client.Graphics;
using Robust.Client.Input;
@@ -7,13 +7,13 @@ using Robust.Shared.Configuration;
namespace Content.Client._CorvaxGoob.OfferItem;
public sealed class OfferItemSystem : SharedOfferItemSystem
public sealed partial class OfferItemSystem : SharedOfferItemSystem
{
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IEyeManager _eye = default!;
[Dependency] private IOverlayManager _overlayManager = default!;
[Dependency] private IPlayerManager _playerManager = default!;
[Dependency] private IConfigurationManager _cfg = default!;
[Dependency] private IInputManager _inputManager = default!;
[Dependency] private IEyeManager _eye = default!;
public override void Initialize()
{
@@ -9,11 +9,11 @@ using Robust.Shared.Animations;
namespace Content.Client._Goobstation.Tools;
public sealed class WeldingSparksAnimationSystem : EntitySystem
public sealed partial class WeldingSparksAnimationSystem : EntitySystem
{
[Dependency] private readonly AnimationPlayerSystem _animation = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private AnimationPlayerSystem _animation = default!;
[Dependency] private IEyeManager _eyeManager = default!;
[Dependency] private TransformSystem _transformSystem = default!;
private const string ANIM_KEY = "WeldAnim";
@@ -11,8 +11,8 @@ namespace Content.Client._Harmony.ReadyManifest.UI;
[GenerateTypedNameReferences]
public sealed partial class ReadyManifestJobListing : GridContainer
{
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IEntityManager _entityManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
public const string StyleClassReadyIndicatorNoReady = "ReadyIndicatorNoReady";
public const string StyleClassReadyIndicatorLowReady = "ReadyIndicatorLowReady";
@@ -12,7 +12,7 @@ namespace Content.Client._Harmony.ReadyManifest.UI;
[GenerateTypedNameReferences]
public sealed partial class ReadyManifestUi : FancyWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
public ReadyManifestUi()
{
@@ -10,7 +10,7 @@ namespace Content.Client._WL.CharacterInformation;
[GenerateTypedNameReferences]
public sealed partial class CharacterInformationWindow : FancyWindow
{
[Dependency] private readonly IEntityManager _entity = default!;
[Dependency] private IEntityManager _entity = default!;
private float _accumulatedTime;
@@ -15,10 +15,10 @@ namespace Content.Client._WL.Communications.UI;
[GenerateTypedNameReferences]
public sealed partial class NewCommunicationsConsoleMenu : FancyWindow
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IConfigurationManager _cfg = default!;
[Dependency] private IGameTiming _timing = default!;
[Dependency] private ILocalizationManager _loc = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
public bool CanAnnounce;
public bool CanBroadcast;
@@ -6,9 +6,9 @@ using Robust.Shared.Configuration;
namespace Content.Client._WL.Communications.UI
{
public sealed class WLCommunicationsConsoleBoundUserInterface : BoundUserInterface
public sealed partial class WLCommunicationsConsoleBoundUserInterface : BoundUserInterface
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private IConfigurationManager _cfg = default!;
[ViewVariables]
private NewCommunicationsConsoleMenu? _menu;
@@ -7,8 +7,8 @@ namespace Content.Client._WL.DiscordAuth
{
public sealed partial class ClientDiscordAuthSystem : EntitySystem
{
[Dependency] private readonly IPlayerManager _playMan = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private IPlayerManager _playMan = default!;
[Dependency] private IGameTiming _timing = default!;
private event Action<string>? OnTokenChanged;
@@ -10,7 +10,7 @@ namespace Content.Client._WL.DiscordAuth
{
public sealed partial class PlayerSessionInfoWindow : DefaultWindow
{
[Dependency] private readonly IClipboardManager _clipboardMan = default!;
[Dependency] private IClipboardManager _clipboardMan = default!;
private readonly ClientDiscordAuthSystem _discordAuth;
private readonly TabContainer _mainTab;
@@ -7,9 +7,9 @@ namespace Content.Client._WL.DynamicText;
public sealed partial class DynamicTextSystem : EntitySystem
{
[Dependency] private readonly IEntityManager _ent = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private IEntityManager _ent = default!;
[Dependency] private IPlayerManager _player = default!;
[Dependency] private IUserInterfaceManager _userInterfaceManager = default!;
public override void Initialize()
{
base.Initialize();
@@ -2,9 +2,9 @@ using Robust.Client.UserInterface.Controllers;
namespace Content.Client._WL.DynamicText.UI;
public sealed class DynamicTextUIController : UIController
public sealed partial class DynamicTextUIController : UIController
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private IEntityManager _entManager = default!;
private DynamicTextWindow? _dynamicTextWindow;
@@ -6,7 +6,7 @@ namespace Content.Client._WL.Languages;
public sealed partial class ClientLanguagesSystem : SharedLanguagesSystem
{
[Dependency] private readonly IEntityManager _ent = default!;
[Dependency] private IEntityManager _ent = default!;
public override void Initialize()
{
@@ -11,11 +11,11 @@ namespace Content.Client._WL.Languages;
/// <summary>
/// Play languages sounds
/// </summary>
public sealed class LanguagesSoundsSystem : EntitySystem
public sealed partial class LanguagesSoundsSystem : EntitySystem
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly AudioSystem _audio = default!;
[Dependency] private readonly ClientLanguagesSystem _languages = default!;
[Dependency] private IConfigurationManager _cfg = default!;
[Dependency] private AudioSystem _audio = default!;
[Dependency] private ClientLanguagesSystem _languages = default!;
private ISawmill _sawmill = default!;
@@ -15,7 +15,7 @@ namespace Content.Client._WL.MedicalRecords;
[GenerateTypedNameReferences]
public sealed partial class MedicalRecordsConsoleWindow : FancyWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
public Action<uint?>? OnKeySelected;
public Action<uint>? OnPrinted;
@@ -10,7 +10,7 @@ namespace Content.Client._WL.Overlays;
public sealed partial class FaceCameraOverlay : Overlay
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private IEntityManager _entManager = default!;
private readonly PhotoSystem _photo;
private readonly SpriteSystem _sprite;
private readonly TransformSystem _transform;
@@ -11,8 +11,8 @@ namespace Content.Client._WL.Overlays;
public sealed partial class GhostCameraOverlay : Overlay
{
private static readonly ProtoId<ShaderPrototype> Shader = "CameraGhost";
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private IEntityManager _entManager = default!;
private readonly PhotoSystem _photo;
private readonly SpriteSystem _sprite;
@@ -11,9 +11,9 @@ namespace Content.Client._WL.Overlays;
public sealed partial class InfoCameraOverlay : Overlay
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IResourceCache _cache = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private IEntityManager _entManager = default!;
[Dependency] private IResourceCache _cache = default!;
[Dependency] private IGameTiming _timing = default!;
private readonly PhotoSystem _photo;
private readonly ClientGameTicker _gameTicker;
@@ -8,8 +8,8 @@ namespace Content.Client._WL.Overlays;
public sealed partial class ShaderCameraOverlay : Overlay
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private IEntityManager _entManager = default!;
private readonly PhotoSystem _photo;
private Dictionary<ProtoId<ShaderPrototype>, ShaderInstance> _cachedShaders = new();
@@ -5,9 +5,9 @@ using Robust.Client.GameObjects;
namespace Content.Client._WL.Passports.Systems;
public sealed class PassportSystem : EntitySystem
public sealed partial class PassportSystem : EntitySystem
{
[Dependency] private readonly SpriteSystem _sprite = default!;
[Dependency] private SpriteSystem _sprite = default!;
public override void Initialize()
{
base.Initialize();
@@ -8,8 +8,8 @@ namespace Content.Client._WL.Photo.Filters;
public sealed partial class PhotoFilterSystem : EntitySystem
{
[Dependency] private readonly IOverlayManager _overlay = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private IOverlayManager _overlay = default!;
[Dependency] private IPlayerManager _player = default!;
public override void Initialize()
{
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Content.Client._WL.Photo;
public sealed partial class PhotoSystem : SharedPhotoSystem
{
[Dependency] private readonly PhotoFilterSystem _filter = default!;
[Dependency] private PhotoFilterSystem _filter = default!;
public Dictionary<PhotoCameraComponent, PhotoCameraBoundUserInterface> ActiveCameras = new();
public Dictionary<IEye, EntityUid> ActiveEyes = new();
@@ -8,14 +8,14 @@ using Robust.Shared.Audio.Sources;
namespace Content.Client._WL.Photo.UI;
public sealed class PhotoCameraBoundUserInterface : BoundUserInterface
public sealed partial class PhotoCameraBoundUserInterface : BoundUserInterface
{
private readonly EyeSystem _eyeSystem;
private readonly PhotoSystem _photoSystem;
private readonly TransformSystem _transform;
[Dependency] private readonly IResourceCache _cache = default!;
[Dependency] private readonly IAudioManager _audioManager = default!;
[Dependency] private IResourceCache _cache = default!;
[Dependency] private IAudioManager _audioManager = default!;
[ViewVariables]
private PhotoCameraWindow? _window;
@@ -15,7 +15,7 @@ namespace Content.Client._WL.Photo.UI;
[GenerateTypedNameReferences]
public sealed partial class PhotoCameraWindow : FancyWindow
{
[Dependency] private readonly IResourceCache _cache = default!;
[Dependency] private IResourceCache _cache = default!;
public Vector2 MoveInput = Vector2.Zero;
public float ZoomInput = 0;
@@ -12,7 +12,7 @@ namespace Content.Client._WL.Photo.UI;
[GenerateTypedNameReferences]
public sealed partial class TextureButton : ContainerButton
{
[Dependency] private readonly IAudioManager _audioManager = default!;
[Dependency] private IAudioManager _audioManager = default!;
public TextureButton()
{
+62 -62
View File
@@ -1,62 +1,62 @@
using System.IO;
using Content.Client.Sprite;
using Content.Shared._WL.Poly.Events;
using JetBrains.Annotations;
using SixLabors.ImageSharp;
namespace Content.Client._WL.Poly
{
[UsedImplicitly]
public sealed partial class ClientPolySystem : EntitySystem
{
[Dependency] private ContentSpriteSystem _contentSpriteSystem = default!;
[Dependency] private ILogManager _log = default!;
private ISawmill _sawmill = default!;
public override void Initialize()
{
base.Initialize();
_sawmill = _log.GetSawmill("poly");
SubscribeNetworkEvent<PolyServerQueryEvent>(OnServerQuery);
}
private async void OnServerQuery(PolyServerQueryEvent args)
{
var ent = GetEntity(args.Entity);
try
{
await _contentSpriteSystem.Export(ent, Direction.South, (queue, image) =>
{
try
{
//TODO: проверить захватывает ли GC потоки, кхм
using var stream = new MemoryStream(1024 * 14);
image.SaveAsPng(stream);
stream.Position = 0;
var bytes = stream.GetBuffer();
var ev = new PolyClientResponseEvent(bytes, args.QueryId);
_sawmill.Info($"Poly's request has been successfully processed! Entity: {ToPrettyString(args.Entity)}");
RaiseNetworkEvent(ev);
}
catch (Exception ex)
{
_sawmill.Error($"An unknown error occurred while rendering the photo for Poly! {ex.Message}");
}
});
}
catch (Exception exc)
{
_sawmill.Error($"Error: {exc.Message}");
}
}
}
}
// using System.IO;
// using Content.Client.Sprite;
// using Content.Shared._WL.Poly.Events;
// using JetBrains.Annotations;
// using SixLabors.ImageSharp;
//
// namespace Content.Client._WL.Poly
// {
// [UsedImplicitly]
// public sealed partial class ClientPolySystem : EntitySystem
// {
// [Dependency] private ContentSpriteSystem _contentSpriteSystem = default!;
// [Dependency] private ILogManager _log = default!;
//
// private ISawmill _sawmill = default!;
//
// public override void Initialize()
// {
// base.Initialize();
//
// _sawmill = _log.GetSawmill("poly");
//
// SubscribeNetworkEvent<PolyServerQueryEvent>(OnServerQuery);
// }
//
// private async void OnServerQuery(PolyServerQueryEvent args)
// {
// var ent = GetEntity(args.Entity);
//
// try
// {
// await _contentSpriteSystem.Export(ent, Direction.South, (queue, image) =>
// {
// try
// {
// //TODO: проверить захватывает ли GC потоки, кхм
// using var stream = new MemoryStream(1024 * 14);
//
// image.SaveAsPng(stream);
//
// stream.Position = 0;
// var bytes = stream.GetBuffer();
//
// var ev = new PolyClientResponseEvent(bytes, args.QueryId);
//
// _sawmill.Info($"Poly's request has been successfully processed! Entity: {ToPrettyString(args.Entity)}");
//
// RaiseNetworkEvent(ev);
// }
// catch (Exception ex)
// {
// _sawmill.Error($"An unknown error occurred while rendering the photo for Poly! {ex.Message}");
// }
// });
// }
// catch (Exception exc)
// {
// _sawmill.Error($"Error: {exc.Message}");
// }
// }
// }
// }
@@ -10,7 +10,7 @@ namespace Content.Client._WL.Skills.Ui;
[GenerateTypedNameReferences]
public sealed partial class SkillsForcedWindow : FancyWindow
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private IEntityManager _entMan = default!;
private readonly SharedSkillsSystem _skillsSystem;
public event Action<string, byte, int>? OnSkillChanged;
@@ -11,7 +11,7 @@ namespace Content.Client._WL.Skills.Ui;
[GenerateTypedNameReferences]
public sealed partial class SkillsWindow : FancyWindow
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private IEntityManager _entMan = default!;
private readonly SharedSkillsSystem _skillsSystem;
public event Action<string, byte, int>? OnSkillChanged;
@@ -7,7 +7,7 @@ namespace Content.Client._WL.Standing
{
public sealed partial class ClientStandingStateSystem : EntitySystem
{
[Dependency] private readonly SpriteSystem _sprite = default!;
[Dependency] private SpriteSystem _sprite = default!;
private Dictionary<EntProtoId, Shared.DrawDepth.DrawDepth> _cachedDrawDepths = default!;
public override void Initialize()
+3 -3
View File
@@ -8,9 +8,9 @@ namespace Content.Client._WL.Tray;
public sealed partial class TraySystem : SharedTraySystem
{
[Dependency] private readonly AppearanceSystem _apperance = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
[Dependency] private readonly ItemSystem _item = default!;
[Dependency] private AppearanceSystem _apperance = default!;
[Dependency] private SpriteSystem _sprite = default!;
[Dependency] private ItemSystem _item = default!;
public override void Initialize()
{
@@ -13,8 +13,8 @@ namespace Content.Client._WL.Turrets;
[GenerateTypedNameReferences]
public sealed partial class TurretMinderConsoleWindow : DefaultWindow
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private IEntityManager _entMan = default!;
[Dependency] private IPrototypeManager _protoMan = default!;
private readonly SpriteSystem _sprite;
@@ -24,10 +24,10 @@ using static Robust.Client.UserInterface.Controls.BaseButton;
namespace Content.Client._WL.UserInterface.Systems.Languages;
[UsedImplicitly]
public sealed class LanguagesUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>, IOnSystemChanged<ClientLanguagesSystem>
public sealed partial class LanguagesUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>, IOnSystemChanged<ClientLanguagesSystem>
{
[Dependency] private readonly IEntityManager _ent = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private IEntityManager _ent = default!;
[Dependency] private IPlayerManager _player = default!;
[UISystemDependency] private readonly ClientLanguagesSystem _languages = default!;
[UISystemDependency] private readonly SpriteSystem _sprite = default!;
@@ -6,9 +6,9 @@ using Robust.Shared.Prototypes;
namespace Content.Client._White.Overlays;
public sealed class BaseSwitchableOverlay<TComp> : Overlay where TComp : SwitchableVisionOverlayComponent
public sealed partial class BaseSwitchableOverlay<TComp> : Overlay where TComp : SwitchableVisionOverlayComponent
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private IPrototypeManager _prototype = default!;
public override bool RequestScreenTexture => true;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -6,10 +6,10 @@ using Robust.Client.Graphics;
namespace Content.Client._White.Overlays;
public sealed class NightVisionSystem : EquipmentHudSystem<NightVisionComponent>
public sealed partial class NightVisionSystem : EquipmentHudSystem<NightVisionComponent>
{
[Dependency] private readonly IOverlayManager _overlayMan = default!;
[Dependency] private readonly ILightManager _lightManager = default!;
[Dependency] private IOverlayManager _overlayMan = default!;
[Dependency] private ILightManager _lightManager = default!;
private BaseSwitchableOverlay<NightVisionComponent> _overlay = default!;
@@ -6,9 +6,9 @@ using Robust.Client.Graphics;
namespace Content.Client._White.Overlays;
public sealed class ThermalVisionSystem : EquipmentHudSystem<ThermalVisionComponent>
public sealed partial class ThermalVisionSystem : EquipmentHudSystem<ThermalVisionComponent>
{
[Dependency] private readonly IOverlayManager _overlayMan = default!;
[Dependency] private IOverlayManager _overlayMan = default!;
private ThermalVisionOverlay _thermalOverlay = default!;
private BaseSwitchableOverlay<ThermalVisionComponent> _overlay = default!;
@@ -24,7 +24,10 @@ public sealed partial class PresetIdCardSystem : EntitySystem
[Dependency] private IdCardSystem _cardSystem = default!;
[Dependency] private SharedAccessSystem _accessSystem = default!;
[Dependency] private StationSystem _stationSystem = default!;
[Dependency] private ContainerSystem _container = default!; //WL-Changes
// WL-Changes: start
[Dependency] private ContainerSystem _container = default!;
[Dependency] private RoleSystem _role = default!;
// WL-Changes: end
private static string IDItemSlot = "id"; //WL-Changes
@@ -76,7 +76,7 @@ namespace Content.Server.Administration.Systems
[Dependency] private IPlayerManager _playerManager = default!;
[Dependency] private SiliconLawSystem _siliconLawSystem = default!;
[Dependency] private readonly LanguagesSystem _languages = default!; //WL-Changes: Languages
[Dependency] private LanguagesSystem _languages = default!; //WL-Changes: Languages
private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
+1 -1
View File
@@ -62,7 +62,7 @@ public sealed partial class FaxSystem : EntitySystem
[Dependency] private EmagSystem _emag = default!;
// WL-Changes-start
[Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
[Dependency] private MaterialStorageSystem _materialStorage = default!;
// WL-Changes-end
private static readonly ProtoId<ToolQualityPrototype> ScrewingQuality = "Screwing";
+2 -2
View File
@@ -101,8 +101,8 @@ public sealed partial class MapMigrationSystem : EntitySystem
// /// </summary>
// public sealed class MapMigrationSystem : EntitySystem
// {
// [Dependency] private readonly IPrototypeManager _protoMan = default!;
// [Dependency] private readonly IResourceManager _resMan = default!;
// [Dependency] private IPrototypeManager _protoMan = default!;
// [Dependency] private IResourceManager _resMan = default!;
// private const string MigrationFile = "/migration.yml";
@@ -55,7 +55,7 @@ namespace Content.Server.Medical.BiomassReclaimer
[Dependency] private MaterialStorageSystem _material = default!;
[Dependency] private SharedMindSystem _minds = default!;
[Dependency] private InventorySystem _inventory = default!;
[Dependency] private readonly TagSystem _tag = default!; // WL-Changes
[Dependency] private TagSystem _tag = default!; // WL-Changes
public static readonly ProtoId<MaterialPrototype> BiomassPrototype = "Biomass";
@@ -32,7 +32,7 @@ public sealed partial class ServerUpdateManager : IPostInjectInit
[Dependency] private ILogManager _logManager = default!;
//WL-Chages-start
[Dependency] private readonly DiscordWebhook _discord = default!;
[Dependency] private DiscordWebhook _discord = default!;
private WebhookIdentifier? _discordWebhook;
//WL-Changes-end
@@ -12,7 +12,7 @@ namespace Content.Server._WL.Administration.Commands
[AdminCommand(AdminFlags.Mapping)]
public sealed partial class DayNightCommand : LocalizedEntityCommands
{
[Dependency] private readonly MapSystem _map = default!;
[Dependency] private MapSystem _map = default!;
public override string Command => "daynight";
@@ -18,9 +18,9 @@ namespace Content.Server._WL.Administration.Commands
[AdminCommand(AdminFlags.MassBan)]
public sealed partial class JobForceEnableCommand : LocalizedCommands
{
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly IServerDbManager _serverDb = default!;
[Dependency] private readonly IAdminLogManager _adminLog = default!;
[Dependency] private IPrototypeManager _protoMan = default!;
[Dependency] private IServerDbManager _serverDb = default!;
[Dependency] private IAdminLogManager _adminLog = default!;
public override string Command => "jobforceenable";
public override string Description => "Позволяет насильно разблокировать проверку должности на возраст.";
@@ -8,10 +8,10 @@ using Robust.Shared.Utility;
namespace Content.Server._WL.CharacterInformation;
public sealed class CharacterInformationSystem : EntitySystem
public sealed partial class CharacterInformationSystem : EntitySystem
{
[Dependency] private readonly ExamineSystem _examineSystem = default!;
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
[Dependency] private ExamineSystem _examineSystem = default!;
[Dependency] private UserInterfaceSystem _userInterfaceSystem = default!;
public override void Initialize()
{
@@ -8,8 +8,8 @@ namespace Content.Server._WL.Collision;
public sealed partial class SpawnOnCollideWithSystem : EntitySystem
{
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
[Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private EntityWhitelistSystem _whitelist = default!;
[Dependency] private TransformSystem _transform = default!;
public override void Initialize()
{
@@ -7,8 +7,8 @@ namespace Content.Server._WL.DayNight
{
public sealed partial class DayNightSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _gameTime = default!;
[Dependency] private readonly MapSystem _mapSys = default!;
[Dependency] private IGameTiming _gameTime = default!;
[Dependency] private MapSystem _mapSys = default!;
public override void Initialize()
{
@@ -9,7 +9,7 @@ namespace Content.Server._WL.Destructible.Systems
{
public sealed partial class FrozenSystem : EntitySystem
{
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private MetaDataSystem _metaData = default!;
public override void Initialize()
{
@@ -12,10 +12,10 @@ namespace Content.Server._WL.DiscordAuth
{
public sealed partial class DiscordAuthSystem : EntitySystem
{
[Dependency] private readonly ISharedPlayerManager _playMan = default!;
[Dependency] private readonly IConfigurationManager _confMan = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private ISharedPlayerManager _playMan = default!;
[Dependency] private IConfigurationManager _confMan = default!;
[Dependency] private IRobustRandom _random = default!;
[Dependency] private IGameTiming _timing = default!;
private Dictionary<NetUserId, string> _playersTokensKeys = default!;
@@ -14,12 +14,12 @@ namespace Content.Server._WL.Documents
{
public sealed partial class PrintedDocumentFormatSystem : EntitySystem
{
[Dependency] private readonly PaperSystem _paper = default!;
[Dependency] private readonly StationSystem _station = default!;
[Dependency] private readonly IGameTiming _gameTime = default!;
[Dependency] private readonly GameTicker _gameTick = default!;
[Dependency] private readonly JobSystem _job = default!;
[Dependency] private readonly MindSystem _mind = default!;
[Dependency] private PaperSystem _paper = default!;
[Dependency] private StationSystem _station = default!;
[Dependency] private IGameTiming _gameTime = default!;
[Dependency] private GameTicker _gameTick = default!;
[Dependency] private JobSystem _job = default!;
[Dependency] private MindSystem _mind = default!;
public override void Initialize()
{
@@ -8,10 +8,10 @@ using Robust.Shared.Utility;
namespace Content.Server._WL.DynamicText;
public sealed class DynamicTextSystem : EntitySystem
public sealed partial class DynamicTextSystem : EntitySystem
{
[Dependency] private readonly IEntityManager _ent = default!;
[Dependency] private readonly IConfigurationManager _cfm = default!;
[Dependency] private IEntityManager _ent = default!;
[Dependency] private IConfigurationManager _cfm = default!;
public override void Initialize()
{
@@ -8,9 +8,9 @@ using Robust.Shared.Console;
namespace Content.Server._WL.GameTicking.Commands
{
[AdminCommand(AdminFlags.Round)]
sealed class NoForceMapCommand : IConsoleCommand
sealed partial class NoForceMapCommand : IConsoleCommand
{
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private IConfigurationManager _configurationManager = default!;
public string Command => "noforcemap";
public string Description => Loc.GetString("Убирает карту, которая была выставлена forcemap");
@@ -6,9 +6,9 @@ using Robust.Shared.Player;
namespace Content.Server._WL.GolemCore;
public sealed class PAISystem : SharedGolemCoreSystem
public sealed partial class PAISystem : SharedGolemCoreSystem
{
[Dependency] private readonly InstrumentSystem _instrumentSystem = default!;
[Dependency] private InstrumentSystem _instrumentSystem = default!;
public override void Initialize()
{
@@ -10,7 +10,7 @@ namespace Content.Server._WL.Languages;
/// <summary>
/// Play languages sounds
/// </summary>
public sealed class LanguagesSoundsSystem : EntitySystem
public sealed partial class LanguagesSoundsSystem : EntitySystem
{
[Dependency] private LanguagesSystem _languages = default!;
[Dependency] private SharedTransformSystem _xforms = default!;
@@ -6,9 +6,9 @@ using Robust.Shared.Prototypes;
namespace Content.Server._WL.Lathe.Systems;
public sealed class LatheCraftedItemsSystem : EntitySystem
public sealed partial class LatheCraftedItemsSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private IPrototypeManager _protoMan = default!;
public override void Initialize()
{
@@ -25,15 +25,15 @@
// public sealed partial class PulseDemonSystem
// {
// [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
// [Dependency] private readonly PopupSystem _popup = default!;
// [Dependency] private readonly TransformSystem _transform = default!;
// [Dependency] private readonly AppearanceSystem _appearance = default!;
// [Dependency] private readonly PhysicsSystem _physics = default!;
// [Dependency] private readonly EmpSystem _emp = default!;
// [Dependency] private readonly ExplosionSystem _explosion = default!;
// [Dependency] private readonly SharedPointLightSystem _light = default!;
// [Dependency] private readonly EmagSystem _emag = default!;
// [Dependency] private SharedDoAfterSystem _doAfter = default!;
// [Dependency] private PopupSystem _popup = default!;
// [Dependency] private TransformSystem _transform = default!;
// [Dependency] private AppearanceSystem _appearance = default!;
// [Dependency] private PhysicsSystem _physics = default!;
// [Dependency] private EmpSystem _emp = default!;
// [Dependency] private ExplosionSystem _explosion = default!;
// [Dependency] private SharedPointLightSystem _light = default!;
// [Dependency] private EmagSystem _emag = default!;
// [ValidatePrototypeId<ExplosionPrototype>]
// private const string PulseDemonExplosionType = "ElectricExplosion";
@@ -8,8 +8,8 @@
//public sealed partial class PulseDemonSystem : EntitySystem
//{
// [Dependency] private readonly ApcSystem _apc = default!;
// [Dependency] private readonly TagSystem _tag = default!;
// [Dependency] private ApcSystem _apc = default!;
// [Dependency] private TagSystem _tag = default!;
// private const string HijackedDeviceTag = "HijackedDevice";
@@ -9,8 +9,8 @@
//public sealed partial class PulseDemonSystem : EntitySystem
//{
// [Dependency] private readonly StoreSystem _store = default!;
// [Dependency] private readonly BatterySystem _battery = default!;
// [Dependency] private StoreSystem _store = default!;
// [Dependency] private BatterySystem _battery = default!;
// private void InitializeShopEventsSubscribers()
// {
@@ -34,14 +34,14 @@
//public sealed partial class PulseDemonSystem : EntitySystem
//{
// [Dependency] private readonly EntityLookupSystem _lookup = default!;
// [Dependency] private readonly IRobustRandom _random = default!;
// [Dependency] private readonly IGameTiming _gameTiming = default!;
// [Dependency] private readonly AlertsSystem _alerts = default!;
// [Dependency] private readonly ActionsSystem _action = default!;
// [Dependency] private readonly PowerNetSystem _power = default!;
// [Dependency] private readonly MovementSpeedModifierSystem _move = default!;
// [Dependency] private readonly IMapManager _map = default!;
// [Dependency] private EntityLookupSystem _lookup = default!;
// [Dependency] private IRobustRandom _random = default!;
// [Dependency] private IGameTiming _gameTiming = default!;
// [Dependency] private AlertsSystem _alerts = default!;
// [Dependency] private ActionsSystem _action = default!;
// [Dependency] private PowerNetSystem _power = default!;
// [Dependency] private MovementSpeedModifierSystem _move = default!;
// [Dependency] private IMapManager _map = default!;
// #region WallSpawnOffsets
// private static readonly List<Vector2> Offsets = new()
@@ -6,7 +6,7 @@ namespace Content.Server._WL.Security.Systems;
public sealed partial class SecurityBadgeSystem : EntitySystem
{
[Dependency] private readonly InventorySystem _inventorySystem = default!;
[Dependency] private InventorySystem _inventorySystem = default!;
public override void Initialize()
{
+2 -2
View File
@@ -7,9 +7,9 @@ using Content.Shared.Eui;
namespace Content.Server._WL.Skills.UI;
public sealed class SkillsEui : BaseEui
public sealed partial class SkillsEui : BaseEui
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private IEntityManager _entMan = default!;
private readonly EntityUid _entity;
private readonly SharedSkillsSystem _skillsSystem;
@@ -8,11 +8,11 @@ using Robust.Shared.Console;
namespace Content.Server._WL.Administration.Commands
{
[AdminCommand(AdminFlags.NameColor)]
internal sealed class SetSponsorColor : LocalizedCommands
internal sealed partial class SetSponsorColor : LocalizedCommands
{
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IServerDbManager _dbManager = default!;
[Dependency] private readonly IServerPreferencesManager _preferenceManager = default!;
[Dependency] private IPlayerManager _playerManager = default!;
[Dependency] private IServerDbManager _dbManager = default!;
[Dependency] private IServerPreferencesManager _preferenceManager = default!;
public override string Command => "setsponsorcolor";