From 266c9c48fc7323a0029cb70a35ef6cfbcbdd2a20 Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Wed, 21 Jan 2026 21:33:03 +0000
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=92=D0=B7=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=BC=D0=B8=D0=BD,=20=D0=B4=D0=B5=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=D0=B7=D1=80=D1=8B?=
 =?UTF-8?q?=D0=B2-=D1=88=D1=82=D1=83=D0=BD=D0=B0,=20=D1=81=D0=BD=D1=8F?=
 =?UTF-8?q?=D1=82=D0=B8=D0=B5=20=D0=A14=20=D1=81=D0=BE=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20(#3767)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Shared/Item/ItemToggle/ItemToggleSystem.cs        | 4 ++--
 Content.Shared/Sticky/Systems/StickySystem.cs             | 3 ++-
 Resources/Prototypes/Entities/Structures/Power/cables.yml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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<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;
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"]