diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm
index 22a44f8e94c..d7c5272d4f2 100644
--- a/code/modules/detectivework/forensics.dm
+++ b/code/modules/detectivework/forensics.dm
@@ -25,17 +25,17 @@ atom/proc/add_fibers(mob/living/carbon/human/M)
var/item_multiplier = istype(src,/obj/item)?1.2:1
var/suit_coverage = 0
if(M.wear_suit)
- fibertext = "Material from \a [M.wear_suit]."
+ fibertext = "Material from \a [initial(M.wear_suit.name)]."
if(prob(10*item_multiplier) && !(fibertext in suit_fibers))
suit_fibers += fibertext
suit_coverage = M.wear_suit.body_parts_covered
if(M.w_uniform && (M.w_uniform.body_parts_covered & ~suit_coverage))
- fibertext = "Fibers from \a [M.w_uniform]."
+ fibertext = "Fibers from \a [initial(M.w_uniform.name)]."
if(prob(15*item_multiplier) && !(fibertext in suit_fibers))
suit_fibers += fibertext
if(M.gloves && (M.gloves.body_parts_covered & ~suit_coverage))
- fibertext = "Material from a pair of [M.gloves.name]."
+ fibertext = "Material from a pair of [initial(M.gloves.name)]."
if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
- suit_fibers += "Material from a pair of [M.gloves.name]."
+ suit_fibers += fibertext
diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm
index 45ae4cf57d5..0fc10dcc9ae 100644
--- a/code/modules/detectivework/microscope/microscope.dm
+++ b/code/modules/detectivework/microscope/microscope.dm
@@ -58,8 +58,8 @@
else if(slide.has_sample)
var/obj/item/sample/fibers/fibers = slide.has_sample
- pname = "Fiber report #[++report_num]: [fibers.name]"
- info = "Scanned item:
[fibers.name]
"
+ pname = "Fiber report #[++report_num]: [initial(fibers.name)]"
+ info = "Scanned item:
[initial(fibers.name)]
"
if(fibers.evidence)
info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.
"
for(var/fiber in fibers.evidence)
diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm
index b842cc377f9..7e1b1ea952a 100644
--- a/code/modules/detectivework/tools/sample_kits.dm
+++ b/code/modules/detectivework/tools/sample_kits.dm
@@ -8,7 +8,7 @@
..(newloc)
if(supplied)
copy_evidence(supplied)
- name = "[initial(name)] (\the [supplied])"
+ name = "[initial(name)] (\the [initial(supplied.name)])"
/obj/item/sample/print/New(var/newloc, var/atom/supplied)
..(newloc, supplied)
@@ -25,7 +25,7 @@
return 0
evidence |= supplied.evidence
name = "[initial(name)] (combined)"
- to_chat(user, "You transfer the contents of \the [supplied] into \the [src].")
+ to_chat(user, "You transfer the contents of \the [initial(supplied.name)] into \the [src].")
return 1
/obj/item/sample/print/merge_evidence(var/obj/item/sample/supplied, var/mob/user)
@@ -37,7 +37,7 @@
else
evidence[print] = supplied.evidence[print]
name = "[initial(name)] (combined)"
- to_chat(user, "You overlay \the [src] and \the [supplied], combining the print records.")
+ to_chat(user, "You overlay \the [src] and \the [initial(supplied.name)], combining the print records.")
return 1
/obj/item/sample/attackby(var/obj/O, var/mob/user)
diff --git a/html/changelogs/johnwildkins-fibers.yml b/html/changelogs/johnwildkins-fibers.yml
new file mode 100644
index 00000000000..51f0becffc4
--- /dev/null
+++ b/html/changelogs/johnwildkins-fibers.yml
@@ -0,0 +1,6 @@
+author: JohnWildkins
+
+delete-after: True
+
+changes:
+ - bugfix: "Labels on an item no longer transfer their labeled name to collected clothing fibers."