Further merge conflict resolving

OpenDreamProject · Dec 15, 2022 · 6fe034c · 6fe034c
1 parent 3ccabd5
commit 6fe034c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs b/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs
@@ -627,8 +627,8 @@ private static void HandleSuffixPronoun(ref StringBuilder formattedString, ReadO
                 // Implicitly create a new /icon and ICON_ADD blend it
                 // Note that BYOND creates something other than an /icon, but it behaves the same as one in most reasonable interactions
                 DreamObject iconObj = state.Proc.ObjectTree.CreateObject(DreamPath.Icon);
-                var icon = DreamMetaObjectIcon.InitializeIcon(state.Proc.ResourceManager, iconObj);
-                var from = DreamMetaObjectIcon.GetIconResourceAndDescription(state.Proc.ObjectTree, state.Proc.ResourceManager, first);
+                var icon = DreamMetaObjectIcon.InitializeIcon(state.Proc.DreamResourceManager, iconObj);
+                var from = DreamMetaObjectIcon.GetIconResourceAndDescription(state.Proc.ObjectTree, state.Proc.DreamResourceManager, first);
 
                 icon.InsertStates(from.Resource, from.Description, DreamValue.Null, DreamValue.Null, DreamValue.Null);
                 DreamProcNativeIcon.Blend(icon, second, DreamIconOperationBlend.BlendType.Add, 0, 0);