tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double vault do_after (#16743)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-24 17:08:04 +10:00
committed by GitHub
parent 3c028e4f4b
commit d2bfb3e2b9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -103,7 +103,7 @@ public sealed class ClimbSystem : SharedClimbSystem
{ {
// definitely a better way to check if two entities are equal // definitely a better way to check if two entities are equal
// but don't have computer access and i have to do this without syntax // but don't have computer access and i have to do this without syntax
if (args.User != args.Dragged && !HasComp<HandsComponent>(args.User)) if (args.Handled || args.User != args.Dragged && !HasComp<HandsComponent>(args.User))
return; return;
TryClimb(args.User, args.Dragged, uid, component); TryClimb(args.User, args.Dragged, uid, component);
} }

3
Content.Shared/Climbing/BonkSystem.cs
View File

@@ -7,6 +7,7 @@ using Content.Shared.DragDrop;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.IdentityManagement; using Content.Shared.IdentityManagement;
using Content.Shared.Interaction.Components;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
@@ -72,7 +73,7 @@ public sealed class BonkSystem : EntitySystem
private void OnDragDrop(EntityUid uid, BonkableComponent component, ref DragDropTargetEvent args) private void OnDragDrop(EntityUid uid, BonkableComponent component, ref DragDropTargetEvent args)
{ {
if (args.Handled) if (args.Handled || !HasComp<ClumsyComponent>(args.Dragged))
return; return;
var doAfterArgs = new DoAfterArgs(args.Dragged, component.BonkDelay, new BonkDoAfterEvent(), uid, target: uid) var doAfterArgs = new DoAfterArgs(args.Dragged, component.BonkDelay, new BonkDoAfterEvent(), uid, target: uid)

2
Resources/Locale/en-US/bonk/components/bonkable-component.ftl
View File

@@ -1,2 +1,2 @@
bonkable-success-message-others = { CAPITALIZE(THE($user)) } bonks { POSS-ADJ($user) } head against { $bonkable } bonkable-success-message-others = { CAPITALIZE(THE($user)) } bonks { POSS-ADJ($user) } head against { $bonkable }
bonkable-success-message-user = You bonk your head against { $bonkable } bonkable-success-message-user = You bonk your head against { THE($bonkable) }