rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

фиксы апстрима

Browse source
This commit is contained in:
Vigers Ray 2024-11-20 17:55:48 +03:00
parent 8d0ab85920
commit 721766319c
5 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Content.Server/_Sunrise/CryoTeleport/CryoTeleportSystem.cs
View file

@ -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;

1
Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs
View file

@ -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;

1
Content.Server/_Sunrise/Roles/OtherJobsTakenRequirementSystem.cs
View file

@ -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;

1
Content.Server/_Sunrise/SponsorLoadout/SponsorLoadoutSystem.cs
View file

@ -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;

6
Content.Shared/GameTicking/PlayerSpawnCompleteEvent.cs
View file

@ -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;
}
}