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

Jump to bottom

Edit/Fixes LPO #325

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Edit/Fixes LPO #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
580dcf0
Hmm yes
FoxxoTrystan Nov 4, 2024
81643a4
Merge branch 'Fansana:master' into edit-lpo
FoxxoTrystan Nov 5, 2024
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
8 changes: 3 additions & 5 deletions Content.Server/Communications/CommunicationsConsoleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,11 @@ private bool CanUse(EntityUid user, EntityUid console)
private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
{
// Defer to what the round end system thinks we should be able to do.
if (_emergency.EmergencyShuttleArrived || !_roundEndSystem.CanCallOrRecall())
if (_emergency.EmergencyShuttleArrived
|| !_roundEndSystem.CanCallOrRecall()
|| !comp.CanShuttle)
return false;

// Calling shuttle checks
if (_roundEndSystem.ExpectedCountdownEnd is null)
return comp.CanShuttle;

// Recalling shuttle checks
var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);

Expand Down
2 changes: 1 addition & 1 deletion Content.Server/StationEvents/Components/PirateRadioSpawnRuleComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public sealed partial class PirateRadioSpawnRuleComponent : Component
[DataField]
public List<string> PirateRadioShuttlePath { get; private set; } = new()
{
"Maps/Shuttles/pirateradio.yml",
"Maps/Floof/pirateradio.yml", // Floofstation
};

[DataField]
Expand Down
Binary file added Resources/Audio/Floof/Announcements/pirateannounce.ogg
View file
Open in desktop
Binary file not shown.
Loading
Loading