cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1147 (#10301)

Browse Source
This commit is contained in:
JohnWildkins
2020-10-20 03:00:11 -04:00
committed by GitHub
parent b9a882953e
commit a2f48dff8b
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/forensics.dm
+4 -4
View File
@@ -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
code/modules/detectivework/microscope/microscope.dm
+2 -2
View File
@@ -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 = "<b>Scanned item:</b><br>[fibers.name]<br><br>"
pname = "Fiber report #[++report_num]: [initial(fibers.name)]"
info = "<b>Scanned item:</b><br>[initial(fibers.name)]<br><br>"
if(fibers.evidence)
info = "Molecular analysis on provided sample has determined the presence of unique fiber strings.<br><br>"
for(var/fiber in fibers.evidence)
code/modules/detectivework/tools/sample_kits.dm
+3 -3
View File
@@ -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, "<span class='notice'>You transfer the contents of \the [supplied] into \the [src].</span>")
to_chat(user, "<span class='notice'>You transfer the contents of \the [initial(supplied.name)] into \the [src].</span>")
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, "<span class='notice'>You overlay \the [src] and \the [supplied], combining the print records.</span>")
to_chat(user, "<span class='notice'>You overlay \the [src] and \the [initial(supplied.name)], combining the print records.</span>")
return 1
/obj/item/sample/attackby(var/obj/O, var/mob/user)