Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AwareFoxy committed Nov 12, 2024
1 parent 05d7639 commit 4a62c2a
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion Content.Client/LateJoin/LateJoinGui.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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<DepartmentPrototype> _ccDep = "CentCom";
private static readonly ProtoId<DepartmentPrototype> _ccDep = "CentralCommandCorvax"; // Corvax-Next-Centcomm

public override void Initialize()
{
Expand Down Expand Up @@ -69,21 +69,21 @@ private void OnPersonAssigned(EntityUid uid, PickRandomPersonComponent comp, ref
return;
}

// start-backmen: centcom
// Corvax-Next-Centcomm-Start
FilterCentCom(allHumans);

if (allHumans.Count == 0)
{
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<EntityUid> minds)
{
var centcom = _prototype.Index(_ccDep);
Expand All @@ -102,7 +102,7 @@ private void FilterCentCom(List<EntityUid> minds)
minds.Remove(mindId);
}
}
// end-backmen: centcom
// Corvax-Next-Centcomm-End

private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref ObjectiveAssignedEvent args)
{
Expand All @@ -125,15 +125,15 @@ private void OnHeadAssigned(EntityUid uid, PickRandomHeadComponent comp, ref Obj
return;
}

// start-backmen: centcom
// Corvax-Next-Centcomm-Start
FilterCentCom(allHumans);

if (allHumans.Count == 0)
{
args.Cancelled = true;
return;
}
// end-backmen: centcom
// Corvax-Next-Centcomm-End

var allHeads = new List<EntityUid>();
foreach (var person in allHumans)
Expand Down
20 changes: 10 additions & 10 deletions Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -89,7 +89,7 @@ public override void Initialize()
SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundCleanup);
SubscribeLocalEvent<StationEmergencyShuttleComponent, StationPostInitEvent>(OnStationStartup);
//SubscribeLocalEvent<StationCentcommComponent, ComponentShutdown>(OnCentcommShutdown);
//SubscribeLocalEvent<StationCentcommComponent, ComponentShutdown>(OnCentcommShutdown);// Corvax-Next-Centcomm
SubscribeLocalEvent<StationCentcommComponent, MapInitEvent>(OnStationInit);

SubscribeLocalEvent<EmergencyShuttleComponent, FTLStartedEvent>(OnEmergencyFTL);
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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<Content.Server.Backmen.Arrivals.CentcommSystem>();
var centcom = EntityManager.System<Content.Server._CorvaxNext.Arrivals.CentcommSystem>();
DebugTools.Assert(LifeStage(station)>= EntityLifeStage.MapInitialized);
if (component.MapEntity != null || component.Entity != null)
{
Expand All @@ -527,7 +527,7 @@ public HashSet<EntityUid> GetCentcommMaps()

return maps;
}
// end-backmen: centcom
// Corvax-Next-Centcomm-End

private void AddEmergencyShuttle(Entity<StationEmergencyShuttleComponent?, StationCentcommComponent?> ent)
{
Expand Down Expand Up @@ -560,7 +560,7 @@ private void AddEmergencyShuttle(Entity<StationEmergencyShuttleComponent?, Stati
var shuttle = _map.LoadGrid(map.MapId, shuttlePath.ToString(), new MapLoadOptions()
{
// Should be far enough... right? I'm too lazy to bounds check CentCom rn.
Offset = new Vector2(500f + _centcommSystem.ShuttleIndex, 0f),
Offset = new Vector2(500f + _centcommSystem.ShuttleIndex, 0f), // Corvax-Next-Centcomm
// fun fact: if you just fucking yeet centcomm into nullspace anytime you try to spawn the shuttle, then any distance is far enough. so lets not do that
LoadMap = false,
});
Expand All @@ -571,8 +571,8 @@ private void AddEmergencyShuttle(Entity<StationEmergencyShuttleComponent?, Stati
return;
}

_centcommSystem.ShuttleIndex += Comp<MapGridComponent>(shuttle.Value).LocalAABB.Width + ShuttleSpawnBuffer;
ent.Comp2.ShuttleIndex = _centcommSystem.ShuttleIndex;
_centcommSystem.ShuttleIndex += Comp<MapGridComponent>(shuttle.Value).LocalAABB.Width + ShuttleSpawnBuffer; // Corvax-Next-Centcomm
ent.Comp2.ShuttleIndex = _centcommSystem.ShuttleIndex; // Corvax-Next-Centcomm

ent.Comp1.EmergencyShuttle = shuttle;
EnsureComp<ProtectedGridComponent>(shuttle.Value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
{
Expand Down Expand Up @@ -189,7 +189,7 @@ private void OnCleanup(RoundRestartCleanupEvent ev)
private const string StationCentComMapPool = "DefaultCentcomPool";

[ValidatePrototypeId<GameMapPrototype>]
private const string StationCentComMapDefault = "CentComm";
private const string StationCentComMapDefault = "CorvaxCentcomm";


public void EnsureCentcom(bool force = false)
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/Access/Components/IdCardConsoleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Content.Shared.Actions;

namespace Content.Shared.Backmen.Abilities;
namespace Content.Shared._CorvaxNext.Abilities;

public sealed partial class CentcomFtlAction : InstantActionEvent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/_CorvaxNext/CentComm/FtlActionComponent.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Content.Shared.Actions;

namespace Content.Shared.Backmen.Abilities;
namespace Content.Shared._CorvaxNext.Abilities;

public sealed partial class CentcomFtlAction : InstantActionEvent
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Content.Shared.Backmen.Shuttles.Components;
namespace Content.Shared._CorvaxNext.Shuttles.Components;

[RegisterComponent]
public sealed partial class CentcommShuttleComponent : Component
Expand Down
2 changes: 0 additions & 2 deletions Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
department-CentCom-name = Центральное Командование
department-CentCom-desc = Только по вайтлисту.
4 changes: 2 additions & 2 deletions Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: department
id: CentralCommandCorvax
name: Центральное Командование
description: Только по вайтлисту.
name: department-CentCom-name
description: department-CentCom-desc
color: "#13db0f"
roles:
- CCOperator

0 comments on commit 4a62c2a

Please sign in to comment.