shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3303 from Citadel-Station-13/upstream-merge-31511

Browse Source 
[MIRROR] Fixes VVing associated values in lists when the value was a number.
This commit is contained in:
LetterJay
2017-10-12 07:15:22 -04:00
committed by GitHub
parent 5b4e26cb06 6ed7f455b7
commit 38d2eebade
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/modifyvariables.dm
+6 -8
View File
@@ -433,12 +433,13 @@ GLOBAL_PROTECT(VVpixelmovement)
to_chat(src, "Variable appears to be <b>[uppertext(default)]</b>.") to_chat(src, "Variable appears to be <b>[uppertext(default)]</b>.")
to_chat(src, "Variable contains: [L[index]]") to_chat(src, "Variable contains: [variable]")
if(default == VV_NUM) if(default == VV_NUM)
var/dir_text = "" var/dir_text = ""
if(dir < 0 && dir < 16) var/tdir = variable
if(dir & 1) if(tdir > 0 && tdir < 16)
if(tdir & 1)
dir_text += "NORTH" dir_text += "NORTH"
if(dir & 2) if(dir & 2)
dir_text += "SOUTH" dir_text += "SOUTH"
@@ -450,11 +451,8 @@ GLOBAL_PROTECT(VVpixelmovement)
if(dir_text) if(dir_text)
to_chat(usr, "If a direction, direction is: [dir_text]") to_chat(usr, "If a direction, direction is: [dir_text]")
var/original_var var/original_var = variable
if(assoc)
original_var = L[assoc_key]
else
original_var = L[index]
if (O) if (O)
L = L.Copy() L = L.Copy()
var/class var/class