Add DisposalUnit logs (#13309)
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using Content.Server.Administration.Logs;
|
||||||
using Content.Server.Atmos.EntitySystems;
|
using Content.Server.Atmos.EntitySystems;
|
||||||
using Content.Server.Disposal.Tube.Components;
|
using Content.Server.Disposal.Tube.Components;
|
||||||
using Content.Server.Disposal.Unit.Components;
|
using Content.Server.Disposal.Unit.Components;
|
||||||
@@ -10,6 +11,7 @@ using Content.Server.Power.Components;
|
|||||||
using Content.Shared.ActionBlocker;
|
using Content.Shared.ActionBlocker;
|
||||||
using Content.Shared.Atmos;
|
using Content.Shared.Atmos;
|
||||||
using Content.Shared.Construction.Components;
|
using Content.Shared.Construction.Components;
|
||||||
|
using Content.Shared.Database;
|
||||||
using Content.Shared.Destructible;
|
using Content.Shared.Destructible;
|
||||||
using Content.Shared.Disposal;
|
using Content.Shared.Disposal;
|
||||||
using Content.Shared.Disposal.Components;
|
using Content.Shared.Disposal.Components;
|
||||||
@@ -36,6 +38,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
|
public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
||||||
|
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||||
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
||||||
[Dependency] private readonly AppearanceSystem _appearance = default!;
|
[Dependency] private readonly AppearanceSystem _appearance = default!;
|
||||||
[Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
|
[Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
|
||||||
@@ -152,6 +155,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
Act = () =>
|
Act = () =>
|
||||||
{
|
{
|
||||||
_handsSystem.TryDropIntoContainer(args.User, args.Using.Value, component.Container, checkActionBlocker: false, args.Hands);
|
_handsSystem.TryDropIntoContainer(args.User, args.Using.Value, component.Container, checkActionBlocker: false, args.Hands);
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} inserted {ToPrettyString(args.Using.Value)} into {ToPrettyString(uid)}");
|
||||||
AfterInsert(component, args.Using.Value);
|
AfterInsert(component, args.Using.Value);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -168,11 +172,15 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unit.Container.Insert(toInsert))
|
if (!unit.Container.Insert(toInsert))
|
||||||
|
return;
|
||||||
|
if (ev.User != null)
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Medium,
|
||||||
|
$"{ToPrettyString(ev.User.Value):player} inserted {ToPrettyString(toInsert)} into {ToPrettyString(unit.Owner)}");
|
||||||
AfterInsert(unit, toInsert);
|
AfterInsert(unit, toInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DoInsertDisposalUnit(EntityUid unit, EntityUid toInsert, DisposalUnitComponent? disposal = null)
|
public void DoInsertDisposalUnit(EntityUid unit, EntityUid toInsert, EntityUid user, DisposalUnitComponent? disposal = null)
|
||||||
{
|
{
|
||||||
if (!Resolve(unit, ref disposal))
|
if (!Resolve(unit, ref disposal))
|
||||||
return;
|
return;
|
||||||
@@ -180,6 +188,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
if (!disposal.Container.Insert(toInsert))
|
if (!disposal.Container.Insert(toInsert))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(user):player} inserted {ToPrettyString(toInsert)} into {ToPrettyString(unit)}");
|
||||||
AfterInsert(disposal, toInsert);
|
AfterInsert(disposal, toInsert);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,14 +216,20 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
{
|
{
|
||||||
case SharedDisposalUnitComponent.UiButton.Eject:
|
case SharedDisposalUnitComponent.UiButton.Eject:
|
||||||
TryEjectContents(component);
|
TryEjectContents(component);
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} hit eject button on {ToPrettyString(uid)}");
|
||||||
break;
|
break;
|
||||||
case SharedDisposalUnitComponent.UiButton.Engage:
|
case SharedDisposalUnitComponent.UiButton.Engage:
|
||||||
ToggleEngage(component);
|
ToggleEngage(component);
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} hit flush button on {ToPrettyString(uid)}, it's now {(component.Engaged ? "on" : "off")}");
|
||||||
break;
|
break;
|
||||||
case SharedDisposalUnitComponent.UiButton.Power:
|
case SharedDisposalUnitComponent.UiButton.Power:
|
||||||
TogglePower(component);
|
TogglePower(component);
|
||||||
_audio.PlayPvs(new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"), component.Owner,
|
_audio.PlayPvs(new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"), component.Owner,
|
||||||
AudioParams.Default.WithVolume(-2f));
|
AudioParams.Default.WithVolume(-2f));
|
||||||
|
if (EntityManager.TryGetComponent(component.Owner, out ApcPowerReceiverComponent? receiver))
|
||||||
|
{
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} hit power button on {ToPrettyString(uid)}, it's now {(!receiver.PowerDisabled ? "on" : "off")}");
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new ArgumentOutOfRangeException();
|
throw new ArgumentOutOfRangeException();
|
||||||
@@ -274,6 +289,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} inserted {ToPrettyString(args.Used)} into {ToPrettyString(uid)}");
|
||||||
AfterInsert(component, args.Used);
|
AfterInsert(component, args.Used);
|
||||||
args.Handled = true;
|
args.Handled = true;
|
||||||
}
|
}
|
||||||
@@ -291,6 +307,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (args.User != null)
|
||||||
|
_adminLogger.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(args.Thrown)} thrown by {ToPrettyString(args.User.Value):player} landed in {ToPrettyString(uid)}");
|
||||||
AfterInsert(component, args.Thrown);
|
AfterInsert(component, args.Thrown);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ namespace Content.Server.Storage.EntitySystems
|
|||||||
{
|
{
|
||||||
foreach (var entity in dumpQueue)
|
foreach (var entity in dumpQueue)
|
||||||
{
|
{
|
||||||
_disposalUnitSystem.DoInsertDisposalUnit(args.Target.Value, entity);
|
_disposalUnitSystem.DoInsertDisposalUnit(args.Target.Value, entity, args.User);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,4 +80,5 @@ public enum LogType
|
|||||||
Stripping = 75,
|
Stripping = 75,
|
||||||
Stamina = 76,
|
Stamina = 76,
|
||||||
EntitySpawn = 77,
|
EntitySpawn = 77,
|
||||||
|
Container = 78,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user