juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerts Cleanup and API (#39544)

Browse Source 
* alert cleanup and API

* I expect update loops to be at the top.

* Address review

* Address review x 2

* Merg my PR

* Fix

* Update Content.Shared/Alert/AlertsSystem.cs

webedit

Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>

* FIX THAT TEST FAIL!!!!

* Me when I forget to actually give you alerts

* Hammedborgar

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-09-05 02:45:48 -07:00
committed by GitHub
parent 5e0e5e045a
commit d488ca96b2
18 changed files with 213 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Gravity/SharedGravitySystem.cs
View File

@@ -132,9 +132,9 @@ public abstract partial class SharedGravitySystem : EntitySystem
private void OnWeightlessnessChanged(Entity<AlertsComponent> entity, ref WeightlessnessChangedEvent args)
{
if (args.Weightless)
_alerts.ShowAlert(entity, WeightlessAlert);
_alerts.ShowAlert(entity.AsNullable(), WeightlessAlert);
else
_alerts.ClearAlert(entity, WeightlessAlert);
_alerts.ClearAlert(entity.AsNullable(), WeightlessAlert);
}
private void OnEntParentChanged(Entity<GravityAffectedComponent> entity, ref EntParentChangedMessage args)
@@ -202,12 +202,12 @@ public abstract partial class SharedGravitySystem : EntitySystem
_alerts.ClearAlert(ev.Euid, WeightlessAlert);
}
private void OnAlertsParentChange(EntityUid uid, AlertsComponent component, ref EntParentChangedMessage args)
private void OnAlertsParentChange(Entity<AlertsComponent> entity, ref EntParentChangedMessage args)
{
if (IsWeightless(uid))
_alerts.ShowAlert(uid, WeightlessAlert);
if (IsWeightless(entity.Owner))
_alerts.ShowAlert(entity.AsNullable(), WeightlessAlert);
else
_alerts.ClearAlert(uid, WeightlessAlert);
_alerts.ClearAlert(entity.AsNullable(), WeightlessAlert);
}
private void OnGridInit(GridInitializeEvent ev)