From 661bdbaf1c668337376d68ad29bbace978458ae1 Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Sat, 4 Jan 2025 14:18:12 -0400 Subject: [PATCH] Fix build errors --- Content.Server/Carrying/CarryingSystem.cs | 4 +-- Content.Server/Flight/FlightSystem.cs | 1 + .../Actions/ToggleSleepingAction.cs | 1 - .../Shadowkin/ShowEtherealSystem.cs | 4 +-- .../Systems/SiliconChargeDeathSystem.cs | 3 +-- .../Station/Systems/StationSpawningSystem.cs | 25 +------------------ .../Traits/Assorted/SingerSystem.cs | 1 + .../_Shitmed/Autodoc/Systems/AutodocSystem.cs | 5 ++-- .../Climbing/Systems/ClimbSystem.cs | 1 + .../Interaction/NoNormalInteractionSystem.cs | 2 +- .../Item/PseudoItem/SharedPseudoItemSystem.cs | 2 +- .../Shadowkin/SharedEtherealSystem.cs | 2 +- .../Prototypes/Roles/Jobs/Science/borg.yml | 6 ++--- 13 files changed, 18 insertions(+), 39 deletions(-) diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs index 72cfeff91d..224e38bcbd 100644 --- a/Content.Server/Carrying/CarryingSystem.cs +++ b/Content.Server/Carrying/CarryingSystem.cs @@ -168,7 +168,7 @@ private void OnInteractionAttempt(EntityUid uid, BeingCarriedComponent component var targetParent = Transform(args.Target.Value).ParentUid; if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid) - args.Cancel(); + args.Cancelled = true; } /// @@ -202,7 +202,7 @@ private void OnStandAttempt(EntityUid uid, BeingCarriedComponent component, Stan private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args) { if (args.Uid != component.Carrier) - args.Cancel(); + args.Cancelled = true; } private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args) diff --git a/Content.Server/Flight/FlightSystem.cs b/Content.Server/Flight/FlightSystem.cs index 4493967fe9..5e3ef354f2 100644 --- a/Content.Server/Flight/FlightSystem.cs +++ b/Content.Server/Flight/FlightSystem.cs @@ -1,4 +1,5 @@ +using Content.Shared.Bed.Sleep; using Content.Shared.Cuffs.Components; using Content.Shared.Damage.Components; using Content.Shared.DoAfter; diff --git a/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs b/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs index 588853a8d4..97fd86fd91 100644 --- a/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs +++ b/Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs @@ -1,4 +1,3 @@ -using Content.Server.Bed.Sleep; using Content.Shared.Bed.Sleep; using Content.Shared.InteractionVerbs; using Content.Shared.Mobs.Components; diff --git a/Content.Server/Shadowkin/ShowEtherealSystem.cs b/Content.Server/Shadowkin/ShowEtherealSystem.cs index 151c379afb..e908bd9ce7 100644 --- a/Content.Server/Shadowkin/ShowEtherealSystem.cs +++ b/Content.Server/Shadowkin/ShowEtherealSystem.cs @@ -70,7 +70,7 @@ private void OnInteractionAttempt(EntityUid uid, ShowEtherealComponent component || !HasComp(args.Target)) return; - args.Cancel(); + args.Cancelled = true; if (_gameTiming.InPrediction) return; @@ -85,4 +85,4 @@ private void OnAttackAttempt(EntityUid uid, ShowEtherealComponent component, Att args.Cancel(); } -} \ No newline at end of file +} diff --git a/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs b/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs index d4d1db5ed9..41ee269788 100644 --- a/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs +++ b/Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs @@ -1,6 +1,5 @@ using Content.Server.Power.Components; using Content.Shared.Silicon.Systems; -using Content.Server.Bed.Sleep; using Content.Shared.Bed.Sleep; using Content.Server.Silicon.Charge; using Content.Server.Humanoid; @@ -63,7 +62,7 @@ private void SiliconDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadCo private void SiliconUnDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, BatteryComponent? batteryComp, EntityUid batteryUid) { RemComp(uid); - _sleep.TryWaking(uid, null, true); + _sleep.TryWaking(uid, true); siliconDeadComp.Dead = false; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 0662c54bee..0bbfecb49d 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -131,7 +131,7 @@ public override void Initialize() /// The station this player is being spawned on. /// The entity to use, if one already exists. /// The spawned entity - public EntityUid SpawnPlayerMob( + public EntityUid SpawnPlayerMob( EntityCoordinates coordinates, JobComponent? job, HumanoidCharacterProfile? profile, @@ -139,22 +139,6 @@ public EntityUid SpawnPlayerMob( EntityUid? entity = null) { _prototypeManager.TryIndex(job?.Prototype ?? string.Empty, out var prototype); - RoleLoadout? loadout = null; - - // Need to get the loadout up-front to handle names if we use an entity spawn override. - var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID); - - if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto)) - { - profile?.Loadouts.TryGetValue(jobLoadout, out loadout); - - // Set to default if not present - if (loadout == null) - { - loadout = new RoleLoadout(jobLoadout); - loadout.SetDefault(profile, _actors.GetSession(entity), _prototypeManager); - } - } // If we're not spawning a humanoid, we're gonna exit early without doing all the humanoid stuff. if (prototype?.JobEntity != null) @@ -162,13 +146,6 @@ public EntityUid SpawnPlayerMob( DebugTools.Assert(entity is null); var jobEntity = EntityManager.SpawnEntity(prototype.JobEntity, coordinates); MakeSentientCommand.MakeSentient(jobEntity, EntityManager); - - // Make sure custom names get handled, what is gameticker control flow whoopy. - if (loadout != null) - { - EquipRoleName(jobEntity, loadout, roleProto!); - } - DoJobSpecials(job, jobEntity); _identity.QueueIdentityUpdate(jobEntity); return jobEntity; diff --git a/Content.Server/Traits/Assorted/SingerSystem.cs b/Content.Server/Traits/Assorted/SingerSystem.cs index 78a4101a65..95087c0f1e 100644 --- a/Content.Server/Traits/Assorted/SingerSystem.cs +++ b/Content.Server/Traits/Assorted/SingerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Speech.Components; using Content.Server.UserInterface; using Content.Shared.ActionBlocker; +using Content.Shared.Bed.Sleep; using Content.Shared.Damage; using Content.Shared.Damage.ForceSay; using Content.Shared.FixedPoint; diff --git a/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs b/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs index d1af790eaa..7002734fd3 100644 --- a/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs +++ b/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs @@ -6,7 +6,8 @@ using Content.Server.Power.EntitySystems; using Content.Shared._Shitmed.Autodoc.Components; using Content.Shared._Shitmed.Autodoc.Systems; -using Content.Server.Bed.Sleep; +using Content.Shared.Bed.Sleep; + namespace Content.Server._Shitmed.Autodoc.Systems; @@ -15,7 +16,7 @@ public sealed class AutodocSystem : SharedAutodocSystem [Dependency] private readonly InternalsSystem _internals = default!; [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly PowerReceiverSystem _power = default!; - [Dependency] private readonly SleepingSystem _sleepingSystem = default!; // Sleeping isnt shared yet. + [Dependency] private readonly SleepingSystem _sleepingSystem = default!; public override void Update(float frameTime) { diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 42fa89b367..fc5a43cf8a 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -47,6 +47,7 @@ public sealed partial class ClimbSystem : VirtualController private EntityQuery _fixturesQuery; private EntityQuery _xformQuery; + private EntityQuery _climbableQuery; public override void Initialize() { diff --git a/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs b/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs index 0f66dff309..9b7a6954de 100644 --- a/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs +++ b/Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs @@ -12,7 +12,7 @@ public override void Initialize() private void OnInteractionAttempt(EntityUid uid, NoNormalInteractionComponent component, InteractionAttemptEvent args) { - args.Cancel(); + args.Cancelled = true; } } } diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs index 7dc8578117..448311471f 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs +++ b/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs @@ -143,7 +143,7 @@ private void OnInsertAttempt(EntityUid uid, PseudoItemComponent component, private void OnInteractAttempt(EntityUid uid, PseudoItemComponent component, InteractionAttemptEvent args) { if (args.Uid == args.Target && component.Active) - args.Cancel(); + args.Cancelled = true; } private void OnDoAfter(EntityUid uid, PseudoItemComponent component, DoAfterEvent args) diff --git a/Content.Shared/Shadowkin/SharedEtherealSystem.cs b/Content.Shared/Shadowkin/SharedEtherealSystem.cs index 5ab5e3eeea..2365ade818 100644 --- a/Content.Shared/Shadowkin/SharedEtherealSystem.cs +++ b/Content.Shared/Shadowkin/SharedEtherealSystem.cs @@ -165,7 +165,7 @@ private void OnInteractionAttempt(EntityUid uid, EtherealComponent component, In || HasComp(args.Target)) return; - args.Cancel(); + args.Cancelled = true; if (_gameTiming.InPrediction) return; diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index b9b4cb3c16..67f70b2d25 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -5,9 +5,9 @@ description: job-description-station-ai playTimeTracker: JobStationAi requirements: - - !type:RoleTimeRequirement - role: JobBorg - time: 18000 # 5 hrs + - !type:CharacterPlaytimeRequirement + tracker: JobBorg + min: 18000 # 5 hrs canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd