From 721766319cb6141f2ddd30f3faeb9efbc115c21a Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 20 Nov 2024 17:55:48 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B0=D0=BF?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs | 1 + .../_Sunrise/DontSellingGrid/DontSellingGridSystems.cs | 1 + .../_Sunrise/Roles/OtherJobsTakenRequirementSystem.cs | 1 + .../_Sunrise/SponsorLoadout/SponsorLoadoutSystem.cs | 1 + Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs | 6 +++++- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs b/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs index a4092a55fb..a2a224fdb8 100644 --- a/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs +++ b/Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Shared._Sunrise.SunriseCCVars; using Content.Shared.Bed.Cryostorage; +using Content.Shared.GameTicking; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Robust.Server.GameObjects; diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs index 546121db80..9b5ae567b9 100644 --- a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs +++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs @@ -2,6 +2,7 @@ using Content.Server.Cargo.Components; using Content.Server.Cargo.Systems; using Content.Server.GameTicking; using Content.Server.Station.Events; +using Content.Shared.GameTicking; using Robust.Shared.Containers; namespace Content.Server._Sunrise.DontSellingGrid; diff --git a/Content.Server/_Sunrise/Roles/OtherJobsTakenRequirementSystem.cs b/Content.Server/_Sunrise/Roles/OtherJobsTakenRequirementSystem.cs index 3e0aa9a462..96bcbbb120 100644 --- a/Content.Server/_Sunrise/Roles/OtherJobsTakenRequirementSystem.cs +++ b/Content.Server/_Sunrise/Roles/OtherJobsTakenRequirementSystem.cs @@ -1,5 +1,6 @@ using Content.Server.GameTicking; using Content.Server.Station.Systems; +using Content.Shared.GameTicking; using Content.Shared.Roles; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/_Sunrise/SponsorLoadout/SponsorLoadoutSystem.cs b/Content.Server/_Sunrise/SponsorLoadout/SponsorLoadoutSystem.cs index e5679a1d25..9184aac8e9 100644 --- a/Content.Server/_Sunrise/SponsorLoadout/SponsorLoadoutSystem.cs +++ b/Content.Server/_Sunrise/SponsorLoadout/SponsorLoadoutSystem.cs @@ -1,5 +1,6 @@ using Content.Server.GameTicking; using Content.Server.Station.Systems; +using Content.Shared.GameTicking; using Robust.Shared.Prototypes; using Content.Sunrise.Interfaces.Shared; diff --git a/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs b/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs index 034b76beeb..3e694874a4 100644 --- a/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs +++ b/Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs @@ -20,6 +20,8 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs public EntityUid Station { get; } public HumanoidCharacterProfile Profile { get; } + public bool CanBeAntag { get; } // Sunrise-Edit + // Ex. If this is the 27th person to join, this will be 27. public int JoinOrder { get; } @@ -30,7 +32,8 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs bool silent, int joinOrder, EntityUid station, - HumanoidCharacterProfile profile) + HumanoidCharacterProfile profile, + bool canBeAntag) { Mob = mob; Player = player; @@ -40,5 +43,6 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs Station = station; Profile = profile; JoinOrder = joinOrder; + CanBeAntag = canBeAntag; } }