diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs index 6114a4ca0d..10ec2a5e9b 100644 --- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs +++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs @@ -4,7 +4,6 @@ using Content.Server.GameTicking.Presets; using Content.Shared.Administration; using Linguini.Shared.Util; using Robust.Shared.Console; -using Robust.Shared.Prototypes; namespace Content.Server.GameTicking.Commands { @@ -12,7 +11,6 @@ namespace Content.Server.GameTicking.Commands public sealed class SetGamePresetCommand : IConsoleCommand { [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; public string Command => "setgamepreset"; public string Description => Loc.GetString("set-game-preset-command-description", ("command", Command)); diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index 0cba4824db..5a4f4d93ce 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -9,7 +9,6 @@ using Content.Shared.Holopad; using Content.Shared.IdentityManagement; using Content.Shared.Labels.Components; using Content.Shared.Mobs; -using Content.Shared.Mobs.Systems; using Content.Shared.Power; using Content.Shared.Silicons.StationAi; using Content.Shared.Speech; @@ -40,7 +39,6 @@ public sealed class HolopadSystem : SharedHolopadSystem [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly PvsOverrideSystem _pvs = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; private float _updateTimer = 1.0f; private const float UpdateTime = 1.0f; diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs index 7e275c78ce..70d9c8ae93 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Administration.Logs; using Content.Server.DeviceNetwork.Systems; -using Content.Shared.ActionBlocker; using Content.Shared.Database; using Content.Shared.DeviceNetwork; using Content.Shared.DeviceNetwork.Events; @@ -17,7 +16,6 @@ namespace Content.Server.SurveillanceCamera; public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!; [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; [Dependency] private readonly UserInterfaceSystem _userInterface = default!; diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs index 583341c815..a9dd6d8755 100644 --- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs +++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs @@ -100,6 +100,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance, { SkinColorationStrategyInput.Unary => skinColoration.FromUnary(speciesPrototype.DefaultHumanSkinTone), SkinColorationStrategyInput.Color => skinColoration.ClosestSkinColor(speciesPrototype.DefaultSkinTone), + _ => skinColoration.ClosestSkinColor(speciesPrototype.DefaultSkinTone), }; return new( @@ -109,11 +110,11 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance, Color.Black, Color.Black, skinColor, - new () + new() ); } - private static IReadOnlyList RealisticEyeColors = new List + private static IReadOnlyList _realisticEyeColors = new List { Color.Brown, Color.Gray, @@ -145,7 +146,7 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance, // TODO: Add random markings - var newEyeColor = random.Pick(RealisticEyeColors); + var newEyeColor = random.Pick(_realisticEyeColors); var protoMan = IoCManager.Resolve(); var skinType = protoMan.Index(species).SkinColoration; @@ -155,9 +156,10 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance, { SkinColorationStrategyInput.Unary => strategy.FromUnary(random.NextFloat(0f, 100f)), SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)), + _ => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)), }; - return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new ()); + return new HumanoidCharacterAppearance(newHairStyle, newHairColor, newFacialHairStyle, newHairColor, newEyeColor, newSkinColor, new()); float RandomizeColor(float channel) {