Skip to content

Commit

Permalink
Fixed mistake in SharedStationAiSystem.cs
Browse files Browse the repository at this point in the history
  • Loading branch information
chromiumboy authored Feb 25, 2025
1 parent 4caa842 commit 9e86cf1
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Content.Shared.Doors.Systems;
using Content.Shared.DoAfter;
using Content.Shared.Electrocution;
using Content.Shared.Intellicard;
using Content.Shared.;
using Content.Shared.Interaction;
using Content.Shared.Item.ItemToggle;
using Content.Shared.Mind;
Expand Down Expand Up @@ -96,7 +96,7 @@ public override void Initialize()
SubscribeLocalEvent<StationAiHolderComponent, MapInitEvent>(OnHolderMapInit);
SubscribeLocalEvent<StationAiHolderComponent, EntInsertedIntoContainerMessage>(OnHolderConInsert);
SubscribeLocalEvent<StationAiHolderComponent, EntRemovedFromContainerMessage>(OnHolderConRemove);
SubscribeLocalEvent<StationAiHolderComponent, IntellicardDoAfterEvent>(OnIntellicardDoAfter);
SubscribeLocalEvent<StationAiHolderComponent, DoAfterEvent>(OnDoAfter);

SubscribeLocalEvent<StationAiCoreComponent, EntInsertedIntoContainerMessage>(OnAiInsert);
SubscribeLocalEvent<StationAiCoreComponent, EntRemovedFromContainerMessage>(OnAiRemove);
Expand Down Expand Up @@ -208,7 +208,7 @@ private void OnAiInRange(Entity<StationAiOverlayComponent> ent, ref InRangeOverr
}


private void OnIntellicardDoAfter(Entity<StationAiHolderComponent> ent, ref IntellicardDoAfterEvent args)
private void OnDoAfter(Entity<StationAiHolderComponent> ent, ref DoAfterEvent args)
{
if (args.Cancelled)
return;
Expand Down Expand Up @@ -251,7 +251,7 @@ private void OnHolderInteract(Entity<StationAiHolderComponent> ent, ref AfterInt
if (!TryComp(args.Target, out StationAiHolderComponent? targetHolder))
return;

//Don't want to download/upload between several intellicards. You can just pick it up at that point.
//Don't want to download/upload between several s. You can just pick it up at that point.
if (HasComp<IntellicardComponent>(args.Target))
return;

Expand All @@ -263,24 +263,24 @@ private void OnHolderInteract(Entity<StationAiHolderComponent> ent, ref AfterInt

if (cardHasAi && coreHasAi)
{
_popup.PopupClient(Loc.GetString("intellicard-core-occupied"), args.User, args.User, PopupType.Medium);
_popup.PopupClient(Loc.GetString("-core-occupied"), args.User, args.User, PopupType.Medium);
args.Handled = true;
return;
}
if (!cardHasAi && !coreHasAi)
{
_popup.PopupClient(Loc.GetString("intellicard-core-empty"), args.User, args.User, PopupType.Medium);
_popup.PopupClient(Loc.GetString("-core-empty"), args.User, args.User, PopupType.Medium);
args.Handled = true;
return;
}

if (TryGetHeld((args.Target.Value, targetHolder), out var held) && _timing.CurTime > intelliComp.NextWarningAllowed)
if (TryGetHeld((args.Target.Value, targetHolder), out var held))
{
var ev = new ChatNotificationEvent("IntellicardDownload", args.Used, args.User);
var ev = new ChatNotificationEvent("Download", args.Used, args.User);
RaiseLocalEvent(held, ref ev);
}

var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cardHasAi ? intelliComp.UploadTime : intelliComp.DownloadTime, new IntellicardDoAfterEvent(), args.Target, ent.Owner)
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cardHasAi ? intelliComp.UploadTime : intelliComp.DownloadTime, new DoAfterEvent(), args.Target, ent.Owner)
{
BreakOnDamage = true,
BreakOnMove = true,
Expand Down Expand Up @@ -538,7 +538,7 @@ public sealed partial class JumpToCoreEvent : InstantActionEvent
}

[Serializable, NetSerializable]
public sealed partial class IntellicardDoAfterEvent : SimpleDoAfterEvent;
public sealed partial class DoAfterEvent : SimpleDoAfterEvent;


[Serializable, NetSerializable]
Expand Down

0 comments on commit 9e86cf1

Please sign in to comment.