juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes (#783)

Browse Source 
* fix force evaporation

* knowledge book in bank

* music in loadouts

* Update general.yml

* localization sync

* fix round leave and manifest

* ship sound replacement

* fix traveling ship gravity

* forgot this role knowledge
This commit is contained in:
Ed
2025-01-19 14:23:53 +03:00
committed by GitHub
parent 090c4d5eb0
commit 94ab0fc94b
22 changed files with 1390 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Content.Server/_CP14/RoundRemoveShuttle/CP14RoundRemoveShuttleSystem.cs
View File

@@ -4,14 +4,12 @@ using Content.Server.Chat.Systems;
using Content.Server.Mind;
using Content.Server.Shuttles.Events;
using Content.Server.Station.Systems;
using Content.Server.StationRecords;
using Content.Server.StationRecords.Systems;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.IdentityManagement.Components;
using Content.Shared.Mind.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
using Robust.Shared.Network;
using Content.Shared.StationRecords;
using Robust.Shared.Prototypes;
namespace Content.Server._CP14.RoundRemoveShuttle;
@@ -24,32 +22,46 @@ public sealed partial class CP14RoundRemoveShuttleSystem : EntitySystem
[Dependency] private readonly StationJobsSystem _stationJobs = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly StationRecordsSystem _stationRecords = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<CP14RoundRemoveShuttleComponent, FTLCompletedEvent>(OnFTLComplete);
SubscribeLocalEvent<CP14RoundRemoveShuttleComponent, FTLStartedEvent>(OnFTL);
}
private void OnFTLComplete(Entity<CP14RoundRemoveShuttleComponent> ent, ref FTLCompletedEvent args)
private void OnFTL(Entity<CP14RoundRemoveShuttleComponent> ent, ref FTLStartedEvent args)
{
var childrens = Transform(ent).ChildEnumerator;
if (!TryComp<StationRecordsComponent>(ent.Comp.Station, out var stationRecords))
return;
HashSet<EntityUid> toDelete = new();
while (childrens.MoveNext(out var uid))
{
if (!_mind.TryGetMind(uid, out _, out var mindComp))
continue;
var name = Name(uid);
var recordId = _stationRecords.GetRecordByName(ent.Comp.Station, name);
if (recordId is null)
return;
var key = new StationRecordKey(recordId.Value, ent.Comp.Station);
if (!_stationRecords.TryGetRecord<GeneralStationRecord>(key, out var entry, stationRecords))
return;
_stationRecords.RemoveRecord(key, stationRecords);
//Trying return all jobs roles
var userId = mindComp.UserId;
ProtoId<JobPrototype>? playerJob = null;
string? jobName = null;
string? jobName = entry.JobTitle;
if (userId is not null)
{
RestoreJobs(ent.Comp.Station, userId.Value, out playerJob);
if (_proto.TryIndex(playerJob, out var indexedJob))
_stationJobs.TryAdjustJobSlot(ent.Comp.Station, entry.JobPrototype, 1, clamp: true);
if (_proto.TryIndex(entry.JobPrototype, out var indexedJob))
{
jobName = Loc.GetString(indexedJob.Name);
}
@@ -78,18 +90,4 @@ public sealed partial class CP14RoundRemoveShuttleSystem : EntitySystem
QueueDel(r);
}
}
private void RestoreJobs(EntityUid station, NetUserId userId, out ProtoId<JobPrototype>? outJob)
{
outJob = null;
if (!_stationJobs.TryGetPlayerJobs(station, userId, out var jobs))
return;
foreach (var job in jobs)
{
_stationJobs.TryAdjustJobSlot(station, job, 1, clamp: true);
outJob = job;
}
_stationJobs.TryRemovePlayerJobs(station, userId);
}
}