diff --git a/Content.Server/GameTicking/Rules/RoundstartFugitiveRuleSystem.cs b/Content.Server/GameTicking/Rules/RoundstartFugitiveRuleSystem.cs index 78a2b5a0a31..e854fa964d0 100644 --- a/Content.Server/GameTicking/Rules/RoundstartFugitiveRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RoundstartFugitiveRuleSystem.cs @@ -35,7 +35,9 @@ public sealed class RoundstartFugitiveRuleSystem : GameRuleSystem(); var consoles = new List(); while (query.MoveNext(out var console, out var xform, out _)) { - if (StationSystem.GetOwningStation(console, xform) != comp.Station || HasComp(console)) + if (_station.GetOwningStation(console, xform) != comp.Station || HasComp(console)) continue; consoles.Add(xform); @@ -120,7 +122,7 @@ private void OnEntitySelected(Entity ent, ref A var fugi = args.EntityUid; comp.Report = GenerateReport(fugi, comp).ToMarkup(); - comp.Station = StationSystem.GetOwningStation(fugi); + comp.Station = _station.GetOwningStation(fugi); comp.NextAnnounce = Timing.CurTime + comp.AnnounceDelay; _popup.PopupEntity(Loc.GetString("fugitive-spawn"), fugi, fugi); @@ -163,7 +165,7 @@ private FormattedMessage GenerateReport(EntityUid uid, RoundstartFugitiveRuleCom return report; } - var species = PrototypeManager.Index(humanoid.Species); + var species = _proto.Index(humanoid.Species); //IPrototype or protoype report.PushMarkup(Loc.GetString("fugitive-report-morphotype", ("species", Loc.GetString(species.Name)))); report.PushMarkup(Loc.GetString("fugitive-report-age", ("age", humanoid.Age))); @@ -205,7 +207,7 @@ private string GetPrints(EntityUid uid) private void AddCharges(FormattedMessage report, RoundstartFugitiveRuleComponent rule) { - var crimeTypes = PrototypeManager.Index(rule.CrimesDataset); + var crimeTypes = _proto.Index(rule.CrimesDataset); var crimes = new HashSet(); var total = RobustRandom.Next(rule.MinCrimes, rule.MaxCrimes + 1); while (crimes.Count < total)