make desc nullable

OpenDreamProject · Dec 18, 2024 · 6107459 · 6107459
1 parent b82d31c
commit 6107459
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/OpenDreamRuntime/AtomManager.cs b/OpenDreamRuntime/AtomManager.cs
@@ -251,7 +251,7 @@ public void SetAppearanceVar(IconAppearance appearance, string varName, DreamVal
                 break;
             case "desc":
                 value.TryGetValueAsString(out var desc);
-                appearance.Desc = desc ?? string.Empty;
+                appearance.Desc = desc;
                 break;
             case "icon":
                 if (_resourceManager.TryLoadIcon(value, out var icon)) {
@@ -393,6 +393,8 @@ public DreamValue GetAppearanceVar(IconAppearance appearance, string varName) {
             case "name":
                 return new(appearance.Name);
             case "desc":
+                if (appearance.Desc == null)
+                    return DreamValue.Null;
                 return new(appearance.Desc);
             case "icon":
                 if (appearance.Icon == null)

diff --git a/OpenDreamShared/Dream/IconAppearance.cs b/OpenDreamShared/Dream/IconAppearance.cs
@@ -24,7 +24,7 @@ public sealed class IconAppearance : IEquatable<IconAppearance> {
     public static readonly IconAppearance Default = new();
 
     [ViewVariables] public string Name = string.Empty;
-    [ViewVariables] public string Desc = string.Empty;
+    [ViewVariables] public string? Desc = string.Empty;
     [ViewVariables] public int? Icon;
     [ViewVariables] public string? IconState;
     [ViewVariables] public AtomDirection Direction = AtomDirection.South;