cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor forensic additions (#12842)

Browse Source 
* makes forensic equipment only be put in bags on help intent

* Updates description of some forensic equipment

* changelog typo fix

* updates swab kits

* Adds a suggestion

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/modules/detectivework/tools/sample_kits.dm

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
This commit is contained in:
Casper3667
2021-12-20 21:35:23 +01:00
committed by GitHub
co-authored by Wowzewow TGW Werner
parent 068eebf6eb
commit c700d6b140
6 changed files with 79 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/tools/evidencebag.dm
+1
View File
@@ -3,6 +3,7 @@
/obj/item/evidencebag
name = "evidence bag"
desc = "An empty evidence bag."
desc_info = "Click drag this onto an object to put it inside. Click it in-hand to remove an object from it."
icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
item_state = ""
code/modules/detectivework/tools/sample_kits.dm
+19 -9
View File
@@ -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 [initial(supplied.name)] into \the [src].</span>")
to_chat(user, SPAN_NOTICE("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, "<span class='notice'>You overlay \the [src] and \the [initial(supplied.name)], combining the print records.</span>")
to_chat(user, SPAN_NOTICE("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)
@@ -51,11 +51,15 @@
/obj/item/sample/fibers
name = "fiber bag"
desc = "Used to hold fiber evidence for the detective."
desc_info = "Holds various fibre evidence. Place it in a slide and the slide into a microscope to check them."
icon_state = "fiberbag"
/obj/item/sample/print
name = "fingerprint card"
desc = "Records a set of fingerprints."
desc_info = "A sample card for fingerprints. Risks putting your own prints on it if touched without gloves.\
\nPlace the card in a microscope to examine the contents. \
\nUse in hand to put your prints on it.\nTarget hands and click another creature to take their prints."
icon = 'icons/obj/card.dmi'
icon_state = "fingerprint0"
item_state = "paper"
@@ -67,10 +71,10 @@
return
var/mob/living/carbon/human/H = user
if(H.gloves)
to_chat(user, "<span class='warning'>Take \the [H.gloves] off first.</span>")
to_chat(user, SPAN_WARNING("Take \the [H.gloves] off first."))
return
to_chat(user, "<span class='notice'>You firmly press your fingertips onto the card.</span>")
to_chat(user, SPAN_NOTICE("You firmly press your fingertips onto the card."))
var/fullprint = H.get_full_print()
evidence[fullprint] = fullprint
name = "[initial(name)] (\the [H])"
@@ -87,11 +91,11 @@
var/mob/living/carbon/human/H = M
if(H.gloves)
to_chat(user, "<span class='warning'>\The [H] is wearing gloves.</span>")
to_chat(user, SPAN_WARNING("\The [H] is wearing gloves."))
return 1
if(user != H && H.a_intent != "help" && !H.lying)
user.visible_message("<span class='danger'>\The [user] tries to take prints from \the [H], but they move away.</span>")
user.visible_message(SPAN_DANGER("\The [user] tries to take prints from \the [H], but they move away."))
return 1
if(target_zone == BP_R_HAND || target_zone == BP_L_HAND)
@@ -104,7 +108,7 @@
if(istype(O) && !O.is_stump())
has_hand = 1
if(!has_hand)
to_chat(user, "<span class='warning'>They don't have any hands.</span>")
to_chat(user, SPAN_WARNING("They don't have any hands."))
return 1
user.visible_message("[user] takes a copy of \the [H]'s fingerprints.")
var/fullprint = H.get_full_print()
@@ -124,6 +128,7 @@
/obj/item/forensics/sample_kit
name = "fiber collection kit"
desc = "A magnifying glass and tweezers. Used to lift suit fibers."
desc_info = "Click drag it on to an object to collect evidence. Alternatively click on non-help intent."
icon_state = "m_glass"
w_class = ITEMSIZE_SMALL
flags = NOBLUDGEON
@@ -135,7 +140,7 @@
/obj/item/forensics/sample_kit/proc/take_sample(var/mob/user, var/atom/supplied)
var/obj/item/sample/S = new evidence_path(get_turf(user), supplied)
to_chat(user, "<span class='notice'>You transfer [S.evidence.len] [evidence_type]\s to \the [S].</span>")
to_chat(user, SPAN_NOTICE("You transfer [S.evidence.len] [evidence_type]\s to \the [S]."))
/obj/item/forensics/sample_kit/afterattack(var/atom/A, var/mob/user, var/proximity)
if(!proximity)
@@ -145,9 +150,14 @@
take_sample(user,A)
return 1
else
to_chat(user, "<span class='warning'>You are unable to locate any [evidence_type]s on \the [A].</span>")
to_chat(user, SPAN_WARNING("You are unable to locate any [evidence_type]s on \the [A]."))
return ..()
/obj/item/forensics/sample_kit/resolve_attackby(atom/A, mob/user, var/click_parameters)
if(user.a_intent != I_HELP)
return FALSE
. = ..()
/obj/item/forensics/sample_kit/MouseDrop(atom/over)
var/mob/M = loc
if(ismob(M) && (M.get_active_hand() == src || M.get_inactive_hand() == src))
code/modules/detectivework/tools/swabs.dm
+32 -15
View File
@@ -6,6 +6,13 @@
/obj/item/forensics/swab
name = "swab kit"
desc = "A sterilized cotton swab and vial used to take forensic samples."
desc_info = "Swab kits can be used to gather blood with DNA attached to it by clicking the blood. \
If it fails to collect a sample, it means that particular bit of blood has no associated DNA. \
\nThey can also collect DNA samples directly from people by targetting their mouth to take a saliva sample. \
\nGunshot Residue (GSR) can be collected from someones hands by targetting them. If they are wearing gloves, \
the residue will be taken from the gloves instead. \
\n\nGSR samples are put in a slide and examined in a microscope. \
\nBlood and DNA samples are checked in the DNA analyzer"
icon_state = "swab"
var/gsr = 0
var/list/dna
@@ -27,24 +34,23 @@
var/mob/living/carbon/human/H = M
var/sample_type
if(H.wear_mask)
to_chat(user, "<span class='warning'>\The [H] is wearing a mask.</span>")
return
if(!H.dna || !H.dna.unique_enzymes)
to_chat(user, "<span class='warning'>They don't seem to have DNA!</span>")
to_chat(user, SPAN_WARNING("They don't seem to have DNA!"))
return
if(user != H && H.a_intent != "help" && !H.lying)
user.visible_message("<span class='danger'>\The [user] tries to take a swab sample from \the [H], but they move away.</span>")
user.visible_message(SPAN_DANGER("\The [user] tries to take a swab sample from \the [H], but they move away."))
return
if(target_zone == BP_MOUTH)
if(!H.organs_by_name[BP_HEAD])
to_chat(user, "<span class='warning'>They don't have a head.</span>")
to_chat(user, SPAN_WARNING("They don't have a head."))
return
if(!H.check_has_mouth())
to_chat(user, "<span class='warning'>They don't have a mouth.</span>")
to_chat(user, SPAN_WARNING("They don't have a mouth."))
return
if(H.wear_mask)
to_chat(user, SPAN_WARNING("\The [H] is wearing a mask."))
return
user.visible_message("[user] swabs \the [H]'s mouth for a saliva sample.")
dna = list(H.dna.unique_enzymes)
@@ -60,11 +66,22 @@
if(istype(O) && !O.is_stump())
has_hand = 1
if(!has_hand)
to_chat(user, "<span class='warning'>They don't have any hands.</span>")
to_chat(user, SPAN_WARNING("They don't have any hands."))
return
user.visible_message("[user] swabs [H]'s palm for a sample.")
if(H.gloves)
var/obj/item/clothing/B = H.gloves
if(!B.gunshot_residue)
to_chat(user, SPAN_WARNING("There is no residue on [H]'s [B]."))
return
user.visible_message("[user] swabs [H]'s [B] for a sample.")
gsr = B.gunshot_residue
else
if(!H.gunshot_residue)
to_chat(user, SPAN_WARNING("There is no residue on [H]'s palms."))
return
user.visible_message("[user] swabs [H]'s palm for a sample.")
gsr = H.gunshot_residue
sample_type = "GSR"
gsr = H.gunshot_residue
else
return
@@ -75,11 +92,11 @@
/obj/item/forensics/swab/afterattack(var/atom/A, var/mob/user, var/proximity)
if(!proximity || istype(A, /obj/item/forensics/slide) || istype(A, /obj/machinery/dnaforensics))
if(!proximity || istype(A, /obj/item/forensics/slide) || istype(A, /obj/machinery/dnaforensics) || ismob(A) || istype(A, /obj/structure/filingcabinet))
return
if(is_used())
to_chat(user, "<span class='warning'>This swab has already been used.</span>")
to_chat(user, SPAN_WARNING("This swab has already been used."))
return
add_fingerprint(user)
@@ -97,7 +114,7 @@
var/choice
if(!choices.len)
to_chat(user, "<span class='warning'>There is no evidence on \the [A].</span>")
to_chat(user, SPAN_WARNING("There is no evidence on \the [A]."))
return
else if(choices.len == 1)
choice = choices[1]
@@ -118,7 +135,7 @@
if (EVIDENCE_TYPE_GSR)
var/obj/item/clothing/B = A
if(!istype(B) || !B.gunshot_residue)
to_chat(user, "<span class='warning'>There is no residue on \the [A].</span>")
to_chat(user, SPAN_WARNING("There is no residue on \the [A]."))
return
gsr = B.gunshot_residue
sample_type = "residue"