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

Fix radiation damage being misattributed to radiation receiver (caused artifacts to not be triggered by ambient rads) (#41065)

Browse Source 
* Xenoartifact: Fixed ambient radiation damage not triggering

Fixed ambient radiation damage not triggering artifact.

* Revert "Xenoartifact: Fixed ambient radiation damage not triggering"

This reverts commit 30e5c7cdb49c15574b49ddd1a1f7b1768abd2614.

* Fix radiation damage misattribution
This commit is contained in:
TheGrimbeeper
2025-10-24 20:10:19 +11:00
committed by GitHub
parent a97c0d35b1
commit dd9a1de77f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Radiation/Systems/RadiationSystem.cs
View File

@@ -49,9 +49,9 @@ public sealed partial class RadiationSystem : EntitySystem
_accumulator = 0f; _accumulator = 0f;
} }
public void IrradiateEntity(EntityUid uid, float radsPerSecond, float time) public void IrradiateEntity(EntityUid uid, float radsPerSecond, float time, EntityUid? origin = null)
{ {
var msg = new OnIrradiatedEvent(time, radsPerSecond, uid); var msg = new OnIrradiatedEvent(time, radsPerSecond, origin);
RaiseLocalEvent(uid, msg); RaiseLocalEvent(uid, msg);
} }

4
Content.Shared/Radiation/Events/OnIrradiatedEvent.cs
View File

@@ -4,13 +4,13 @@ namespace Content.Shared.Radiation.Events;
/// Raised on entity when it was irradiated /// Raised on entity when it was irradiated
/// by some radiation source. /// by some radiation source.
/// </summary> /// </summary>
public readonly record struct OnIrradiatedEvent(float FrameTime, float RadsPerSecond, EntityUid Origin) public readonly record struct OnIrradiatedEvent(float FrameTime, float RadsPerSecond, EntityUid? Origin)
{ {
public readonly float FrameTime = FrameTime; public readonly float FrameTime = FrameTime;
public readonly float RadsPerSecond = RadsPerSecond; public readonly float RadsPerSecond = RadsPerSecond;
public readonly EntityUid Origin = Origin; public readonly EntityUid? Origin = Origin;
public float TotalRads => RadsPerSecond * FrameTime; public float TotalRads => RadsPerSecond * FrameTime;
} }