From 37ee54621a492bac36e581d23f0e72a6c5e52763 Mon Sep 17 00:00:00 2001
From: Varen <ychwack@hotmail.it>
Date: Wed, 1 Oct 2025 21:59:28 +0200
Subject: [PATCH] Allow multitool device saving on devices with wireless
 (#38938)

-Device network list will not override device linking anymore if existing
---
 .../Systems/NetworkConfiguratorSystem.cs              | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
index e34929bd2e..97b27821fd 100644
--- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -361,14 +361,11 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
         if (hasLinking && HasComp<DeviceListComponent>(target) || hasLinking == configurator.LinkModeActive)
             return;
 
-        if (hasLinking)
-        {
-            SetMode(configuratorUid, configurator, userUid, true);
-            return;
-        }
-
-        if (HasComp<DeviceNetworkComponent>(target))
+        var hasNetworking = HasComp<DeviceNetworkComponent>(target);
+        if (hasNetworking)
             SetMode(configuratorUid, configurator, userUid, false);
+        else if (hasLinking)
+            SetMode(configuratorUid, configurator, userUid, true);
     }
 
     #endregion
-- 
2.51.2