cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert tactical hacking (#3373) 

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas 2025-04-05 15:47:59 +01:00 committed by GitHub
parent 0cdf42bf5c
commit 3893764ff6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Wires/BaseToggleWireAction.cs
View File

@ -29,9 +29,7 @@ public abstract partial class BaseToggleWireAction : BaseWireAction
public override bool Cut(EntityUid user, Wire wire)
{
if (!base.Cut(user, wire)) // Nyanotrasen - Tactical hacking
return false;
base.Cut(user, wire);
ToggleValue(wire.Owner, false);
if (TimeoutKey != null)
@ -44,9 +42,7 @@ public abstract partial class BaseToggleWireAction : BaseWireAction
public override bool Mend(EntityUid user, Wire wire)
{
if (!base.Mend(user, wire)) // Nyanotrasen - Tactical hacking
return false;
base.Mend(user, wire);
ToggleValue(wire.Owner, true);
return true;

61
Content.Server/Wires/BaseWireAction.cs
View File

@ -1,5 +1,3 @@
using Robust.Shared.Random;
using Content.Server.Electrocution;
using Content.Server.Power.EntitySystems;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
@ -32,24 +30,6 @@ public abstract partial class BaseWireAction : IWireAction
[DataField("lightRequiresPower")]
public virtual bool LightRequiresPower { get; set; } = true;
/// <summary>
/// Nyanotrasen - The chance that the user is shocked when tampering with the wire: cutting, pulsing, or mending it.
/// </summary>
[DataField("shockChance")]
public float ShockChance = 0.55f;
/// <summary>
/// Nyanotrasen - How much damage the user takes when tampering.
/// </summary>
[DataField("shockDamage")]
public int ShockDamage = 15;
/// <summary>
/// Nyanotrasen - How long the user is stunned after a failed tamper attempt.
/// </summary>
[DataField("shockStunTime")]
public TimeSpan ShockStunTime = TimeSpan.FromSeconds(3f);
public virtual StatusLightData? GetStatusLightData(Wire wire)
{
if (LightRequiresPower && !IsPowered(wire.Owner))
@ -64,9 +44,7 @@ public abstract partial class BaseWireAction : IWireAction
public virtual StatusLightState? GetLightState(Wire wire) => null;
public IEntityManager EntityManager = default!;
public IRobustRandom Random = default!;
public WiresSystem WiresSystem = default!;
public ElectrocutionSystem ElectrocutionSystem = default!;
// not virtual so implementors are aware that they need a nullable here
public abstract object? StatusKey { get; }
@ -76,47 +54,14 @@ public abstract partial class BaseWireAction : IWireAction
{
EntityManager = IoCManager.Resolve<IEntityManager>();
_adminLogger = IoCManager.Resolve<ISharedAdminLogManager>();
Random = IoCManager.Resolve<IRobustRandom>();
WiresSystem = EntityManager.EntitySysManager.GetEntitySystem<WiresSystem>();
ElectrocutionSystem = EntityManager.EntitySysManager.GetEntitySystem<ElectrocutionSystem>();
}
public virtual bool AddWire(Wire wire, int count) => count == 1;
public virtual bool Cut(EntityUid user, Wire wire) => !TryShockUser(user, wire, "cutting") && Log(user, wire, "cut"); // Nyanotrasen - Tactical hacking
public virtual bool Mend(EntityUid user, Wire wire) => !TryShockUser(user, wire, "mending") && Log(user, wire, "mended"); // Nyanotrasen - Tactical hacking
public virtual void Pulse(EntityUid user, Wire wire) // Nyanotrasen - Tactical hacking
{
if (!TryShockUser(user, wire, "pulsing"))
Log(user, wire, "pulsed");
}
/// <summary>
/// Nyanotrasen - Returns true if the user has been shocked.
/// </summary>
private bool TryShockUser(EntityUid user, Wire wire, string verb)
{
if (!IsPowered(wire.Owner))
return false;
if (!Random.Prob(ShockChance))
return false;
var shocked = ElectrocutionSystem.TryDoElectrocution(user, wire.Owner, ShockDamage, ShockStunTime, false);
if (shocked)
{
var player = EntityManager.ToPrettyString(user);
var owner = EntityManager.ToPrettyString(wire.Owner);
var name = Loc.GetString(Name);
var color = wire.Color.Name();
var action = GetType().Name;
_adminLogger.Add(LogType.WireHacking, LogImpact.Medium, $"{player} shocked by {owner} when {verb} {color} {name} wire ({action})");
}
return shocked;
}
public virtual bool Cut(EntityUid user, Wire wire) => Log(user, wire, "cut");
public virtual bool Mend(EntityUid user, Wire wire) => Log(user, wire, "mended");
public virtual void Pulse(EntityUid user, Wire wire) => Log(user, wire, "pulsed");
private bool Log(EntityUid user, Wire wire, string verb)
{

4
Content.Server/Wires/WiresComponent.cs
View File

@ -48,8 +48,8 @@ public sealed partial class WiresComponent : Component
/// If this should follow the layout saved the first time the layout dictated by the
/// layout ID is generated, or if a new wire order should be generated every time.
/// </summary>
[DataField("alwaysRandomize")]
public bool AlwaysRandomize { get; private set; } = true; // Nyanotrasen - Always randomize wires
[DataField]
public bool AlwaysRandomize { get; private set; }
/// <summary>
/// Per wire status, keyed by an object.