Fix double vault do_after (#16743)
This commit is contained in:
@@ -103,7 +103,7 @@ public sealed class ClimbSystem : SharedClimbSystem
|
||||
{
|
||||
// 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
|
||||
if (args.User != args.Dragged && !HasComp<HandsComponent>(args.User))
|
||||
if (args.Handled || args.User != args.Dragged && !HasComp<HandsComponent>(args.User))
|
||||
return;
|
||||
TryClimb(args.User, args.Dragged, uid, component);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ using Content.Shared.DragDrop;
|
||||
using Robust.Shared.Configuration;
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.IdentityManagement;
|
||||
using Content.Shared.Interaction.Components;
|
||||
using Robust.Shared.Player;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
@@ -72,7 +73,7 @@ public sealed class BonkSystem : EntitySystem
|
||||
|
||||
private void OnDragDrop(EntityUid uid, BonkableComponent component, ref DragDropTargetEvent args)
|
||||
{
|
||||
if (args.Handled)
|
||||
if (args.Handled || !HasComp<ClumsyComponent>(args.Dragged))
|
||||
return;
|
||||
|
||||
var doAfterArgs = new DoAfterArgs(args.Dragged, component.BonkDelay, new BonkDoAfterEvent(), uid, target: uid)
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
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) }
|
||||
|
||||
Reference in New Issue
Block a user