Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "IonStormRule: affects cyborgs system-wide (#1314)" #1325

Closed
wants to merge 1 commit into from
Closed

Revert "IonStormRule: affects cyborgs system-wide (#1314)" #1325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions Content.Server/StationEvents/Events/IonStormRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,15 @@ protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameR
{
base.Started(uid, comp, gameRule, args);

// Frontier - Affect all silicon beings in the sector, not just on-station.
// if (!TryGetRandomStation(out var chosenStation))
// return;
// End Frontier
if (!TryGetRandomStation(out var chosenStation))
return;

var query = EntityQueryEnumerator<SiliconLawBoundComponent, TransformComponent, IonStormTargetComponent>();
while (query.MoveNext(out var ent, out var lawBound, out var xform, out var target))
{
// Frontier - Affect all silicon beings in the sector, not just on-station.
// // only affect law holders on the station
// if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
// continue;
// End Frontier
// only affect law holders on the station
if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
continue;

if (!RobustRandom.Prob(target.Chance))
continue;
Expand Down
Loading