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

back to ru + fix (#1021)

Browse Source
This commit is contained in:
Ed
2025-03-13 13:30:52 +03:00
committed by GitHub
parent dcacd8f8da
commit 47ea85ba21
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs
View File

@@ -29,16 +29,12 @@ public sealed partial class CP14RoundEndSystem : EntitySystem
InitCbt();
SubscribeLocalEvent<CP14MagicContainerRoundFinisherComponent, CP14MagicEnergyLevelChangeEvent>(OnFinisherMagicEnergyLevelChange);
SubscribeNetworkEvent<RoundEndMessageEvent>(OnRoundEndMessage);
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
}
private void OnRoundEndMessage(RoundEndMessageEvent ev)
private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
{
_roundEndMoment = TimeSpan.Zero; //Reset timer, so it cant affect next round in any case
_demiplane.DeleteAllDemiplanes(safe: false);
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString("cp14-round-end"),
announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg"));
}
public override void Update(float frameTime)
@@ -53,6 +49,9 @@ public sealed partial class CP14RoundEndSystem : EntitySystem
if (_roundEndMoment > _timing.CurTime)
return;
_demiplane.DeleteAllDemiplanes(safe: false);
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString("cp14-round-end"),
announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg"));
_roundEnd.EndRound();
}

4
Content.Server/_CP14/UniqueLoot/CP14UniqueLootSystem.cs
View File

@@ -1,5 +1,4 @@
using System.Linq;
using Content.Server.GameTicking.Events;
using Content.Shared._CP14.UniqueLoot;
using Content.Shared.GameTicking;
using Content.Shared.Tag;
@@ -35,9 +34,6 @@ public sealed partial class CP14UniqueLootSystem : EntitySystem
if (!Deleted(ent))
SpawnAtPosition(loot, Transform(ent).Coordinates);
if (!TerminatingOrDeleted(ent) && Exists(ent))
QueueDel(ent);
}