From 4c10fe270f2d0b4261e28fb941fa9ed16bfc0b32 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Tue, 10 Oct 2017 20:17:47 -0700 Subject: [PATCH] Fixes VVing associated values in lists when the value was a number. --- code/modules/admin/verbs/modifyvariables.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 2a0575eb28..b708e42b3c 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -433,12 +433,18 @@ GLOBAL_PROTECT(VVpixelmovement) to_chat(src, "Variable appears to be [uppertext(default)].") - to_chat(src, "Variable contains: [L[index]]") + to_chat(src, "Variable contains: [variable]") if(default == VV_NUM) var/dir_text = "" +<<<<<<< HEAD if(dir < 0 && dir < 16) if(dir & 1) +======= + var/tdir = variable + if(tdir > 0 && tdir < 16) + if(tdir & 1) +>>>>>>> 428922c... Fixes VVing associated values in lists when the value was a number. (#31511) dir_text += "NORTH" if(dir & 2) dir_text += "SOUTH" @@ -450,11 +456,8 @@ GLOBAL_PROTECT(VVpixelmovement) if(dir_text) to_chat(usr, "If a direction, direction is: [dir_text]") - var/original_var - if(assoc) - original_var = L[assoc_key] - else - original_var = L[index] + var/original_var = variable + if (O) L = L.Copy() var/class