Removes all relative heresy (#13969)

Removes all relative heresy

code/modules/admin/DB ban/functions.dm

@@ -1,6 +1,6 @@
 #define MAX_ADMIN_BANS_PER_ADMIN 1
 
-datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null)
+/datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null)
 
 	if(!check_rights(R_BAN))	return
 
@@ -153,7 +153,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
 	else
 		flag_account_for_forum_sync(ckey)
 
-datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
+/datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 
 	if(!check_rights(R_BAN))	return
 
@@ -233,7 +233,7 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
 	else
 		flag_account_for_forum_sync(ckey)
 
-datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
+/datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
 
 	if(!check_rights(R_BAN))	return
 
@@ -297,7 +297,7 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
 			to_chat(usr, "Cancelled")
 			return
 
-datum/admins/proc/DB_ban_unban_by_id(var/id)
+/datum/admins/proc/DB_ban_unban_by_id(var/id)
 
 	if(!check_rights(R_BAN))
 		return

code/modules/admin/IsBanned.dm

@@ -1,5 +1,5 @@
 //Blocks an attempt to connect before even creating our client datum thing.
-world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE)
+/world/IsBanned(key, address, computer_id, type, check_ipintel = TRUE)
 
 	if(!config.ban_legacy_system)
 		if(address)

code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm

@@ -89,403 +89,443 @@
 /datum/SDQL_parser/proc/tokenl(i)
 	return lowertext(token(i))
 
-/datum/SDQL_parser/proc
-
 //query:	select_query | delete_query | update_query
-	query(i, list/node)
-		query_type = tokenl(i)
+/datum/SDQL_parser/proc/query(i, list/node)
+	query_type = tokenl(i)
 
-		switch(query_type)
-			if("select")
-				select_query(i, node)
+	switch(query_type)
+		if("select")
+			select_query(i, node)
 
-			if("delete")
-				delete_query(i, node)
+		if("delete")
+			delete_query(i, node)
 
-			if("update")
-				update_query(i, node)
+		if("update")
+			update_query(i, node)
 
-			if("call")
-				call_query(i, node)
+		if("call")
+			call_query(i, node)
 
-			if("explain")
-				node += "explain"
-				node["explain"] = list()
-				query(i + 1, node["explain"])
+		if("explain")
+			node += "explain"
+			node["explain"] = list()
+			query(i + 1, node["explain"])
 
 
 //	select_query:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
-	select_query(i, list/node)
-		var/list/select = list()
-		i = select_list(i + 1, select)
+/datum/SDQL_parser/proc/select_query(i, list/node)
+	var/list/select = list()
+	i = select_list(i + 1, select)
 
-		node += "select"
-		node["select"] = select
+	node += "select"
+	node["select"] = select
 
-		var/list/from = list()
-		if(tokenl(i) in list("from", "in"))
-			i = from_list(i + 1, from)
-		else
-			from += "world"
+	var/list/from = list()
+	if(tokenl(i) in list("from", "in"))
+		i = from_list(i + 1, from)
+	else
+		from += "world"
 
-		node += "from"
-		node["from"] = from
+	node += "from"
+	node["from"] = from
 
-		if(tokenl(i) == "where")
-			var/list/where = list()
-			i = bool_expression(i + 1, where)
+	if(tokenl(i) == "where")
+		var/list/where = list()
+		i = bool_expression(i + 1, where)
 
-			node += "where"
-			node["where"] = where
+		node += "where"
+		node["where"] = where
 
-		return i
+	return i
 
 
 //delete_query:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
-	delete_query(i, list/node)
-		var/list/select = list()
-		i = select_list(i + 1, select)
+/datum/SDQL_parser/proc/delete_query(i, list/node)
+	var/list/select = list()
+	i = select_list(i + 1, select)
 
-		node += "delete"
-		node["delete"] = select
+	node += "delete"
+	node["delete"] = select
 
-		var/list/from = list()
-		if(tokenl(i) in list("from", "in"))
-			i = from_list(i + 1, from)
-		else
-			from += "world"
+	var/list/from = list()
+	if(tokenl(i) in list("from", "in"))
+		i = from_list(i + 1, from)
+	else
+		from += "world"
 
