From 08ab1bd3cd7e1ade7eb54e3641efbf2ff52e2939 Mon Sep 17 00:00:00 2001 From: VigersRay Date: Fri, 12 Jul 2024 06:36:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D1=80=D0=B8?= =?UTF-8?q?=D0=BE=20=D1=82=D0=B5=D0=BB=D0=B5=D0=BF=D0=BE=D1=80=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CryoTeleport/CryoTeleportSystem.cs | 30 +------------------ .../StationCryoTeleportComponent.cs | 2 +- .../Entities/Stations/nanotrasen.yml | 2 ++ .../_Sunrise/Entities/Stations/base.yml | 6 ++++ 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs b/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs index e7c6ceda21..07d107e528 100644 --- a/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs +++ b/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs @@ -1,20 +1,7 @@ -using System.Globalization; -using Content.Server.Bed.Cryostorage; -using Content.Server.Body.Components; -using Content.Server.Chat.Systems; -using Content.Server.Database; +using Content.Server.Bed.Cryostorage; using Content.Server.GameTicking; -using Content.Server.Objectives.Components; -using Content.Server.Station.Components; -using Content.Server.Station.Systems; -using Content.Server.StationRecords; -using Content.Server.StationRecords.Systems; using Content.Shared.Bed.Cryostorage; using Content.Shared.Mind; -using Content.Shared.Mobs; -using Content.Shared.Objectives.Systems; -using Content.Shared.StationRecords; -using FastAccessors; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; using Robust.Shared.Timing; @@ -26,21 +13,15 @@ namespace Content.Server._Sunrise.CryoTeleport; /// public sealed class CryoTeleportSystem : EntitySystem { - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StationJobsSystem _stationJobs = default!; [Dependency] private readonly CryostorageSystem _cryostorage = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; [Dependency] private readonly SharedMindSystem _mind = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly StationRecordsSystem _stationRecords = default!; [Dependency] private readonly IEntityManager _entity = default!; [Dependency] private readonly IGameTiming _timing = default!; /// public override void Initialize() { - SubscribeLocalEvent(OnStationInitialized); SubscribeLocalEvent(OnCompleteSpawn); // SubscribeLocalEvent(OnGibbed); SubscribeLocalEvent(OnPlayerDetached); @@ -52,8 +33,6 @@ public sealed class CryoTeleportSystem : EntitySystem var query = AllEntityQuery(); while (query.MoveNext(out var uid, out var comp)) { - // Log.Info($"uid: {uid}, comp: {comp.Station}"); - if (comp.Station == null) continue; @@ -86,13 +65,6 @@ public sealed class CryoTeleportSystem : EntitySystem } } - private void OnStationInitialized(StationInitializedEvent ev) - { - if (FindCryo(ev.Station, Transform(ev.Station)) == null) - return; // Ни одного крио на станции - EnsureComp(ev.Station); - } - private void OnCompleteSpawn(PlayerSpawnCompleteEvent ev) { if (!TryComp(ev.Station, out var cryoTeleportComponent)) diff --git a/Content.Server/_Sunrise/CryoTeleport/StationCryoTeleportComponent.cs b/Content.Server/_Sunrise/CryoTeleport/StationCryoTeleportComponent.cs index c1429f1f60..0cea70b1f5 100644 --- a/Content.Server/_Sunrise/CryoTeleport/StationCryoTeleportComponent.cs +++ b/Content.Server/_Sunrise/CryoTeleport/StationCryoTeleportComponent.cs @@ -10,7 +10,7 @@ namespace Content.Server._Sunrise.CryoTeleport; public sealed partial class StationCryoTeleportComponent : Component { [DataField] - public TimeSpan TransferDelay = TimeSpan.FromSeconds(300); // TODO: debug + public TimeSpan TransferDelay = TimeSpan.FromSeconds(300); // 5 минут [DataField] public string PortalPrototype = "PortalCryo"; diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml index 8d1ec6549c..8e65f83431 100644 --- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml @@ -32,6 +32,7 @@ - BaseStationGoal - BaseStationGammaArmory - BaseStationAntagsTargets + - BaseStationCryoTeleport # Sunrise-End noSpawn: true components: @@ -49,6 +50,7 @@ - BaseCentCommShuttles - BaseStationImmortal - BaseStationDontSelling + - BaseStationCryoTeleport # Sunrise-End noSpawn: true components: diff --git a/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml b/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml index 9be8b97568..dee1671a40 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Stations/base.yml @@ -110,3 +110,9 @@ abstract: true components: - type: StationAntagsTargetsComponent + +- type: entity + id: BaseStationCryoTeleport + abstract: true + components: + - type: StationCryoTeleport