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

Make Modular Grenades with Chemical payload respect their trigger delay (#39905)

Browse Source 
* adds `KeysIn` data field to `ChemicalPayloadComponent`

And check when handling chemical payloads that a trigger key exists.

* Update Content.Server/Payload/EntitySystems/PayloadSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Serylis of Five
2025-08-27 00:26:13 +02:00
committed by GitHub
parent 79c006701e
commit 00360968b7
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Payload/EntitySystems/PayloadSystem.cs
View File

@@ -150,7 +150,9 @@ public sealed class PayloadSystem : EntitySystem
private void HandleChemicalPayloadTrigger(Entity<ChemicalPayloadComponent> entity, ref TriggerEvent args)
{
// TODO: Adjust to the new trigger system
if (args.Key != null && !entity.Comp.KeysIn.Contains(args.Key))
return;
if (entity.Comp.BeakerSlotA.Item is not EntityUid beakerA
|| entity.Comp.BeakerSlotB.Item is not EntityUid beakerB
|| !TryComp(beakerA, out FitsInDispenserComponent? compA)