]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Allow multitool device saving on devices with wireless (#38938)
authorVaren <ychwack@hotmail.it>
Wed, 1 Oct 2025 19:59:28 +0000 (21:59 +0200)
committerGitHub <noreply@github.com>
Wed, 1 Oct 2025 19:59:28 +0000 (19:59 +0000)
-Device network list will not override device linking anymore if existing

Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs

index e34929bd2e2489544bc59cf40a3f91fcac5dfa3a..97b27821fd4a007c028d567682ddfa0d225a625a 100644 (file)
@@ -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