Refinements

Author: Oblisk234

code/modules/clothing/chameleon.dm

@@ -102,15 +102,15 @@
 /datum/action/chameleon_outfit/proc/select_outfit(mob/user)
 	if(!user || !IsAvailable(feedback = FALSE))
 		return FALSE
-	var/datum/outfit/O
 	var/selected = tgui_input_list(user, "Select outfit to change into", "Chameleon Outfit", outfit_options)
 	if(!IsAvailable(feedback = FALSE) || QDELETED(src) || QDELETED(user))
 		return FALSE
 	var/outfit_type = outfit_options[selected]
 	if(!outfit_type)
 		return FALSE
-	O = new outfit_type()
+	var/datum/outfit/O = new outfit_type()
 	var/list/outfit_types = O.get_chameleon_disguise_info()
+
 	for(var/V in user.chameleon_item_actions)
 		var/datum/action/item_action/chameleon/change/A = V
 		var/done = FALSE
@@ -214,7 +214,8 @@
 	for(var/Y in types)
 		for(var/V in owner.chameleon_item_actions)
 			var/datum/action/item_action/chameleon/change/A = V
-			if(A.chameleon_blacklist[Y])
+			var/obj/item/I = Y
+			if(A.chameleon_blacklist[Y] || (initial(I.item_flags) & ABSTRACT || !initial(I.icon_state)))
 				continue
 			if(istype(Y, A.chameleon_type)) //Need to make sure it's the right type, wouldn't want to wear an armour vest on your head.
 				A.update_look(owner, Y)

yogstation/code/modules/antagonists/infiltrator/objectives.dm

@@ -166,15 +166,17 @@ GLOBAL_LIST_INIT(infiltrator_kidnap_areas, typecacheof(list(/area/shuttle/yogs/s
 		if(!considered_escaped(M))
 			continue
 		var/mob/living/carbon/human/H = M.current
+		var/mob/living/carbon/human/T = target.current
 		var/clothing = H.chameleon_item_actions.len //8 possible clothes: Head, suit, ears, glasses, uniform, shoes, gloves, backpack
 		var/copied = TRUE
 		for(var/datum/action/item_action/chameleon/change/V in H.chameleon_item_actions)
 			if(!V.copying)
 				clothing -= 1
-			if(V.copy_target != target)
+			if(V.copy_target != T)
 				clothing -= 1
 			if(clothing<3) //Some leniency if you don't have the required clothes or your target isn't wearing many, but not complete leniency
 				copied = FALSE
+				break
 		if(!copied)
 			continue
 		if(H.get_id_name() == target_real_name || target_missing_id)