Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/modules/admin/verbs/admingame.dm

@@ -368,15 +368,17 @@ ADMIN_VERB(combo_hud, R_ADMIN, "Toggle Combo HUD", "Toggles the Admin Combo HUD.
 	log_admin("[key_name(user)] toggled their admin combo HUD [user.combo_hud_enabled ? "ON" : "OFF"].")
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Combo HUD", "[user.combo_hud_enabled ? "Enabled" : "Disabled"]")) // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
 
+/// List of hud traits in the admin combo hud
+#define ADMIN_HUDS list(TRAIT_SECURITY_HUD, TRAIT_MEDICAL_HUD, TRAIT_DIAGNOSTIC_HUD, TRAIT_BOT_PATH_HUD)
+
 /client/proc/enable_combo_hud()
 	if (combo_hud_enabled)
 		return
 
 	combo_hud_enabled = TRUE
 
-	for (var/hudtype in list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC, DATA_HUD_BOT_PATH))
-		var/datum/atom_hud/atom_hud = GLOB.huds[hudtype]
-		atom_hud.show_to(mob)
+	for (var/hudtrait in ADMIN_HUDS)
+		ADD_TRAIT(mob, hudtrait, ADMIN_TRAIT)
 
 	for (var/datum/atom_hud/alternate_appearance/basic/antagonist_hud/antag_hud in GLOB.active_alternate_appearances)
 		antag_hud.show_to(mob)
@@ -390,9 +392,8 @@ ADMIN_VERB(combo_hud, R_ADMIN, "Toggle Combo HUD", "Toggles the Admin Combo HUD.
 
 	combo_hud_enabled = FALSE
 
-	for (var/hudtype in list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC, DATA_HUD_BOT_PATH))
-		var/datum/atom_hud/atom_hud = GLOB.huds[hudtype]
-		atom_hud.hide_from(mob)
+	for (var/hudtrait in ADMIN_HUDS)
+		REMOVE_TRAIT(mob, hudtrait, ADMIN_TRAIT)
 
 	for (var/datum/atom_hud/alternate_appearance/basic/antagonist_hud/antag_hud in GLOB.active_alternate_appearances)
 		antag_hud.hide_from(mob)
@@ -400,6 +401,8 @@ ADMIN_VERB(combo_hud, R_ADMIN, "Toggle Combo HUD", "Toggles the Admin Combo HUD.
 	mob.lighting_cutoff = mob.default_lighting_cutoff()
 	mob.update_sight()
 
+#undef ADMIN_HUDS
+
 ADMIN_VERB(show_traitor_panel, R_ADMIN, "Show Traitor Panel", "Edit mobs's memory and role", ADMIN_CATEGORY_GAME, mob/target_mob)
 	var/datum/mind/target_mind = target_mob.mind
 	if(!target_mind)

code/modules/admin/verbs/plane_debugger.dm

@@ -154,14 +154,12 @@
 			this_relay["blend_mode"] = GLOB.blend_names["[relay.blend_mode]"]
 			relays += list(this_relay)
 
-		for (var/filter_id in plane.filter_data)
-			var/list/filter = plane.filter_data[filter_id]
+		for (var/list/filter in plane.filter_data)
 			if(!filter["render_source"])
 				continue
 
 			var/list/filter_info = filter.Copy()
-			filter_info["name"] = filter_id
-			filter_info["our_ref"] = "[plane.plane]-[filter_id]"
+			filter_info["our_ref"] = "[plane.plane]-[filter_info["name"]]"
 			filters += list(filter_info)
 
 		this_plane["relays"] = relays

code/modules/admin/view_variables/filterrific.dm

@@ -32,7 +32,7 @@
 	switch(action)
 		if("add_filter")
 			var/target_name = params["name"]
-			while(target.filter_data && target.filter_data[target_name])
+			while(target.get_filter(target_name))
 				target_name = "[target_name]-dupe"
 			target.add_filter(target_name, params["priority"], list("type" = params["type"]))
 			. = TRUE
@@ -40,9 +40,9 @@
 			target.remove_filter(params["name"])
 			. = TRUE
 		if("rename_filter")
-			var/list/filter_data = target.filter_data[params["name"]]
+			var/list/filter_info = target.get_filter_data(params["name"])
 			target.remove_filter(params["name"])
-			target.add_filter(params["new_name"], filter_data["priority"], filter_data)
+			target.add_filter(params["new_name"], filter_data["priority"], filter_info)
 			. = TRUE
 		if("edit_filter")
 			target.remove_filter(params["name"])
@@ -56,15 +56,7 @@
 			target.transition_filter(params["name"], params["new_data"], 4)
 			. = TRUE
 		if("modify_filter_value")
-			var/list/old_filter_data = target.filter_data[params["name"]]
-			var/list/new_filter_data = old_filter_data.Copy()
-			for(var/entry in params["new_data"])
-				new_filter_data[entry] = params["new_data"][entry]
-			for(var/entry in new_filter_data)
-				if(entry == GLOB.master_filter_info[old_filter_data["type"]]["defaults"][entry])
-					new_filter_data.Remove(entry)
-			target.remove_filter(params["name"])
-			target.add_filter(params["name"], old_filter_data["priority"], new_filter_data)
+			target.modify_filter(params["name"], params["new_data"])
 			. = TRUE
 		if("modify_color_value")
 			var/new_color = tgui_color_picker(usr, "Pick new filter color", "Filteriffic Colors!") // BUBBERSTATION EDIT: TGUI COLOR PICKER
@@ -83,15 +75,14 @@
 			var/target_path = text2path(params["path"])
 			if(!target_path)
 				return
-			var/filters_to_copy = target.filters
-			var/filter_data_to_copy = target.filter_data
+			var/list/filter_data_to_copy = target.filter_data
 			var/count = 0
-			for(var/thing in world.contents)
-				if(istype(thing, target_path))
-					var/atom/thing_at = thing
-					thing_at.filters = filters_to_copy
-					thing_at.filter_data = filter_data_to_copy
-					count += 1
+			for(var/atom/thing_at as anything in world.contents)
+				if(!istype(thing_at, target_path))
+					continue
+				thing_at.filter_data = filter_data_to_copy.Copy()
+				thing_at.update_filters()
+				count += 1
 			message_admins("LOCAL CLOWN [usr.ckey] JUST MASS FILTER EDITED [count] WITH PATH OF [params["path"]]!")
 			log_admin("LOCAL CLOWN [usr.ckey] JUST MASS FILTER EDITED [count] WITH PATH OF [params["path"]]!")