Skip to content

Commit

Permalink
Fix greytide virus hitting other maps (space-wizards#33806)
Browse files Browse the repository at this point in the history
fix greytide virus hitting other maps
  • Loading branch information
slarticodefast authored Dec 11, 2024
1 parent 89522e7 commit c28f4fd
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions Content.Server/StationEvents/Events/GreytideVirusRule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Content.Shared.Doors.Systems;
using Content.Shared.Lock;
using Content.Shared.GameTicking.Components;
using Content.Shared.Station.Components;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;

Expand Down Expand Up @@ -43,6 +44,9 @@ protected override void Started(EntityUid uid, GreytideVirusRuleComponent virusC
if (virusComp.Severity == null)
return;

if (!TryGetRandomStation(out var chosenStation))
return;

// pick random access groups
var chosen = _random.GetItems(virusComp.AccessGroups, virusComp.Severity.Value, allowDuplicates: false);

Expand All @@ -57,12 +61,16 @@ protected override void Started(EntityUid uid, GreytideVirusRuleComponent virusC
var firelockQuery = GetEntityQuery<FirelockComponent>();
var accessQuery = GetEntityQuery<AccessReaderComponent>();

var lockQuery = AllEntityQuery<LockComponent>();
while (lockQuery.MoveNext(out var lockUid, out var lockComp))
var lockQuery = AllEntityQuery<LockComponent, TransformComponent>();
while (lockQuery.MoveNext(out var lockUid, out var lockComp, out var xform))
{
if (!accessQuery.TryComp(lockUid, out var accessComp))
continue;

// make sure not to hit CentCom or other maps
if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
continue;

// check access
// the AreAccessTagsAllowed function is a little weird because it technically has support for certain tags to be locked out of opening something
// which might have unintened side effects (see the comments in the function itself)
Expand All @@ -74,13 +82,17 @@ protected override void Started(EntityUid uid, GreytideVirusRuleComponent virusC
_lock.Unlock(lockUid, null, lockComp);
}

var airlockQuery = AllEntityQuery<AirlockComponent, DoorComponent>();
while (airlockQuery.MoveNext(out var airlockUid, out var airlockComp, out var doorComp))
var airlockQuery = AllEntityQuery<AirlockComponent, DoorComponent, TransformComponent>();
while (airlockQuery.MoveNext(out var airlockUid, out var airlockComp, out var doorComp, out var xform))
{
// don't space everything
if (firelockQuery.HasComp(airlockUid))
continue;

// make sure not to hit CentCom or other maps
if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != chosenStation)
continue;

// use the access reader from the door electronics if they exist
if (!_access.GetMainAccessReader(airlockUid, out var accessComp))
continue;
Expand Down

0 comments on commit c28f4fd

Please sign in to comment.