-		node += "from"
-		node["from"] = from
+	node += "from"
+	node["from"] = from
 
-		if(tokenl(i) == "where")
-			var/list/where = list()
-			i = bool_expression(i + 1, where)
+	if(tokenl(i) == "where")
+		var/list/where = list()
+		i = bool_expression(i + 1, where)
 
-			node += "where"
-			node["where"] = where
+		node += "where"
+		node["where"] = where
 
-		return i
+	return i
 
 
 //update_query:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
-	update_query(i, list/node)
-		var/list/select = list()
-		i = select_list(i + 1, select)
+/datum/SDQL_parser/proc/update_query(i, list/node)
+	var/list/select = list()
+	i = select_list(i + 1, select)
 
-		node += "update"
-		node["update"] = select
+	node += "update"
+	node["update"] = select
 
-		var/list/from = list()
-		if(tokenl(i) in list("from", "in"))
-			i = from_list(i + 1, from)
-		else
-			from += "world"
+	var/list/from = list()
+	if(tokenl(i) in list("from", "in"))
+		i = from_list(i + 1, from)
+	else
+		from += "world"
 
-		node += "from"
-		node["from"] = from
+	node += "from"
+	node["from"] = from
 
-		if(tokenl(i) != "set")
-			i = parse_error("UPDATE has misplaced SET")
+	if(tokenl(i) != "set")
+		i = parse_error("UPDATE has misplaced SET")
 
-		var/list/set_assignments = list()
-		i = assignments(i + 1, set_assignments)
+	var/list/set_assignments = list()
+	i = assignments(i + 1, set_assignments)
 
-		node += "set"
-		node["set"] = set_assignments
+	node += "set"
+	node["set"] = set_assignments
 
-		if(tokenl(i) == "where")
-			var/list/where = list()
-			i = bool_expression(i + 1, where)
+	if(tokenl(i) == "where")
+		var/list/where = list()
+		i = bool_expression(i + 1, where)
 
-			node += "where"
-			node["where"] = where
+		node += "where"
+		node["where"] = where
 
-		return i
+	return i
 
 
 //call_query:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
-	call_query(i, list/node)
-		var/list/func = list()
-		i = variable(i + 1, func)
+/datum/SDQL_parser/proc/call_query(i, list/node)
+	var/list/func = list()
+	i = variable(i + 1, func)
 
-		node += "call"
-		node["call"] = func
-
-		if(tokenl(i) != "on")
-			return i
-
-		var/list/select = list()
-		i = select_list(i + 1, select)
-
-		node += "on"
-		node["on"] = select
-
-		var/list/from = list()
-		if(tokenl(i) in list("from", "in"))
-			i = from_list(i + 1, from)
-		else
-			from += "world"
-
-		node += "from"
-		node["from"] = from
-
-		if(tokenl(i) == "where")
-			var/list/where = list()
-			i = bool_expression(i + 1, where)
-
-			node += "where"
-			node["where"] = where
+	node += "call"
+	node["call"] = func
 
+	if(tokenl(i) != "on")
 		return i
 
+	var/list/select = list()
+	i = select_list(i + 1, select)
+
+	node += "on"
+	node["on"] = select
+
+	var/list/from = list()
+	if(tokenl(i) in list("from", "in"))
+		i = from_list(i + 1, from)
+	else
+		from += "world"
+
+	node += "from"
+	node["from"] = from
+
+	if(tokenl(i) == "where")
+		var/list/where = list()
+		i = bool_expression(i + 1, where)
+
+		node += "where"
+		node["where"] = where
+
+	return i
+
 
 //select_list:	select_item [',' select_list]
-	select_list(i, list/node)
-		i = select_item(i, node)
+/datum/SDQL_parser/proc/select_list(i, list/node)
+	i = select_item(i, node)
 
-		if(token(i) == ",")
-			i = select_list(i + 1, node)
+	if(token(i) == ",")
+		i = select_list(i + 1, node)
 
-		return i
+	return i
 
 
 //from_list:	from_item [',' from_list]
