diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index 5f1bb06fe1..aa5fa3dd36 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -10,6 +10,7 @@ using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Shared.CCVar; using Content.Shared.MobState; +using Content.Shared.Dataset; using Content.Shared.Roles; using Robust.Server.Maps; using Robust.Server.Player; @@ -213,6 +214,8 @@ public sealed class NukeopsRuleSystem : GameRuleSystem var commanderGear = _prototypeManager.Index("SyndicateCommanderGearFull"); var starterGear = _prototypeManager.Index("SyndicateOperativeGearFull"); var medicGear = _prototypeManager.Index("SyndicateOperativeMedicFull"); + var syndicateNamesElite = new List(_prototypeManager.Index("SyndicateNamesElite").Values); + var syndicateNamesNormal = new List(_prototypeManager.Index("SyndicateNamesNormal").Values); var spawns = new List(); @@ -239,15 +242,15 @@ public sealed class NukeopsRuleSystem : GameRuleSystem switch (i) { case 0: - name = $"Commander"; + name = $"Commander " + _random.PickAndTake(syndicateNamesElite); gear = commanderGear; break; case 1: - name = $"Operator #{i}"; + name = $"Agent " + _random.PickAndTake(syndicateNamesNormal); gear = medicGear; break; default: - name = $"Operator #{i}"; + name = $"Operator " + _random.PickAndTake(syndicateNamesNormal); gear = starterGear; break; } diff --git a/Resources/Prototypes/Datasets/Names/syndicate.yml b/Resources/Prototypes/Datasets/Names/syndicate.yml new file mode 100644 index 0000000000..827d32197d --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/syndicate.yml @@ -0,0 +1,55 @@ +- type: dataset + id: SyndicateNamesNormal + values: + - Alfa + - Bravo + - Charlie + - Delta + - Echo + - Foxtrot + - Golf + - Hotel + - India + - Juliett + - Kilo + - Lima + - Mike + - November + - Oscar + - Papa + - Quebec + - Romeo + - Sierra + - Tango + - Uniform + - Victor + - Whiskey + - X-Ray + - Zulu + +- type: dataset + id: SyndicateNamesElite + values: + - Alpha + - Beta + - Gamma + - Delta + - Epsilon + - Zeta + - Eta + - Theta + - Iota + - Lambda + - Mu + - Nu + - Xi + - Omicron + - Pi + - Rho + - Sigma + - Tau + - Upsilon + - Phi + - Chi + - Psi + - Omega