Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-15-10-2025

code/modules/wiremod/core/marker.dm

@@ -70,6 +70,10 @@
 	mob_choice.name = target.name
 	selectable_targets[REF(target)] = mob_choice
 	for(var/obj/item/item as anything in visible_items)
+		//no revealing items that are not obscured but meant to be hidden
+		if(HAS_TRAIT(item, TRAIT_NO_STRIP) || HAS_TRAIT(item, TRAIT_EXAMINE_SKIP))
+			continue
+
 		var/datum/radial_menu_choice/item_choice = new
 
 		var/mutable_appearance/item_appearance = new(item)

code/modules/wiremod/dcs_components/component_boris_circuit_container.dm

@@ -34,7 +34,7 @@
 	var/obj/item/circuit_component/mmi/source_comp = locate(source)
 	if(!istype(source_comp))
 		return COMPONENT_INCOMPATIBLE
-	LAZYADD(mmi_components, source)
+	LAZYADD(mmi_components, source_comp)
 
 /datum/component/boris_circuit_container/on_source_remove(source)
 	var/obj/item/circuit_component/mmi/source_comp = locate(source)