-	from_list(i, list/node)
-		i = from_item(i, node)
+/datum/SDQL_parser/proc/from_list(i, list/node)
+	i = from_item(i, node)
 
-		if(token(i) == ",")
-			i = from_list(i + 1, node)
+	if(token(i) == ",")
+		i = from_list(i + 1, node)
 
-		return i
+	return i
 
 
 //assignments:	assignment, [',' assignments]
-	assignments(i, list/node)
-		i = assignment(i, node)
+/datum/SDQL_parser/proc/assignments(i, list/node)
+	i = assignment(i, node)
 
-		if(token(i) == ",")
-			i = assignments(i + 1, node)
+	if(token(i) == ",")
+		i = assignments(i + 1, node)
 
-		return i
+	return i
 
 
 //select_item:	'*' | select_function | object_type
-	select_item(i, list/node)
+/datum/SDQL_parser/proc/select_item(i, list/node)
+	if(token(i) == "*")
+		node += "*"
+		i++
 
-		if(token(i) == "*")
-			node += "*"
-			i++
+	else if(tokenl(i) in select_functions)
+		i = select_function(i, node)
 
-		else if(tokenl(i) in select_functions)
-			i = select_function(i, node)
+	else
+		i = object_type(i, node)
 
-		else
-			i = object_type(i, node)
-
-		return i
+	return i
 
 
 //from_item:	'world' | object_type
-	from_item(i, list/node)
+/datum/SDQL_parser/proc/from_item(i, list/node)
 
-		if(token(i) == "world")
-			node += "world"
-			i++
+	if(token(i) == "world")
+		node += "world"
+		i++
 
-		else
-			i = object_type(i, node)
+	else
+		i = object_type(i, node)
 
-		return i
+	return i
 
 
 //bool_expression:	expression [bool_operator bool_expression]
-	bool_expression(i, list/node)
+/datum/SDQL_parser/proc/bool_expression(i, list/node)
+	var/list/bool = list()
+	i = expression(i, bool)
 
-		var/list/bool = list()
-		i = expression(i, bool)
+	node[++node.len] = bool
 
-		node[++node.len] = bool
+	if(tokenl(i) in boolean_operators)
+		i = bool_operator(i, node)
+		i = bool_expression(i, node)
 
-		if(tokenl(i) in boolean_operators)
-			i = bool_operator(i, node)
-			i = bool_expression(i, node)
-
-		return i
+	return i
 
 
 //assignment:	<variable name> '=' expression
-	assignment(var/i, var/list/node, var/list/assignment_list = list())
-		assignment_list += token(i)
+/datum/SDQL_parser/proc/assignment(var/i, var/list/node, var/list/assignment_list = list())
+	assignment_list += token(i)
 
-		if(token(i + 1) == ".")
-			i = assignment(i + 2, node, assignment_list)
+	if(token(i + 1) == ".")
+		i = assignment(i + 2, node, assignment_list)
 
-		else if(token(i + 1) == "=")
-			var/exp_list = list()
-			node[assignment_list] = exp_list
+	else if(token(i + 1) == "=")
+		var/exp_list = list()
+		node[assignment_list] = exp_list
 
-			i = expression(i + 2, exp_list)
+		i = expression(i + 2, exp_list)
 
-		else
-			parse_error("Assignment expected, but no = found")
+	else
+		parse_error("Assignment expected, but no = found")
 
-		return i
+	return i
 
 
 //variable:	<variable name> | <variable name> '.' variable
-	variable(i, list/node)
-		var/list/L = list(token(i))
-		node[++node.len] = L
+/datum/SDQL_parser/proc/variable(i, list/node)
+	var/list/L = list(token(i))
+	node[++node.len] = L
 
-		if(token(i) == "\[")
-			L += token(i + 1)
-			i += 2
+	if(token(i) == "\[")
+		L += token(i + 1)
+		i += 2
 
-			if(token(i) != "\]")
-				parse_error("Missing \] at end of reference.")
+		if(token(i) != "\]")
+			parse_error("Missing \] at end of reference.")
 
-		if(token(i + 1) == ".")
-			L += "."
-			i = variable(i + 2, L)
+	if(token(i + 1) == ".")
+		L += "."
+		i = variable(i + 2, L)
 
