diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs index f2c15593aad..47bdbfa4165 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -85,7 +85,7 @@ private void RebuildUI() Logger.Warning("No stations exist, nothing to display in late-join GUI"); foreach (var (id, name) in _gameTicker.StationNames - .OrderBy(x=> x.Value.Contains("Central Command") ? 1 : -1) //backmen: centcom + .OrderBy(x=> x.Value.Contains("Central Command") ? 1 : -1) // Corvax-Next-Centcomm ) { var jobList = new BoxContainer diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs index 180d747f682..4a6a2ab85ed 100644 --- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs +++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs @@ -1,15 +1,15 @@ -using System.Linq; +using System.Linq; // Corvax-Next-Centcomm using Content.Server.Objectives.Components; using Content.Server.Revolutionary.Components; using Content.Server.Shuttles.Systems; -using Content.Server.Station.Components; +using Content.Server.Station.Components; // Corvax-Next-Centcomm using Content.Shared.CCVar; using Content.Shared.Mind; using Content.Shared.Objectives.Components; -using Content.Shared.Roles; -using Content.Shared.Roles.Jobs; +using Content.Shared.Roles; // Corvax-Next-Centcomm +using Content.Shared.Roles.Jobs; // Corvax-Next-Centcomm using Robust.Shared.Configuration; -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; // Corvax-Next-Centcomm using Robust.Shared.Random; namespace Content.Server.Objectives.Systems; @@ -24,10 +24,10 @@ public sealed class KillPersonConditionSystem : EntitySystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedMindSystem _mind = default!; [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly SharedRoleSystem _roleSystem = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private readonly SharedRoleSystem _roleSystem = default!; // Corvax-Next-Centcomm + [Dependency] private readonly IPrototypeManager _prototype = default!; // Corvax-Next-Centcomm - private static readonly ProtoId _ccDep = "CentCom"; + private static readonly ProtoId _ccDep = "CentralCommandCorvax"; // Corvax-Next-Centcomm public override void Initialize() { @@ -69,7 +69,7 @@ private void OnPersonAssigned(EntityUid uid, PickRandomPersonComponent comp, ref return; } - // start-backmen: centcom + // Corvax-Next-Centcomm-Start FilterCentCom(allHumans); if (allHumans.Count == 0) @@ -77,13 +77,13 @@ private void OnPersonAssigned(EntityUid uid, PickRandomPersonComponent comp, ref args.Cancelled = true; return; } - // end-backmen: centcom + // Corvax-Next-Centcomm-End _target.SetTarget(uid, _random.Pick(allHumans), target); } - // start-backmen: centcom + // Corvax-Next-Centcomm-Start private void FilterCentCom(List minds) { var centcom = _prototype.Index(_ccDep); @@ -102,7 +102,7 @@ private void FilterCentCom(List minds) minds.Remove(mindId); } } - // end-backmen: centcom + // Corvax-Next-Centcomm-End private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref ObjectiveAssignedEvent args) { @@ -125,7 +125,7 @@ private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref Obj return; } - // start-backmen: centcom + // Corvax-Next-Centcomm-Start FilterCentCom(allHumans); if (allHumans.Count == 0) @@ -133,7 +133,7 @@ private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref Obj args.Cancelled = true; return; } - // end-backmen: centcom + // Corvax-Next-Centcomm-End var allHeads = new List(); foreach (var person in allHumans) diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index 1a493f8a562..88f18ad0307 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -35,7 +35,7 @@ using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Player; -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; // Corvax-Next-Centcomm using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -70,7 +70,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem [Dependency] private readonly StationSystem _station = default!; [Dependency] private readonly TransformSystem _transformSystem = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly Content.Server.Backmen.Arrivals.CentcommSystem _centcommSystem = default!; + [Dependency] private readonly Content.Server._CorvaxNext.Arrivals.CentcommSystem _centcommSystem = default!; // Corvax-Next-Centcomm private const float ShuttleSpawnBuffer = 1f; @@ -89,7 +89,7 @@ public override void Initialize() SubscribeLocalEvent(OnRoundStart); SubscribeLocalEvent(OnRoundCleanup); SubscribeLocalEvent(OnStationStartup); - //SubscribeLocalEvent(OnCentcommShutdown); + //SubscribeLocalEvent(OnCentcommShutdown);// Corvax-Next-Centcomm SubscribeLocalEvent(OnStationInit); SubscribeLocalEvent(OnEmergencyFTL); @@ -400,7 +400,7 @@ public void AnnounceShuttleDock(ShuttleDockResult result, bool extended) // TODO: Need filter extensions or something don't blame me. _audio.PlayGlobal(audioFile, Filter.Broadcast(), true); - _centcommSystem.EnableFtl(_centcommSystem.CentComMapUid); // backmen: centcom + _centcommSystem.EnableFtl(_centcommSystem.CentComMapUid); // // Corvax-Next-Centcomm } private void OnStationInit(EntityUid uid, StationCentcommComponent component, MapInitEvent args) @@ -500,10 +500,10 @@ private void SetupEmergencyShuttle() } } -// start-backmen: centcom +// Corvax-Next-Centcomm-Start private void AddCentcomm(EntityUid station, StationCentcommComponent component) { - var centcom = EntityManager.System(); + var centcom = EntityManager.System(); DebugTools.Assert(LifeStage(station)>= EntityLifeStage.MapInitialized); if (component.MapEntity != null || component.Entity != null) { @@ -527,7 +527,7 @@ public HashSet GetCentcommMaps() return maps; } -// end-backmen: centcom +// Corvax-Next-Centcomm-End private void AddEmergencyShuttle(Entity ent) { @@ -560,7 +560,7 @@ private void AddEmergencyShuttle(Entity(shuttle.Value).LocalAABB.Width + ShuttleSpawnBuffer; - ent.Comp2.ShuttleIndex = _centcommSystem.ShuttleIndex; + _centcommSystem.ShuttleIndex += Comp(shuttle.Value).LocalAABB.Width + ShuttleSpawnBuffer; // Corvax-Next-Centcomm + ent.Comp2.ShuttleIndex = _centcommSystem.ShuttleIndex; // Corvax-Next-Centcomm ent.Comp1.EmergencyShuttle = shuttle; EnsureComp(shuttle.Value); diff --git a/Content.Server/Backmen/Arrivals/CentcommSystem.cs b/Content.Server/_CorvaxNext/Arrivals/CentcommSystem.cs similarity index 98% rename from Content.Server/Backmen/Arrivals/CentcommSystem.cs rename to Content.Server/_CorvaxNext/Arrivals/CentcommSystem.cs index 36e34c49267..f5a6e6fceca 100644 --- a/Content.Server/Backmen/Arrivals/CentcommSystem.cs +++ b/Content.Server/_CorvaxNext/Arrivals/CentcommSystem.cs @@ -12,8 +12,8 @@ using Content.Server.Shuttles.Systems; using Content.Server.Station.Components; using Content.Server.Station.Systems; -using Content.Shared.Backmen.Abilities; -using Content.Shared.Backmen.CentComm; +using Content.Shared._CorvaxNext.Abilities; +using Content.Shared._CorvaxNext.CentComm; using Content.Shared.Cargo.Components; using Content.Shared.CCVar; using Content.Shared.GameTicking; @@ -32,7 +32,7 @@ using Robust.Shared.Random; using Robust.Shared.Utility; -namespace Content.Server.Backmen.Arrivals; +namespace Content.Server._CorvaxNext.Arrivals; public sealed class FtlCentComAnnounce : EntityEventArgs { @@ -189,7 +189,7 @@ private void OnCleanup(RoundRestartCleanupEvent ev) private const string StationCentComMapPool = "DefaultCentcomPool"; [ValidatePrototypeId] - private const string StationCentComMapDefault = "CentComm"; + private const string StationCentComMapDefault = "CorvaxCentcomm"; public void EnsureCentcom(bool force = false) diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 7c6da919fc2..4f1c27fb4d3 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -10,8 +10,8 @@ namespace Content.Shared.Access.Components; [Access(typeof(SharedIdCardConsoleSystem))] public sealed partial class IdCardConsoleComponent : Component { - public const int MaxFullNameLength = 64; - public const int MaxJobTitleLength = 64; + public const int MaxFullNameLength = 30; + public const int MaxJobTitleLength = 30; public static string PrivilegedIdCardSlotId = "IdCardConsole-privilegedId"; public static string TargetIdCardSlotId = "IdCardConsole-targetId"; diff --git a/Content.Shared/Backmen/Abilities/CentcomFTLAction.cs b/Content.Shared/_CorvaxNext/Abilities/CentcomFTLAction.cs similarity index 68% rename from Content.Shared/Backmen/Abilities/CentcomFTLAction.cs rename to Content.Shared/_CorvaxNext/Abilities/CentcomFTLAction.cs index 4726504f5cc..38fabf07e90 100644 --- a/Content.Shared/Backmen/Abilities/CentcomFTLAction.cs +++ b/Content.Shared/_CorvaxNext/Abilities/CentcomFTLAction.cs @@ -1,6 +1,6 @@ using Content.Shared.Actions; -namespace Content.Shared.Backmen.Abilities; +namespace Content.Shared._CorvaxNext.Abilities; public sealed partial class CentcomFtlAction : InstantActionEvent { diff --git a/Content.Shared/_CorvaxNext/CentComm/AllowFtlToCentComComponent.cs b/Content.Shared/_CorvaxNext/CentComm/AllowFtlToCentComComponent.cs index 4e360eee1d3..f04b9653a98 100644 --- a/Content.Shared/_CorvaxNext/CentComm/AllowFtlToCentComComponent.cs +++ b/Content.Shared/_CorvaxNext/CentComm/AllowFtlToCentComComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.GameStates; -namespace Content.Shared.Backmen.CentComm; +namespace Content.Shared._CorvaxNext.CentComm; [RegisterComponent, NetworkedComponent] public sealed partial class AllowFtlToCentComComponent : Component diff --git a/Content.Shared/_CorvaxNext/CentComm/FtlActionComponent.cs b/Content.Shared/_CorvaxNext/CentComm/FtlActionComponent.cs index 4df3283b10c..bb1040e5e5e 100644 --- a/Content.Shared/_CorvaxNext/CentComm/FtlActionComponent.cs +++ b/Content.Shared/_CorvaxNext/CentComm/FtlActionComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Actions; -namespace Content.Shared.Backmen.Abilities; +namespace Content.Shared._CorvaxNext.Abilities; public sealed partial class CentcomFtlAction : InstantActionEvent { diff --git a/Content.Shared/Backmen/Shuttles/Components/CentcommShuttleComponent.cs b/Content.Shared/_CorvaxNext/Shuttles/Components/CentcommShuttleComponent.cs similarity index 59% rename from Content.Shared/Backmen/Shuttles/Components/CentcommShuttleComponent.cs rename to Content.Shared/_CorvaxNext/Shuttles/Components/CentcommShuttleComponent.cs index f68f2f63df5..ec873378aca 100644 --- a/Content.Shared/Backmen/Shuttles/Components/CentcommShuttleComponent.cs +++ b/Content.Shared/_CorvaxNext/Shuttles/Components/CentcommShuttleComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Backmen.Shuttles.Components; +namespace Content.Shared._CorvaxNext.Shuttles.Components; [RegisterComponent] public sealed partial class CentcommShuttleComponent : Component diff --git a/Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl b/Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl deleted file mode 100644 index 527252a12d3..00000000000 --- a/Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl +++ /dev/null @@ -1,2 +0,0 @@ -department-CentralCommandCorvax = Центральное Командование -job-supervisors-centcom2 = руководству НТ diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/roles/departments.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/roles/departments.ftl new file mode 100644 index 00000000000..4689e7ce738 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/roles/departments.ftl @@ -0,0 +1,2 @@ +department-CentCom-name = Центральное Командование +department-CentCom-desc = Только по вайтлисту. diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml index ea26ed368f8..dceb0486679 100644 --- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml @@ -1,7 +1,7 @@ - type: department id: CentralCommandCorvax - name: Центральное Командование - description: Только по вайтлисту. + name: department-CentCom-name + description: department-CentCom-desc color: "#13db0f" roles: - CCOperator