Merge pull request #10097 from Ghommie/Ghommie-cit444

Made traitor kevlar/armor padding accessories examine-proof.
2020-01-19 16:58:27 -07:00
parent 92ead7e65d 2fe23b67db
commit 65eaf9787a
5 changed files with 21 additions and 14 deletions
@@ -41,7 +41,7 @@
 		var/accessory_msg
 		if(istype(w_uniform, /obj/item/clothing/under))
 			var/obj/item/clothing/under/U = w_uniform
-			if(U.attached_accessory)
+			if(U.attached_accessory && !(U.attached_accessory.flags_inv & HIDEACCESSORY) && !(U.flags_inv & HIDEACCESSORY))
 				accessory_msg += " with [icon2html(U.attached_accessory, user)] \a [U.attached_accessory]"

 		. += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg]."