tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduced SalvageStructureComponent to atoms. (#39400)

Browse Source 
* commit

* whoopsie daisy

* Update SpawnSalvageMissionJob.cs

* Update SpawnSalvageMissionJob.cs

* cleanup
This commit is contained in:
Kyle Tyo
2025-08-05 15:10:17 -04:00
committed by GitHub
parent d4c025567a
commit 5df467c9c6
4 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs
View File

@@ -1,10 +0,0 @@
namespace Content.Server.Salvage.Expeditions.Structure;
/// <summary>
/// Mission objective for salvage expeditions.
/// </summary>
[RegisterComponent, Access(typeof(SalvageSystem))]
public sealed partial class SalvageStructureComponent : Component
{
}

11
Content.Server/Salvage/SalvageSystem.Expeditions.cs
View File

@@ -1,17 +1,13 @@
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using Content.Server.Salvage.Expeditions; using Content.Server.Salvage.Expeditions;
using Content.Server.Salvage.Expeditions.Structure;
using Content.Shared.CCVar; using Content.Shared.CCVar;
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.Random.Helpers;
using Content.Shared.Salvage.Expeditions; using Content.Shared.Salvage.Expeditions;
using Content.Shared.Shuttles.Components; using Content.Shared.Shuttles.Components;
using Robust.Shared.Audio;
using Robust.Shared.CPUJob.JobQueues; using Robust.Shared.CPUJob.JobQueues;
using Robust.Shared.CPUJob.JobQueues.Queues; using Robust.Shared.CPUJob.JobQueues.Queues;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Map;
namespace Content.Server.Salvage; namespace Content.Server.Salvage;
@@ -39,8 +35,6 @@ public sealed partial class SalvageSystem
SubscribeLocalEvent<SalvageExpeditionComponent, ComponentShutdown>(OnExpeditionShutdown); SubscribeLocalEvent<SalvageExpeditionComponent, ComponentShutdown>(OnExpeditionShutdown);
SubscribeLocalEvent<SalvageExpeditionComponent, ComponentGetState>(OnExpeditionGetState); SubscribeLocalEvent<SalvageExpeditionComponent, ComponentGetState>(OnExpeditionGetState);
SubscribeLocalEvent<SalvageStructureComponent, ExaminedEvent>(OnStructureExamine);
_cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown); _cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown);
Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange); Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange);
} }
@@ -189,9 +183,4 @@ public sealed partial class SalvageSystem
_salvageJobs.Add((job, cancelToken)); _salvageJobs.Add((job, cancelToken));
_salvageQueue.EnqueueJob(job); _salvageQueue.EnqueueJob(job);
} }
private void OnStructureExamine(EntityUid uid, SalvageStructureComponent component, ExaminedEvent args)
{
args.PushMarkup(Loc.GetString("salvage-expedition-structure-examine"));
}
} }

1
Content.Server/Salvage/SpawnSalvageMissionJob.cs
View File

@@ -11,7 +11,6 @@ using Content.Server.Ghost.Roles.Components;
using Content.Server.Parallax; using Content.Server.Parallax;
using Content.Server.Procedural; using Content.Server.Procedural;
using Content.Server.Salvage.Expeditions; using Content.Server.Salvage.Expeditions;
using Content.Server.Salvage.Expeditions.Structure;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Content.Shared.Construction.EntitySystems; using Content.Shared.Construction.EntitySystems;
using Content.Shared.Dataset; using Content.Shared.Dataset;

6
Resources/Locale/en-US/procedural/expeditions.ftl
View File

@@ -1,9 +1,3 @@
salvage-expedition-structure-examine = This is a [color=#B02E26]destruction[/color] objective
salvage-expedition-structure-remaining = {$count ->
[one] {$count} structure remaining.
*[other] {$count} structures remaining.
}
salvage-expedition-type = Mission salvage-expedition-type = Mission
salvage-expedition-window-title = Salvage expeditions salvage-expedition-window-title = Salvage expeditions
salvage-expedition-window-difficulty = Difficulty: salvage-expedition-window-difficulty = Difficulty: