diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index e59c74ef22..1a7cd66f3b 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -695,6 +695,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null * Seriously, if you hit those limits, you're doing something wrong. */ /datum/SDQL2_query/proc/SDQL_print(datum/object, list/text_list, print_nulls = TRUE, recursion = 0, linebreak = TRUE) + text_list += " if(recursion > 50) text_list += "RECURSION LIMIT REACHED." if(is_object_datatype(object)) @@ -717,13 +718,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null text_list += " on [T] [ADMIN_COORDJMP(T)] at[T.loc]" else text_list += " in nullspace" - if(linebreak) - text_list += "
" - return else // lists are snowflake and get special treatment. - for(var/t in 1 to recursion) - text_list += "\t" - text_list += "/list [REF(object)] \[
" + text_list += "/list [REF(object)] \[" var/first = TRUE var/list/L = object for(var/key in object) @@ -734,8 +730,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if(IS_VALID_ASSOC_KEY(key) && !isnull(L[key])) text_list += " --> " SDQL_print(L[key], text_list, TRUE, recursion + 1, FALSE) - text_list += "
- text_list += "\]
" + text_list += "
" + text_list += "\]" else if(isnull(object)) if(print_nulls) @@ -746,8 +742,9 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null text_list += "NUM: [object]" else text_list += "UNKNOWN: [object]" - if(linebreak) - text_list += "
" + text_list += "
+ if(linebreak) + text_list += "
" /datum/SDQL2_query/CanProcCall() if(!allow_admin_interact)