diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs index ab296a9619..237f24e3ea 100644 --- a/Content.Client/Alerts/ClientAlertsSystem.cs +++ b/Content.Client/Alerts/ClientAlertsSystem.cs @@ -33,7 +33,7 @@ public sealed class ClientAlertsSystem : AlertsSystem AlertOrder = _prototypeManager.EnumeratePrototypes().FirstOrDefault(); if (AlertOrder == null) - Log.Error("alert", "no alertOrder prototype found, alerts will be in random order"); + Log.Error("No alertOrder prototype found, alerts will be in random order"); } public IReadOnlyDictionary? ActiveAlerts diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 979f7430e1..ed95cf240a 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -271,7 +271,7 @@ public sealed class ClientClothingSystem : ClothingSystem { if (!revealedLayers.Add(key)) { - Logger.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}"); + Log.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}"); continue; } diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs index 7334c2fd43..0ab33c6520 100644 --- a/Content.Client/IconSmoothing/IconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs @@ -231,7 +231,7 @@ namespace Content.Client.IconSmoothing if (!spriteQuery.TryGetComponent(uid, out var sprite)) { - Logger.Error($"Encountered a icon-smoothing entity without a sprite: {ToPrettyString(uid)}"); + Log.Error($"Encountered a icon-smoothing entity without a sprite: {ToPrettyString(uid)}"); RemCompDeferred(uid, smooth); return; } @@ -242,7 +242,7 @@ namespace Content.Client.IconSmoothing { if (!_mapManager.TryGetGrid(xform.GridUid, out grid)) { - Logger.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing."); + Log.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing."); return; } } diff --git a/Content.Client/Info/InfoSystem.cs b/Content.Client/Info/InfoSystem.cs index 4572f3afdc..b697994981 100644 --- a/Content.Client/Info/InfoSystem.cs +++ b/Content.Client/Info/InfoSystem.cs @@ -12,13 +12,13 @@ public sealed class InfoSystem : EntitySystem { base.Initialize(); SubscribeNetworkEvent(OnRulesReceived); - Logger.DebugS("info", "Requested server info."); + Log.Debug("Requested server info."); RaiseNetworkEvent(new RequestRulesMessage()); } private void OnRulesReceived(RulesMessage message, EntitySessionEventArgs eventArgs) { - Logger.DebugS("info", "Received server rules."); + Log.Debug("Received server rules."); Rules = message; _rules.UpdateRules(); } diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs index ad8ca47582..7d55bcebf1 100644 --- a/Content.Client/Light/RgbLightControllerSystem.cs +++ b/Content.Client/Light/RgbLightControllerSystem.cs @@ -146,7 +146,7 @@ namespace Content.Client.Light else { // admeme fuck-ups or bad yaml? - Logger.Warning($"RGB light attempted to use invalid sprite index {index} on entity {ToPrettyString(uid)}"); + Log.Warning($"RGB light attempted to use invalid sprite index {index} on entity {ToPrettyString(uid)}"); rgb.Layers.Remove(index); } } diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs index 04f6681136..9b800b3c78 100644 --- a/Content.Client/Sprite/RandomSpriteSystem.cs +++ b/Content.Client/Sprite/RandomSpriteSystem.cs @@ -51,7 +51,7 @@ public sealed class RandomSpriteSystem : SharedRandomSpriteSystem { if (layer.Key is not { } strKey || !int.TryParse(strKey, out index)) { - Logger.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}"); + Log.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}"); continue; } } diff --git a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs index 5d60ae57d9..203c747e29 100644 --- a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs @@ -39,7 +39,7 @@ public sealed class AutomaticAtmosSystem : EntitySystem if (physics.Mass / ShuttleSystem.TileMassMultiplier >= 7.0f) { AddComp(ev.Entity); - Logger.InfoS("atmos", $"Giving grid {ev.Entity} GridAtmosphereComponent."); + Log.Info($"Giving grid {ev.Entity} GridAtmosphereComponent."); } // It's not super important to remove it should the grid become too small again. // If explosions ever gain the ability to outright shatter grids, do rethink this. diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs index f38e0299a0..faf06a6079 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs @@ -167,7 +167,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems } else { - Logger.Warning("atmos", $"{ToPrettyString(uid)} received GasFilterSelectGasMessage with an invalid ID: {args.ID}"); + Log.Warning($"{ToPrettyString(uid)} received GasFilterSelectGasMessage with an invalid ID: {args.ID}"); } } else diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index 2bfc753b74..31451c425f 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -156,7 +156,7 @@ public sealed partial class ExplosionSystem #endif } - Logger.InfoS("Explosion", $"Processed {TilesPerTick - tilesRemaining} tiles in {Stopwatch.Elapsed.TotalMilliseconds}ms"); + Log.Info($"Processed {TilesPerTick - tilesRemaining} tiles in {Stopwatch.Elapsed.TotalMilliseconds}ms"); // we have finished processing our tiles. Is there still an ongoing explosion? if (_activeExplosion != null) diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs index 1b324d924b..afad0e27e0 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs @@ -37,7 +37,7 @@ public sealed partial class ExplosionSystem : EntitySystem if (!_explosionTypes.TryGetValue(typeID, out var typeIndex)) { - Logger.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported."); + Log.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported."); return null; } diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 7495ecbb34..1a5a5c4011 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -290,7 +290,7 @@ public sealed partial class ExplosionSystem : EntitySystem if (!_prototypeManager.TryIndex(typeId, out var type)) { - Logger.Error($"Attempted to spawn unknown explosion prototype: {type}"); + Log.Error($"Attempted to spawn unknown explosion prototype: {type}"); return; } diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs index c0775947ba..17ca972356 100644 --- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs @@ -37,7 +37,7 @@ public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid()); if (!TryComp(ent, out var smoke)) { - Logger.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent"); + Log.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent"); Del(ent); return; } diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs index 36ab038562..039128e32f 100644 --- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs +++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs @@ -186,7 +186,7 @@ public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceS if (speciesPrototype == null) { - Logger.Error("Tried to get age representation of species that couldn't be indexed: " + species); + Log.Error("Tried to get age representation of species that couldn't be indexed: " + species); return Loc.GetString("identity-age-young"); } diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs index 04fa6a57e5..350ae033cf 100644 --- a/Content.Server/Info/InfoSystem.cs +++ b/Content.Server/Info/InfoSystem.cs @@ -17,7 +17,7 @@ public sealed class InfoSystem : EntitySystem private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs) { - Log.Debug("info", "Client requested rules."); + Log.Debug("Client requested rules."); var title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader)); var path = _cfg.GetCVar(CCVars.RulesFile); var rules = "Server could not read its rules."; @@ -27,7 +27,7 @@ public sealed class InfoSystem : EntitySystem } catch (Exception) { - Log.Debug("info", "Could not read server rules file."); + Log.Debug("Could not read server rules file."); } var response = new RulesMessage(title, rules); RaiseNetworkEvent(response, eventArgs.SenderSession.Channel); diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs index 7fad69e349..46b25163cc 100644 --- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs @@ -16,7 +16,7 @@ public sealed partial class ParticleAcceleratorSystem var xformQuery = GetEntityQuery(); if (!xformQuery.TryGetComponent(uid, out var xform)) { - Logger.Error("ParticleAccelerator attempted to emit a particle without (having) a transform from which to base its initial position and orientation."); + Log.Error("ParticleAccelerator attempted to emit a particle without (having) a transform from which to base its initial position and orientation."); return; } diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs index 6616746506..506fd61d55 100644 --- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs @@ -73,7 +73,7 @@ namespace Content.Server.Spawners.EntitySystems if (component.Prototypes.Count == 0) { - Logger.Warning($"Prototype list in ConditionalSpawnComponent is empty! Entity: {ToPrettyString(uid)}"); + Log.Warning($"Prototype list in ConditionalSpawnComponent is empty! Entity: {ToPrettyString(uid)}"); return; } @@ -94,7 +94,7 @@ namespace Content.Server.Spawners.EntitySystems if (component.Prototypes.Count == 0) { - Logger.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {ToPrettyString(uid)}"); + Log.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {ToPrettyString(uid)}"); return; } diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs index 78d1b1e212..4b7cd64961 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs @@ -323,8 +323,7 @@ public sealed partial class StationJobsSystem jobs.ExtendedAccess = count <= thresh; - Logger.DebugS( - "station", "Station {Station} on extended access: {ExtendedAccess}", + Log.Debug("Station {Station} on extended access: {ExtendedAccess}", Name(station), jobs.ExtendedAccess); } } diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index 4647392665..b9ff8a4339 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -456,7 +456,7 @@ public sealed class StationSystem : EntitySystem if (xform.GridUid == EntityUid.Invalid) { - Log.Debug("A"); + Log.Debug("Unable to get owning station - GridUid invalid."); return null; } diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs index b5d1ae79be..a56d9640d3 100644 --- a/Content.Server/Store/Systems/StoreSystem.Listings.cs +++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs @@ -43,7 +43,7 @@ public sealed partial class StoreSystem { if (!_proto.TryIndex(listingId, out var proto)) { - Logger.Error("Attempted to add invalid listing."); + Log.Error("Attempted to add invalid listing."); return false; } return TryAddListing(component, proto); diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs index 50a9cb9b69..96b2ecc00c 100644 --- a/Content.Server/Strip/StrippableSystem.cs +++ b/Content.Server/Strip/StrippableSystem.cs @@ -210,7 +210,7 @@ namespace Content.Server.Strip if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef)) { - Logger.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}"); + Log.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}"); return; } @@ -347,7 +347,7 @@ namespace Content.Server.Strip if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef)) { - Logger.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}"); + Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}"); return; } diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 91b0d6caea..22ee0e4861 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -27,7 +27,7 @@ public sealed class TraitSystem : EntitySystem { if (!_prototypeManager.TryIndex(traitId, out var traitPrototype)) { - Logger.Warning($"No trait found with ID {traitId}!"); + Log.Warning($"No trait found with ID {traitId}!"); return; } diff --git a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs index 3fff584217..1827f6deed 100644 --- a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs +++ b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server.Worldgen.Components; using Content.Server.Worldgen.Prototypes; using Robust.Shared.Prototypes; @@ -35,7 +35,7 @@ public sealed class BiomeSelectionSystem : BaseWorldSystem return; } - Logger.Error($"Biome selection ran out of biomes to select? See biomes list: {component.Biomes}"); + Log.Error($"Biome selection ran out of biomes to select? See biomes list: {component.Biomes}"); } private void OnBiomeSelectionStartup(EntityUid uid, BiomeSelectionComponent component, ComponentStartup args) diff --git a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs index d3eeeb6037..c47bfb9f88 100644 --- a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs +++ b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration; +using Content.Server.Administration; using Content.Server.GameTicking; using Content.Server.GameTicking.Events; using Content.Server.Worldgen.Components; @@ -74,7 +74,7 @@ public sealed class WorldgenConfigSystem : EntitySystem return; var target = _map.GetMapEntityId(_gameTicker.DefaultMap); - Logger.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}"); + Log.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}"); var cfg = _proto.Index(_worldgenConfig); cfg.Apply(target, _ser, EntityManager); // Apply the config to the map. diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs index 382ecb5a9a..9e81c91550 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs @@ -157,7 +157,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem if (doAfter.Delay <= TimeSpan.Zero) { - Logger.Warning("Awaited instant DoAfters are not supported fully supported"); + Log.Warning("Awaited instant DoAfters are not supported fully supported"); return DoAfterStatus.Finished; } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 75063c5550..7d5e390b6f 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -171,7 +171,7 @@ namespace Content.Shared.Interaction { if (!ValidateClientInput(session, coords, uid, out var userEntity)) { - Logger.InfoS("system.interaction", $"TryPullObject input validation failed"); + Log.Info($"TryPullObject input validation failed"); return true; } @@ -203,7 +203,7 @@ namespace Content.Shared.Interaction // client sanitization if (!TryComp(item, out TransformComponent? itemXform) || !ValidateClientInput(args.SenderSession, itemXform.Coordinates, item, out var user)) { - Logger.InfoS("system.interaction", $"Inventory interaction validation failed. Session={args.SenderSession}"); + Log.Info($"Inventory interaction validation failed. Session={args.SenderSession}"); return; } @@ -225,7 +225,7 @@ namespace Content.Shared.Interaction // client sanitization if (!ValidateClientInput(session, coords, uid, out var user)) { - Logger.InfoS("system.interaction", $"Alt-use input validation failed"); + Log.Info($"Alt-use input validation failed"); return true; } @@ -239,7 +239,7 @@ namespace Content.Shared.Interaction // client sanitization if (!ValidateClientInput(session, coords, uid, out var userEntity)) { - Logger.InfoS("system.interaction", $"Use input validation failed"); + Log.Info($"Use input validation failed"); return true; } @@ -547,7 +547,7 @@ namespace Content.Shared.Interaction if (length > MaxRaycastRange) { - Logger.Warning("InRangeUnobstructed check performed over extreme range. Limiting CollisionRay size."); + Log.Warning("InRangeUnobstructed check performed over extreme range. Limiting CollisionRay size."); length = MaxRaycastRange; } @@ -921,7 +921,7 @@ namespace Content.Shared.Interaction { if (!ValidateClientInput(session, coords, uid, out var user)) { - Logger.InfoS("system.interaction", $"ActivateItemInWorld input validation failed"); + Log.Info($"ActivateItemInWorld input validation failed"); return false; } @@ -1100,14 +1100,13 @@ namespace Content.Shared.Interaction if (!coords.IsValid(EntityManager)) { - Logger.InfoS("system.interaction", $"Invalid Coordinates: client={session}, coords={coords}"); + Log.Info($"Invalid Coordinates: client={session}, coords={coords}"); return false; } if (IsClientSide(uid)) { - Logger.WarningS("system.interaction", - $"Client sent interaction with client-side entity. Session={session}, Uid={uid}"); + Log.Warning($"Client sent interaction with client-side entity. Session={session}, Uid={uid}"); return false; } @@ -1115,15 +1114,13 @@ namespace Content.Shared.Interaction if (userEntity == null || !userEntity.Value.Valid) { - Logger.WarningS("system.interaction", - $"Client sent interaction with no attached entity. Session={session}"); + Log.Warning($"Client sent interaction with no attached entity. Session={session}"); return false; } if (!Exists(userEntity)) { - Logger.WarningS("system.interaction", - $"Client attempted interaction with a non-existent attached entity. Session={session}, entity={userEntity}"); + Log.Warning($"Client attempted interaction with a non-existent attached entity. Session={session}, entity={userEntity}"); return false; }