From 6fe034ccbd7ea1f0e23d49d6f3294c4c5001f1c5 Mon Sep 17 00:00:00 2001 From: wixoaGit Date: Wed, 14 Dec 2022 14:33:34 -0500 Subject: [PATCH] Further merge conflict resolving --- OpenDreamRuntime/Procs/DMOpcodeHandlers.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs b/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs index e2ea656567..088eee116a 100644 --- 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);