Skip to content

Commit

Permalink
first fix pack
Browse files Browse the repository at this point in the history
  • Loading branch information
KashRas committed Jan 15, 2025
1 parent d68c118 commit f766358
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions Content.Shared/Climbing/Components/BonkableComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,35 @@ public sealed partial class BonkableComponent : Component
{
/// <summary>
/// How long to stun players on bonk, in seconds.
// ADT TWEAK START
/// <summary>
/// Chance of bonk triggering if the user is clumsy.

/// </summary>
[DataField]
public TimeSpan BonkTime = TimeSpan.FromSeconds(2);

// ADT TWEAK START

/// <summary>
/// Chance of bonk triggering if the user is clumsy.
/// </summary>

[DataField("bonkClumsyChance")]
public float BonkClumsyChance = 0.5f;

/// <summary>
/// How much damage to apply on bonk.
/// </summary>
/// <seealso cref="Bonk"/>

[DataField("bonkSound")]
public SoundSpecifier? BonkSound;

/// <summary>
/// How long it takes to bonk.
/// </summary>

[DataField("bonkDelay")]
public float BonkDelay = 1.5f;
// ADT TWEAK END

[DataField]
public DamageSpecifier? BonkDamage;
}
2 changes: 1 addition & 1 deletion Content.Shared/Wieldable/WieldableSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ private void OnItemUnwielded(EntityUid uid, WieldableComponent component, ItemUn
_audio.PlayPredicted(component.UnwieldSound, uid, user);

var selfMessage = Loc.GetString("wieldable-component-failed-wield", ("item", uid));
var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User.Value, EntityManager)), ("item", uid));
var othersMessage = Loc.GetString("wieldable-component-failed-wield-other", ("user", Identity.Entity(args.User, EntityManager)), ("item", uid));
_popup.PopupPredicted(selfMessage, othersMessage, user, user);
}
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit f766358

Please sign in to comment.