Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 05:27:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

No spead merge (#475)

Browse Source 
* Revert "[GoobPort] WIZ REAL (#465)"

This reverts commit 091a8ff433.

* fix local
This commit is contained in:
Spatison
2025-04-26 10:50:32 +03:00
committed by GitHub
parent 41606db2c5
commit 2a10c02eb5
949 changed files with 1467 additions and 42235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -32,7 +32,6 @@ using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Player;
using Content.Shared.Coordinates;
using Content.Shared.Whitelist;
using Robust.Shared.Utility;
namespace Content.Server.Explosion.EntitySystems
@@ -52,23 +51,6 @@ namespace Content.Server.Explosion.EntitySystems
}
}
/// <summary>
/// Raised before a trigger is activated.
/// Goobstation: cancellableEEA instead of w/e abomination was there
/// </summary>
[ByRefEvent]
public sealed class BeforeTriggerEvent : CancellableEntityEventArgs
{
public EntityUid Triggered { get; }
public EntityUid? User { get; }
public BeforeTriggerEvent(EntityUid triggered, EntityUid? user = null)
{
Triggered = triggered;
User = user;
}
}
/// <summary>
/// Raised when timer trigger becomes active.
/// </summary>
@@ -93,7 +75,6 @@ namespace Content.Server.Explosion.EntitySystems
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
public override void Initialize()
{
@@ -124,17 +105,8 @@ namespace Content.Server.Explosion.EntitySystems
SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(OnAnchorTrigger);
SubscribeLocalEvent<SoundOnTriggerComponent, TriggerEvent>(OnSoundTrigger);
SubscribeLocalEvent<RattleComponent, TriggerEvent>(HandleRattleTrigger);
SubscribeLocalEvent<TriggerWhitelistComponent, BeforeTriggerEvent>(HandleWhitelist);
}
private void HandleWhitelist(Entity<TriggerWhitelistComponent> ent, ref BeforeTriggerEvent args)
{
// Goobedit
if (!_whitelist.CheckBoth(args.User, ent.Comp.Blacklist, ent.Comp.Whitelist))
args.Cancel();
}
private void OnSoundTrigger(EntityUid uid, SoundOnTriggerComponent component, TriggerEvent args)
{
if (component.RemoveOnTrigger) // if the component gets removed when it's triggered