Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 05:27:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors

Browse Source 
(cherry picked from commit 661bdbaf1c668337376d68ad29bbace978458ae1)
This commit is contained in:
sleepyyapril
2025-01-04 14:18:12 -04:00
committed by Spatison
parent c3387d7220
commit 2812dcee45
13 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Carrying/CarryingSystem.cs
View File

@@ -168,7 +168,7 @@ namespace Content.Server.Carrying
var targetParent = Transform(args.Target.Value).ParentUid;
if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid)
args.Cancel();
args.Cancelled = true;
}
/// <summary>
@@ -202,7 +202,7 @@ namespace Content.Server.Carrying
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)

1
Content.Server/Flight/FlightSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Bed.Sleep;
using Content.Shared.Cuffs.Components;
using Content.Shared.Damage.Components;
using Content.Shared.DoAfter;

1
Content.Server/InteractionVerbs/Actions/ToggleSleepingAction.cs
View File

@@ -1,4 +1,3 @@
using Content.Server.Bed.Sleep;
using Content.Shared.Bed.Sleep;
using Content.Shared.InteractionVerbs;
using Content.Shared.Mobs.Components;

4
Content.Server/Shadowkin/ShowEtherealSystem.cs
View File

@@ -70,7 +70,7 @@ public sealed class ShowEtherealSystem : EntitySystem
|| !HasComp<EtherealComponent>(args.Target))
return;
args.Cancel();
args.Cancelled = true;
if (_gameTiming.InPrediction)
return;
@@ -85,4 +85,4 @@ public sealed class ShowEtherealSystem : EntitySystem
args.Cancel();
}
}
}

3
Content.Server/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs
View File

@@ -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 @@ public sealed class SiliconDeathSystem : EntitySystem
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;

25
Content.Server/Station/Systems/StationSpawningSystem.cs
View File

@@ -131,7 +131,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
/// <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,
@@ -139,22 +139,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
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 sealed class StationSpawningSystem : SharedStationSpawningSystem
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;

1
Content.Server/Traits/Assorted/SingerSystem.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.Instruments;
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;

5
Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs
View File

@@ -6,7 +6,8 @@ using Content.Shared.DoAfter;
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)
{

1
Content.Shared/Climbing/Systems/ClimbSystem.cs
View File

@@ -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()
{

2
Content.Shared/Nyanotrasen/Interaction/NoNormalInteractionSystem.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Shared.Interaction
private void OnInteractionAttempt(EntityUid uid, NoNormalInteractionComponent component, InteractionAttemptEvent args)
{
args.Cancel();
args.Cancelled = true;
}
}
}

2
Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs
View File

@@ -143,7 +143,7 @@ public abstract partial class SharedPseudoItemSystem : EntitySystem
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)

2
Content.Shared/Shadowkin/SharedEtherealSystem.cs
View File

@@ -165,7 +165,7 @@ public abstract class SharedEtherealSystem : EntitySystem
|| HasComp<EtherealComponent>(args.Target))
return;
args.Cancel();
args.Cancelled = true;
if (_gameTiming.InPrediction)
return;

6
Resources/Prototypes/Roles/Jobs/Science/borg.yml
View File

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