diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs index 7896989b40..7fe6e68ae9 100644 --- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs @@ -84,7 +84,7 @@ public sealed class ItemToggleSystem : EntitySystem return; // Sunrise-Start - if (TryComp(args.User, out var handsComp)) + if (HasComp(ent.Owner) && TryComp(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(args.User, out var handsComp)) + if (HasComp(ent.Owner) && TryComp(args.User, out var handsComp)) { if (!_handsSystem.TryGetActiveItem((args.User, handsComp), out var itemInHand)) return; diff --git a/Content.Shared/Sticky/Systems/StickySystem.cs b/Content.Shared/Sticky/Systems/StickySystem.cs index bc04c81f55..ae97a522ba 100644 --- a/Content.Shared/Sticky/Systems/StickySystem.cs +++ b/Content.Shared/Sticky/Systems/StickySystem.cs @@ -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, diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index 4722b6e0b7..c4576b2df9 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -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"]