tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add pull logs (#12922)

Browse Source 
* add pull logs

* fix logs for stopping pulling

* rm missed line
This commit is contained in:
Chief-Engineer
2022-12-18 19:15:55 -06:00
committed by GitHub
parent b689e9a91a
commit 081982735c
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Pulling/Systems/SharedPullerSystem.cs
View File

@@ -1,4 +1,6 @@
using Content.Shared.Administration.Logs;
using Content.Shared.Alert; using Content.Shared.Alert;
using Content.Shared.Database;
using Content.Shared.Hands; using Content.Shared.Hands;
using Content.Shared.Movement.Systems; using Content.Shared.Movement.Systems;
using Content.Shared.Physics.Pull; using Content.Shared.Physics.Pull;
@@ -13,6 +15,7 @@ namespace Content.Shared.Pulling.Systems
[Dependency] private readonly SharedPullingSystem _pullSystem = default!; [Dependency] private readonly SharedPullingSystem _pullSystem = default!;
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!;
[Dependency] private readonly AlertsSystem _alertsSystem = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -60,6 +63,8 @@ namespace Content.Shared.Pulling.Systems
return; return;
var euid = component.Owner; var euid = component.Owner;
if (_alertsSystem.IsShowingAlert(euid, AlertType.Pulling))
_adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(euid):user} stopped pulling {ToPrettyString(args.Pulled.Owner):target}");
_alertsSystem.ClearAlert(euid, AlertType.Pulling); _alertsSystem.ClearAlert(euid, AlertType.Pulling);
RefreshMovementSpeed(component); RefreshMovementSpeed(component);

5
Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Logs;
using Content.Shared.Buckle.Components; using Content.Shared.Buckle.Components;
using Content.Shared.Database;
using Content.Shared.Hands.EntitySystems; using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Physics.Pull; using Content.Shared.Physics.Pull;
@@ -18,6 +20,7 @@ namespace Content.Shared.Pulling
[Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
public bool CanPull(EntityUid puller, EntityUid pulled) public bool CanPull(EntityUid puller, EntityUid pulled)
{ {
@@ -196,6 +199,8 @@ namespace Content.Shared.Pulling
_pullSm.ForceRelationship(puller, pullable); _pullSm.ForceRelationship(puller, pullable);
pullable.PrevFixedRotation = pullablePhysics.FixedRotation; pullable.PrevFixedRotation = pullablePhysics.FixedRotation;
pullablePhysics.FixedRotation = pullable.FixedRotationOnPull; pullablePhysics.FixedRotation = pullable.FixedRotationOnPull;
_adminLogger.Add(LogType.Action, LogImpact.Low,
$"{ToPrettyString(puller.Owner):user} started pulling {ToPrettyString(pullable.Owner):target}");
return true; return true;
} }