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

Немного изменений (#463)

Browse Source 
* Git Taburet

* Git Taburet2

* fix conflict
This commit is contained in:
Spatison
2024-07-19 15:52:56 +03:00
committed by GitHub
parent a8002843a3
commit 2454da3e8d
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Prying/Systems/PryingSystem.cs
View File

@@ -99,7 +99,7 @@ public sealed class PryingSystem : EntitySystem
// to be marked as handled.
return true;
return StartPry(target, user, null, 0.1f, out id); // hand-prying is much slower
return StartPry(target, user, null, 10f, out id); // hand-prying is much slower
}
private bool CanPry(EntityUid target, EntityUid user, out string? message, PryingComponent? comp = null)
@@ -133,7 +133,10 @@ public sealed class PryingSystem : EntitySystem
var modEv = new GetPryTimeModifierEvent(user);
RaiseLocalEvent(target, ref modEv);
var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(modEv.BaseTime * modEv.PryTimeModifier / toolModifier), new DoorPryDoAfterEvent(), target, target, tool)
var time = TimeSpan.FromSeconds(!TryComp<AirlockComponent>(target, out var airlock) || !airlock.Powered ? 0 : modEv.BaseTime * modEv.PryTimeModifier * toolModifier); // WD EDIT
var doAfterArgs = new DoAfterArgs(EntityManager, user, time, new DoorPryDoAfterEvent(), target, target, tool)
{
BreakOnDamage = true,
BreakOnMove = true,
@@ -166,7 +169,7 @@ public sealed class PryingSystem : EntitySystem
return;
}
if (args.Used != null && comp != null)
if (args.Used != null && comp != null && door.State is not DoorState.Closing and not DoorState.Opening)
{
_audioSystem.PlayPredicted(comp.UseSound, args.Used.Value, args.User);
}