diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 3defb0ae007..763e2df0802 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -45,8 +45,17 @@
if(istype(w_uniform,/obj/item/clothing/under))
var/obj/item/clothing/under/U = w_uniform
if(LAZYLEN(U.accessories))
- tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]"
- tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]"
+ tie_msg += ". Attached to it is"
+ tie_msg_warn += "! Attached to it is"
+ var/list/accessory_descs = list()
+ for(var/accessory in U.accessories)
+ if(istype(accessory, /obj/item/clothing/accessory/holster)) //so you can't see what kind of gun a holster is holding from afar
+ accessory_descs += "\a [accessory]"
+ else
+ accessory_descs += "\a [accessory]"
+
+ tie_msg += " [lowertext(english_list(accessory_descs))]"
+ tie_msg_warn += " [lowertext(english_list(accessory_descs))]"
if(w_uniform.blood_color)
msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] [fluid_color_type_map(w_uniform.blood_color)]-stained [w_uniform.name][tie_msg_warn].\n"
@@ -71,8 +80,14 @@
if(istype(wear_suit,/obj/item/clothing/suit))
var/obj/item/clothing/suit/U = wear_suit
if(LAZYLEN(U.accessories))
- tie_msg += ". Attached to it is [lowertext(english_list(U.accessories))]"
- tie_msg_warn += "! Attached to it is [lowertext(english_list(U.accessories))]"
+ tie_msg += ". Attached to it is"
+ tie_msg_warn += "! Attached to it is"
+ var/list/accessory_descs = list()
+ for(var/accessory in U.accessories)
+ accessory_descs += "\a [accessory]"
+
+ tie_msg += " [lowertext(english_list(accessory_descs))]"
+ tie_msg_warn += " [lowertext(english_list(accessory_descs))]"
if(wear_suit.blood_color)
msg += "[get_pronoun("He")] [get_pronoun("is")] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] [fluid_color_type_map(wear_suit.blood_color)]-stained [wear_suit.name][tie_msg_warn].\n"
diff --git a/html/changelogs/Ferner-201220-coding_examineaccessories.yml b/html/changelogs/Ferner-201220-coding_examineaccessories.yml
new file mode 100644
index 00000000000..bffbe1b31d6
--- /dev/null
+++ b/html/changelogs/Ferner-201220-coding_examineaccessories.yml
@@ -0,0 +1,4 @@
+author: Ferner
+delete-after: True
+changes:
+ - tweak: "You can now also examine a person's accessories individually when you examine someone."
\ No newline at end of file