-		else if(token(i + 1) == "(") // OH BOY PROC
-			var/list/arguments = list()
-			i = call_function(i, null, arguments)
-			L += ":"
-			L[++L.len] = arguments
+	else if(token(i + 1) == "(") // OH BOY PROC
+		var/list/arguments = list()
+		i = call_function(i, null, arguments)
+		L += ":"
+		L[++L.len] = arguments
 
-		else if(token(i + 1) == "\[")	// list index
-			var/list/expression = list()
-			i = expression(i + 2, expression)
-			if(token(i) != "]")
-				parse_error("Missing ] at the end of list access.")
+	else if(token(i + 1) == "\[")	// list index
+		var/list/expression = list()
+		i = expression(i + 2, expression)
+		if(token(i) != "]")
+			parse_error("Missing ] at the end of list access.")
 
-			L += "\["
-			L[++L.len] = expression
-			i++
+		L += "\["
+		L[++L.len] = expression
+		i++
 
-		else
-			i++
+	else
+		i++
 
-		return i
+	return i
 
 
 //object_type:	<type path> | string
-	object_type(i, list/node)
+/datum/SDQL_parser/proc/object_type(i, list/node)
 
-		if(copytext(token(i), 1, 2) == "/")
-			node += token(i)
+	if(copytext(token(i), 1, 2) == "/")
+		node += token(i)
 
-		else
-			i = string(i, node)
+	else
+		i = string(i, node)
 
-		return i + 1
+	return i + 1
 
 
 //comparitor:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
-	comparitor(i, list/node)
+/datum/SDQL_parser/proc/comparitor(i, list/node)
 
-		if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
-			node += token(i)
+	if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
+		node += token(i)
 
-		else
-			parse_error("Unknown comparitor [token(i)]")
+	else
+		parse_error("Unknown comparitor [token(i)]")
 
-		return i + 1
+	return i + 1
 
 
 //bool_operator:	'AND' | '&&' | 'OR' | '||'
-	bool_operator(i, list/node)
+/datum/SDQL_parser/proc/bool_operator(i, list/node)
 
-		if(tokenl(i) in list("and", "or", "&&", "||"))
-			node += token(i)
+	if(tokenl(i) in list("and", "or", "&&", "||"))
+		node += token(i)
 
-		else
-			parse_error("Unknown comparitor [token(i)]")
+	else
+		parse_error("Unknown comparitor [token(i)]")
 
-		return i + 1
+	return i + 1
 
 
 //string:	''' <some text> ''' | '"' <some text > '"'
-	string(i, list/node)
+/datum/SDQL_parser/proc/string(i, list/node)
 
-		if(copytext(token(i), 1, 2) in list("'", "\""))
-			node += token(i)
+	if(copytext(token(i), 1, 2) in list("'", "\""))
+		node += token(i)
 
-		else
-			parse_error("Expected string but found '[token(i)]'")
+	else
+		parse_error("Expected string but found '[token(i)]'")
 
-		return i + 1
+	return i + 1
 
  //array:	'{' expression, expression, ... '}'
-	array(var/i, var/list/node)
-		// Arrays get turned into this: list("{", list(exp_1a = exp_1b, ...), ...), "{" is to mark the next node as an array.
-		if(copytext(token(i), 1, 2) != "{")
-			parse_error("Expected an array but found '[token(i)]'")
-			return i + 1
-
-		node += token(i) // Add the "{"
-		var/list/expression_list = list()
-
-		if(token(i + 1) != "}")
-			var/list/temp_expression_list = list()
-
-			do
-				i = expression(i + 1, temp_expression_list)
-
-				if(token(i) == ",")
-					expression_list[++expression_list.len] = temp_expression_list
-					temp_expression_list = list()
-			while(token(i) && token(i) != "}")
-
-			expression_list[++expression_list.len] = temp_expression_list
-		else
-			i++
-
-		node[++node.len] = expression_list
+/datum/SDQL_parser/proc/array(var/i, var/list/node)
+	// Arrays get turned into this: list("{", list(exp_1a = exp_1b, ...), ...), "{" is to mark the next node as an array.
+	if(copytext(token(i), 1, 2) != "{")
+		parse_error("Expected an array but found '[token(i)]'")
 		return i + 1
 
