From becfcb1dd2dc6638013f1c2b4718aad2ef281a9d Mon Sep 17 00:00:00 2001 From: ACCount Date: Thu, 9 Nov 2017 02:11:51 +0300 Subject: [PATCH 1/2] Fixes VV not displaying false values in keyed lists --- code/datums/datumvars.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index b653e5c6ae..25de63a055 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -53,7 +53,11 @@ return var/title = "" +<<<<<<< HEAD var/refid = "\ref[D]" +======= + var/refid = REF(D) +>>>>>>> bd5f864... Fixes VV not displaying false values in keyed lists (#32498) var/icon/sprite var/hash @@ -453,7 +457,7 @@ var/val if (IS_NORMAL_LIST(L) && !isnum(key)) val = L[key] - if (!val) + if (isnull(val)) // we still want to display non-null false values, such as 0 or "" val = key key = i From 6df47bed08747a5614265a8be28f3a2ce16cefcf Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 9 Nov 2017 03:15:20 -0600 Subject: [PATCH 2/2] Update datumvars.dm --- code/datums/datumvars.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 25de63a055..7eb6afec5b 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -53,11 +53,7 @@ return var/title = "" -<<<<<<< HEAD - var/refid = "\ref[D]" -======= var/refid = REF(D) ->>>>>>> bd5f864... Fixes VV not displaying false values in keyed lists (#32498) var/icon/sprite var/hash