Фикс Взвода мин, детонации взрыв-штуна, снятие С4 со стены (#3767)
This commit is contained in:
parent
0e5f604a0e
commit
266c9c48fc
3 changed files with 5 additions and 4 deletions
|
|
@ -84,7 +84,7 @@ public sealed class ItemToggleSystem : EntitySystem
|
|||
return;
|
||||
|
||||
// Sunrise-Start
|
||||
if (TryComp<HandsComponent>(args.User, out var handsComp))
|
||||
if (HasComp<ItemComponent>(ent.Owner) && TryComp<HandsComponent>(args.User, out var handsComp))
|
||||
{
|
||||
if (!_handsSystem.TryGetActiveItem((args.User, handsComp), out var itemInHand))
|
||||
return;
|
||||
|
|
@ -114,7 +114,7 @@ public sealed class ItemToggleSystem : EntitySystem
|
|||
if (!ent.Comp.CanActivateInhand) // Верб позволяет активировать в руке ПНВ и термалы, а нам это не нужно
|
||||
return;
|
||||
|
||||
if (TryComp<HandsComponent>(args.User, out var handsComp))
|
||||
if (HasComp<ItemComponent>(ent.Owner) && TryComp<HandsComponent>(args.User, out var handsComp))
|
||||
{
|
||||
if (!_handsSystem.TryGetActiveItem((args.User, handsComp), out var itemInHand))
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -141,7 +141,8 @@ public sealed class StickySystem : EntitySystem
|
|||
}
|
||||
|
||||
// start unsticking object
|
||||
_doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.UnstickDelay, new StickyDoAfterEvent(), uid, target: uid)
|
||||
// Use the surface we are stuck to as the target for range/access checks; the sticky item itself is in a container and fails accessibility checks.
|
||||
_doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.UnstickDelay, new StickyDoAfterEvent(), uid, target: stuckTo) // Sunrise-Add
|
||||
{
|
||||
BreakOnMove = true,
|
||||
NeedHand = true,
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@
|
|||
- trigger:
|
||||
!type:DamageTypeTrigger
|
||||
damageType: Structural #this is as close as we can get to only letting explosives set it off.
|
||||
damage: 120
|
||||
damage: 55 # Sunrise-Edit
|
||||
behaviors:
|
||||
- !type:DoActsBehavior
|
||||
acts: ["Destruction"]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue