]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix RCD errors (#40278)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Sat, 20 Sep 2025 19:05:57 +0000 (21:05 +0200)
committerGitHub <noreply@github.com>
Sat, 20 Sep 2025 19:05:57 +0000 (12:05 -0700)
Content.Client/RCD/RCDMenuBoundUserInterface.cs
Content.Shared/RCD/Systems/RCDSystem.cs

index 6aa32892cfd84a2d4b826ce93712087f9eff031d..3f847c8beb684da8ed73d695792eb2286ce69428 100644 (file)
@@ -125,7 +125,7 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface
             var name = Loc.GetString(proto.SetName);
 
             if (proto.Prototype != null &&
-                _prototypeManager.Resolve(proto.Prototype, out var entProto))
+                _prototypeManager.TryIndex(proto.Prototype, out var entProto)) // don't use Resolve because this can be a tile
             {
                 name = entProto.Name;
             }
@@ -144,7 +144,7 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface
 
         if (proto.Mode is RcdMode.ConstructTile or RcdMode.ConstructObject
             && proto.Prototype != null
-            && _prototypeManager.Resolve(proto.Prototype, out var entProto))
+            && _prototypeManager.TryIndex(proto.Prototype, out var entProto)) // don't use Resolve because this can be a tile
         {
             tooltip = Loc.GetString(entProto.Name);
         }
index 2e638d7c13bbe223dac9827dd287e2177180be8f..6cce0b6204c8ab257fa242c6e7ed2a74574bbecf 100644 (file)
@@ -111,7 +111,7 @@ public sealed class RCDSystem : EntitySystem
             var name = Loc.GetString(prototype.SetName);
 
             if (prototype.Prototype != null &&
-                _protoManager.Resolve(prototype.Prototype, out var proto))
+                _protoManager.TryIndex(prototype.Prototype, out var proto)) // don't use Resolve because this can be a tile
                 name = proto.Name;
 
             msg = Loc.GetString("rcd-component-examine-build-details", ("name", name));