Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[tweak] critical logs in admin chat

Browse Source 
# Conflicts:
#	Content.Server/AME/AMENodeGroup.cs
#	Content.Server/AME/Components/AMEControllerComponent.cs
#	Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
#	Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
#	Content.Server/Gravity/GravityGeneratorSystem.cs
#	Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
#	Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
#	Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
This commit is contained in:
rhailrake
2023-04-27 20:49:41 +06:00
committed by Remuchi
parent ea4f7595a2
commit 509a5d6862
7 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Administration.Logs;
using Content.Server.Popups;
using Content.Server.Chat.Managers;
using Content.Server.Singularity.Events;
using Content.Shared.Construction.Components;
using Content.Shared.Database;
@@ -23,6 +24,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly SharedPointLightSystem _light = default!;
[Dependency] private readonly TagSystem _tags = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
public override void Initialize()
{
@@ -210,6 +212,8 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem
if (component.PowerBuffer < component.PowerMinimum && component.Connections.Count != 0)
{
_chatManager.SendAdminAnnouncement(Loc.GetString("admin-chatalert-singularity-field-down",
("fieldgenerator", ToPrettyString(generator))));
RemoveConnections(generator);
}

9
Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Mind.Components;
using Content.Shared.Singularity.Components;
using Content.Shared.Singularity.EntitySystems;
using Content.Shared.Tag;
using Content.Server.Chat.Managers;
using Robust.Shared.Containers;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
@@ -30,6 +31,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
#endregion Dependencies
public override void Initialize()
@@ -82,6 +84,13 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
var curTime = _timing.CurTime;
if (eventHorizon.NextConsumeWaveTime <= curTime)
Update(uid, eventHorizon, xform);
if (eventHorizon is not { WasDetectedInBreach: false, CanBreachContainment: true })
continue;
_chatManager.SendAdminAnnouncement(Loc.GetString("admin-chatalert-singularity-can-breach-containment",
("singularity", ToPrettyString(uid))));
eventHorizon.WasDetectedInBreach = true;
}
}

22
Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs
View File

@@ -1,5 +1,8 @@
using System.Linq;
using Content.Server.Chat.Managers;
using Content.Server.ParticleAccelerator.Components;
using Content.Server.Singularity.Components;
using Content.Shared.Coordinates;
using Content.Shared.Singularity.Components;
using Robust.Shared.Physics.Events;
@@ -9,6 +12,8 @@ public sealed class SingularityGeneratorSystem : EntitySystem
{
#region Dependencies
[Dependency] private readonly IViewVariablesManager _vvm = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
#endregion Dependencies
public override void Initialize()
@@ -44,6 +49,23 @@ public sealed class SingularityGeneratorSystem : EntitySystem
return;
SetPower(uid, 0, comp);
#region Logging
var fieldComp = _entityManager.EntityQuery<ContainmentFieldComponent>();
if (!fieldComp.Any())
{
_chatManager.SendAdminAnnouncement(Loc.GetString("admin-chatalert-singularity-no-fields",
("singularity", ToPrettyString(uid))));
}
foreach (var singComp in fieldComp)
{
if (!singComp.Owner.ToCoordinates().InRange(_entityManager, uid.ToCoordinates(), 7))
{
_chatManager.SendAdminAnnouncement(Loc.GetString("admin-chatalert-singularity-no-fields",
("singularity", ToPrettyString(uid))));
break;
}
}
#endregion Logging
EntityManager.SpawnEntity(comp.SpawnPrototype, Transform(uid).Coordinates);
}