+	node += token(i) // Add the "{"
+	var/list/expression_list = list()
+
+	if(token(i + 1) != "}")
+		var/list/temp_expression_list = list()
+
+		do
+			i = expression(i + 1, temp_expression_list)
+
+			if(token(i) == ",")
+				expression_list[++expression_list.len] = temp_expression_list
+				temp_expression_list = list()
+		while(token(i) && token(i) != "}")
+
+		expression_list[++expression_list.len] = temp_expression_list
+	else
+		i++
+
+	node[++node.len] = expression_list
+	return i + 1
+
 //call_function:	<function name> ['(' [arguments] ')']
-	call_function(i, list/node, list/arguments)
-		var/list/cur_argument = list()
-		if(length(tokenl(i)))
-			var/procname = ""
-			if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc.
-				i += 2
-				procname = "global."
-			node += procname + token(i++)
-			if(token(i) != "(")
-				parse_error("Expected ( but found '[token(i)]'")
-			else if(token(i + 1) != ")")
-				do
-					i = expression(i + 1, cur_argument)
-					if(token(i) == ",")
-						arguments += list(cur_argument)
-						cur_argument = list()
-						continue
-				while(token(i) && token(i) != ")")
-				arguments += list(cur_argument)
-			else
-				i++
+/datum/SDQL_parser/proc/call_function(i, list/node, list/arguments)
+	var/list/cur_argument = list()
+	if(length(tokenl(i)))
+		var/procname = ""
+		if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc.
+			i += 2
+			procname = "global."
+		node += procname + token(i++)
+		if(token(i) != "(")
+			parse_error("Expected ( but found '[token(i)]'")
+		else if(token(i + 1) != ")")
+			do
+				i = expression(i + 1, cur_argument)
+				if(token(i) == ",")
+					arguments += list(cur_argument)
+					cur_argument = list()
+					continue
+			while(token(i) && token(i) != ")")
+			arguments += list(cur_argument)
 		else
-			parse_error("Expected a function but found nothing")
-		return i + 1
+			i++
+	else
+		parse_error("Expected a function but found nothing")
+	return i + 1
 
 
 //select_function:	count_function
-	select_function(i, list/node)
+/datum/SDQL_parser/proc/select_function(i, list/node)
 
-		parse_error("Sorry, function calls aren't available yet")
+	parse_error("Sorry, function calls aren't available yet")
 
-		return i
+	return i
 
 
 //expression:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
-	expression(i, list/node)
+/datum/SDQL_parser/proc/expression(i, list/node)
+
+	if(token(i) in unary_operators)
+		i = unary_expression(i, node)
+
+	else if(token(i) == "(")
+		var/list/expr = list()
+
+		i = expression(i + 1, expr)
+
+		if(token(i) != ")")
+			parse_error("Missing ) at end of expression.")
+
+		else
+			i++
+
+		node[++node.len] = expr
+
+	else
+		i = value(i, node)
+
+	if(token(i) in binary_operators)
+		i = binary_operator(i, node)
+		i = expression(i, node)
+
+	else if(token(i) in comparitors)
+		i = binary_operator(i, node)
+
+		var/list/rhs = list()
+		i = expression(i, rhs)
+
+		node[++node.len] = rhs
+
+
+	return i
+
+
+//unary_expression:	unary_operator ( unary_expression | value | '(' expression ')' )
+/datum/SDQL_parser/proc/unary_expression(i, list/node)
+
+	if(token(i) in unary_operators)
+		var/list/unary_exp = list()
+
+		unary_exp += token(i)
+		i++
 
 		if(token(i) in unary_operators)
-			i = unary_expression(i, node)
+			i = unary_expression(i, unary_exp)
 
 		else if(token(i) == "(")
 			var/list/expr = list()
@@ -498,99 +538,55 @@
 			else
 				i++
 
-			node[++node.len] = expr
+			unary_exp[++unary_exp.len] = expr
 
 		else
