Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/admin/view_variables/get_variables.dm

@@ -77,6 +77,15 @@
 			markstring = "[VV_MARKED_DATUM] (CURRENT: [(istype(holder) && istype(holder.marked_datum))? holder.marked_datum.type : "NULL"])"
 			classes += markstring
 
+		var/list/tagstrings = new
+		if(!(VV_TAGGED_DATUM in restricted_classes) && holder && LAZYLEN(holder.tagged_datums))
+			var/i = 0
+			for(var/datum/iter_tagged_datum as anything in holder.tagged_datums)
+				i++
+				var/new_tagstring = "[VV_TAGGED_DATUM] #[i]: [iter_tagged_datum.type])"
+				tagstrings[new_tagstring] = iter_tagged_datum
+				classes += new_tagstring
+
 		if(restricted_classes)
 			classes -= restricted_classes
 
@@ -87,6 +96,11 @@
 		if(holder && holder.marked_datum && .["class"] == markstring)
 			.["class"] = VV_MARKED_DATUM
 
+		if(holder && tagstrings[.["class"]])
+			var/datum/chosen_datum = tagstrings[.["class"]]
+			.["value"] = chosen_datum
+			.["class"] = VV_TAGGED_DATUM
+
 	switch(.["class"])
 		if(VV_TEXT)
 			.["value"] = input("Enter new text:", "Text", current_value) as null|text
@@ -202,6 +216,11 @@
 				.["class"] = null
 				return
 
+		if(VV_TAGGED_DATUM)
+			if(.["value"] == null)
+				.["class"] = null
+				return
+
 		if(VV_PROCCALL_RETVAL)
 			var/list/get_retval = list()
 			callproc_blocking(get_retval)

code/modules/admin/view_variables/mass_edit_variables.dm

@@ -29,7 +29,7 @@
 		for (var/V in O.vars)
 			names += V
 
-		names = sortList(names)
+		names = sort_list(names)
 
 		variable = input("Which var?", "Var") as null|anything in names
 	else

code/modules/admin/view_variables/modify_variables.dm

@@ -306,7 +306,7 @@ GLOBAL_PROTECT(VVpixelmovement)
 		for (var/V in O.vars)
 			names += V
 
-		names = sortList(names)
+		names = sort_list(names)
 
 		variable = input("Which var?","Var") as null|anything in names
 		if(!variable)

code/modules/admin/view_variables/tag_datum.dm

@@ -0,0 +1,18 @@
+/client/proc/tag_datum(datum/target_datum)
+	if(!holder || QDELETED(target_datum))
+		return
+	holder.add_tagged_datum(target_datum)
+
+/client/proc/toggle_tag_datum(datum/target_datum)
+	if(!holder || !target_datum)
+		return
+
+	if(LAZYFIND(holder.tagged_datums, target_datum))
+		holder.remove_tagged_datum(target_datum)
+	else
+		holder.add_tagged_datum(target_datum)
+
+/client/proc/tag_datum_mapview(datum/target_datum as mob|obj|turf|area in view(view))
+	set category = "Debug"
+	set name = "Tag Datum"
+	tag_datum(target_datum)

code/modules/admin/view_variables/topic_basic.dm

@@ -59,15 +59,17 @@
 
 	if(href_list[VV_HK_MARK])
 		usr.client.mark_datum(target)
+	if(href_list[VV_HK_TAG])
+		usr.client.tag_datum(target)
 	if(href_list[VV_HK_ADDCOMPONENT])
 		if(!check_rights(NONE))
 			return
 		var/list/names = list()
-		var/list/componentsubtypes = sortList(subtypesof(/datum/component), GLOBAL_PROC_REF(cmp_typepaths_asc))
+		var/list/componentsubtypes = sort_list(subtypesof(/datum/component), GLOBAL_PROC_REF(cmp_typepaths_asc))
 		names += "---Components---"
 		names += componentsubtypes
 		names += "---Elements---"
-		names += sortList(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc))
+		names += sort_list(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc))
 		var/result = input(usr, "Choose a component/element to add","better know what ur fuckin doin pal") as null|anything in names
 		if(!usr || !result || result == "---Components---" || result == "---Elements---")
 			return

code/modules/admin/view_variables/view_variables.dm

@@ -88,7 +88,7 @@
 				value = L[key]
 			variable_html += debug_variable(i, value, 0, L)
 	else
-		names = sortList(names)
+		names = sort_list(names)
 		for(var/V in names)
 			if(D.can_vv_get(V))
 				variable_html += D.vv_get_var(V)