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.

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

Emp immune grid #434

Merged
merged 24 commits into from
Oct 22, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Update ArrivalsSystem.cs
  • Loading branch information
dvir001 authored Oct 16, 2023
commit 1125522907544d1bafbf059c3b570ee64374b61d
4 changes: 2 additions & 2 deletions Content.Server/Shuttles/Systems/ArrivalsSystem.cs
Original file line number Diff line number Diff line change
@@ -406,7 +406,7 @@ private void SetupArrivalsStation()
EnsureComp<ArrivalsSourceComponent>(id);
EnsureComp<ProtectedGridComponent>(id);
EnsureComp<PreventPilotComponent>(id);
EnsureComp<StationEmpImmuneComponent>(id);
// EnsureComp<StationEmpImmuneComponent>(id); Enable in the case we want to ensure EMP immune grid
}

// Handle roundstart stations.
@@ -475,7 +475,7 @@ private void SetupShuttle(EntityUid uid, StationArrivalsComponent component)
var arrivalsComp = EnsureComp<ArrivalsShuttleComponent>(component.Shuttle);
arrivalsComp.Station = uid;
EnsureComp<ProtectedGridComponent>(uid);
EnsureComp<StationEmpImmuneComponent>(uid);
// EnsureComp<StationEmpImmuneComponent>(uid); Enable in the case we want to ensure EMP immune grid
_shuttles.FTLTravel(component.Shuttle, shuttleComp, arrivals, hyperspaceTime: 10f, dock: true);
arrivalsComp.NextTransfer = _timing.CurTime + TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown));
}