-			i = value(i, node)
+			i = value(i, unary_exp)
 
-		if(token(i) in binary_operators)
-			i = binary_operator(i, node)
-			i = expression(i, node)
-
-		else if(token(i) in comparitors)
-			i = binary_operator(i, node)
-
-			var/list/rhs = list()
-			i = expression(i, rhs)
-
-			node[++node.len] = rhs
+		node[++node.len] = unary_exp
 
 
-		return i
+	else
+		parse_error("Expected unary operator but found '[token(i)]'")
 
-
-//unary_expression:	unary_operator ( unary_expression | value | '(' expression ')' )
-	unary_expression(i, list/node)
-
-		if(token(i) in unary_operators)
-			var/list/unary_exp = list()
-
-			unary_exp += token(i)
-			i++
-
-			if(token(i) in unary_operators)
-				i = unary_expression(i, unary_exp)
-
-			else if(token(i) == "(")
-				var/list/expr = list()
-
-				i = expression(i + 1, expr)
-
-				if(token(i) != ")")
-					parse_error("Missing ) at end of expression.")
-
-				else
-					i++
-
-				unary_exp[++unary_exp.len] = expr
-
-			else
-				i = value(i, unary_exp)
-
-			node[++node.len] = unary_exp
-
-
-		else
-			parse_error("Expected unary operator but found '[token(i)]'")
-
-		return i
+	return i
 
 
 //binary_operator:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
-	binary_operator(i, list/node)
+/datum/SDQL_parser/proc/binary_operator(i, list/node)
 
-		if(token(i) in (binary_operators + comparitors))
-			node += token(i)
+	if(token(i) in (binary_operators + comparitors))
+		node += token(i)
 
-		else
-			parse_error("Unknown binary operator [token(i)]")
+	else
+		parse_error("Unknown binary operator [token(i)]")
 
-		return i + 1
+	return i + 1
 
 
 //value:	variable | string | number | 'null'
-	value(i, list/node)
+/datum/SDQL_parser/proc/value(i, list/node)
 
-		if(token(i) == "null")
-			node += "null"
-			i++
+	if(token(i) == "null")
+		node += "null"
+		i++
 
-		else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))
-			node += hex2num(copytext(token(i), 3))
-			i++
+	else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))
+		node += hex2num(copytext(token(i), 3))
+		i++
 
-		else if(isnum(text2num(token(i))))
-			node += text2num(token(i))
-			i++
+	else if(isnum(text2num(token(i))))
+		node += text2num(token(i))
+		i++
 
-		else if(copytext(token(i), 1, 2) in list("'", "\""))
-			i = string(i, node)
+	else if(copytext(token(i), 1, 2) in list("'", "\""))
+		i = string(i, node)
 
-		else if(copytext(token(i), 1, 2) == "{") // Start a list.
-			i = array(i, node)
+	else if(copytext(token(i), 1, 2) == "{") // Start a list.
+		i = array(i, node)
 
-		else
-			i = variable(i, node)
+	else
+		i = variable(i, node)
 
-		return i
+	return i
 /*EXPLAIN SELECT * WHERE 42 = 6 * 9 OR val = - 5 == 7*/

code/modules/admin/verbs/mapping.dm

@@ -26,9 +26,9 @@ GLOBAL_VAR_INIT(intercom_range_display_status, 0)
 	icon = 'icons/480x480.dmi'
 	icon_state = "25percent"
 
-	New()
-		src.pixel_x = -224
-		src.pixel_y = -224
+/obj/effect/debugging/camera_range/New()
+	src.pixel_x = -224
+	src.pixel_y = -224
 
 /obj/effect/debugging/mapfix_marker
 	name = "map fix marker"

code/modules/admin/verbs/one_click_antag.dm

@@ -1,4 +1,4 @@
-client/proc/one_click_antag()
+/client/proc/one_click_antag()
 	set name = "Create Antagonist"
 	set desc = "Auto-create an antagonist of your choice"
 	set category = "Event"

code/modules/admin/verbs/randomverbs.dm

@@ -201,7 +201,7 @@
 	feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
-proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
+/proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
 	if(automute)
 		if(!config.automute_on)
 			return