diff --git a/Content.Server/_DV/Cargo/Systems/CargoSystem.ATS.cs b/Content.Server/_DV/Cargo/Systems/CargoSystem.ATS.cs index 05b4e1a716..0282456909 100644 --- a/Content.Server/_DV/Cargo/Systems/CargoSystem.ATS.cs +++ b/Content.Server/_DV/Cargo/Systems/CargoSystem.ATS.cs @@ -16,6 +16,7 @@ using Robust.Shared.Map; using Robust.Shared.Physics.Components; using Robust.Shared.Utility; using System.Linq; +using Content.Server.Shuttles.Systems; namespace Content.Server.Cargo.Systems; @@ -25,9 +26,9 @@ namespace Content.Server.Cargo.Systems; public sealed partial class CargoSystem { [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly IComponentFactory _factory = default!; [Dependency] private readonly MapLoaderSystem _mapLoader = default!; [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private readonly ShuttleConsoleSystem _console = default!; public EntityUid? CargoMap; @@ -88,7 +89,7 @@ public sealed partial class CargoSystem { Components = [ - _factory.GetComponentName(typeof(CargoShuttleComponent)) + Factory.GetComponentName(typeof(CargoShuttleComponent)) ] }; diff --git a/Content.Server/_DV/Cargo/Systems/PricingSystem.Modifier.cs b/Content.Server/_DV/Cargo/Systems/PricingSystem.Modifier.cs index 0b9290ec16..27973a4783 100644 --- a/Content.Server/_DV/Cargo/Systems/PricingSystem.Modifier.cs +++ b/Content.Server/_DV/Cargo/Systems/PricingSystem.Modifier.cs @@ -13,7 +13,7 @@ public sealed partial class PricingSystem /// The modified price. private double ApplyPrototypePriceModifier(EntityPrototype prototype, double basePrice) { - if (prototype.Components.TryGetValue(_factory.GetComponentName(typeof(PriceModifierComponent)), + if (prototype.Components.TryGetValue(Factory.GetComponentName(typeof(PriceModifierComponent)), out var modProto)) { var priceModifier = (PriceModifierComponent)modProto.Component; diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs index 08b8dca5c4..82a3f48427 100644 --- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs +++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs @@ -154,7 +154,7 @@ namespace Content.Shared.StatusEffect if (TryAddStatusEffect(uid, key, time, refresh, status)) { EntityManager.AddComponent(uid, component, true); - status.ActiveEffects[key].RelevantComponent = _componentFactory.GetComponentName(component.GetType()); + status.ActiveEffects[key].RelevantComponent = Factory.GetComponentName(component.GetType()); return true; }