Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepyyapril committed Jan 4, 2025
1 parent ede16f0 commit 661bdba
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 39 deletions.
4 changes: 2 additions & 2 deletions Content.Server/Carrying/CarryingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/// <summary>
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions Content.Server/Flight/FlightSystem.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

using Content.Shared.Bed.Sleep;
using Content.Shared.Cuffs.Components;
using Content.Shared.Damage.Components;
using Content.Shared.DoAfter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Content.Server.Bed.Sleep;
using Content.Shared.Bed.Sleep;
using Content.Shared.InteractionVerbs;
using Content.Shared.Mobs.Components;
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/Shadowkin/ShowEtherealSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void OnInteractionAttempt(EntityUid uid, ShowEtherealComponent component
|| !HasComp<EtherealComponent>(args.Target))
return;

args.Cancel();
args.Cancelled = true;
if (_gameTiming.InPrediction)
return;

Expand All @@ -85,4 +85,4 @@ private void OnAttackAttempt(EntityUid uid, ShowEtherealComponent component, Att

args.Cancel();
}
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -63,7 +62,7 @@ private void SiliconDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadCo
private void SiliconUnDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, BatteryComponent? batteryComp, EntityUid batteryUid)
{
RemComp<ForcedSleepingComponent>(uid);
_sleep.TryWaking(uid, null, true);
_sleep.TryWaking(uid, true);

siliconDeadComp.Dead = false;

Expand Down
25 changes: 1 addition & 24 deletions Content.Server/Station/Systems/StationSpawningSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,44 +131,21 @@ public override void Initialize()
/// <param name="station">The station this player is being spawned on.</param>
/// <param name="entity">The entity to use, if one already exists.</param>
/// <returns>The spawned entity</returns>
public EntityUid SpawnPlayerMob(
public EntityUid SpawnPlayerMob(
EntityCoordinates coordinates,
JobComponent? job,
HumanoidCharacterProfile? profile,
EntityUid? station,
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)
{
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;
Expand Down
1 change: 1 addition & 0 deletions Content.Server/Traits/Assorted/SingerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
{
Expand Down
1 change: 1 addition & 0 deletions Content.Shared/Climbing/Systems/ClimbSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public sealed partial class ClimbSystem : VirtualController

private EntityQuery<FixturesComponent> _fixturesQuery;
private EntityQuery<TransformComponent> _xformQuery;
private EntityQuery<ClimbableComponent> _climbableQuery;

public override void Initialize()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public override void Initialize()

private void OnInteractionAttempt(EntityUid uid, NoNormalInteractionComponent component, InteractionAttemptEvent args)
{
args.Cancel();
args.Cancelled = true;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Shadowkin/SharedEtherealSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private void OnInteractionAttempt(EntityUid uid, EtherealComponent component, In
|| HasComp<EtherealComponent>(args.Target))
return;

args.Cancel();
args.Cancelled = true;
if (_gameTiming.InPrediction)
return;

Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Roles/Jobs/Science/borg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 661bdba

Please sign in to comment.