From c5f01ecf9b73ee221bf2a5acc86135e6ef14ae33 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Mon, 13 Mar 2017 16:03:18 -0400 Subject: [PATCH] Moves when macros are substituted in the loader --- code/modules/mapping/reader.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 199aae83b10..9b4df9cd4d6 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -213,6 +213,10 @@ var/global/dmm_suite/preloader/_preloader = new if(variables_start)//if there's any variable full_def = copytext(full_def,variables_start+1,length(full_def))//removing the last '}' fields = readlist(full_def, ";") + for(var/I in fields) + var/value = fields[I] + if(istext(value)) + fields[I] = apply_text_macros(value) //then fill the members_attributes list with the corresponding variables members_attributes.len++ @@ -403,8 +407,6 @@ var/global/dmm_suite/preloader/_preloader = new var/value = attributes[attribute] if(islist(value)) value = deepCopyList(value) - if(istext(value)) - value = apply_text_macros(value) what.vars[attribute] = value use_preloader = FALSE