mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
[MIRROR] Forensics Datum (#11015)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
887639ef5c
commit
d7cd22d2d0
@@ -293,7 +293,7 @@ var/list/civilian_cartridges = list(
|
||||
status_signal.data["msg2"] = data2
|
||||
if(loc)
|
||||
var/obj/item/PDA = loc
|
||||
var/mob/user = PDA.fingerprintslast
|
||||
var/mob/user = PDA.forensic_data?.get_lastprint()
|
||||
log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
|
||||
message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]")
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
if("message")
|
||||
status_signal.data["msg1"] = data1
|
||||
status_signal.data["msg2"] = data2
|
||||
var/mob/user = pda.fingerprintslast
|
||||
var/mob/user = pda.forensic_data?.get_lastprint()
|
||||
if(isliving(pda.loc))
|
||||
user = pda.loc
|
||||
log_admin("STATUS: [user] set status screen with [pda]. Message: [data1] [data2]")
|
||||
|
||||
@@ -85,15 +85,14 @@
|
||||
scan_blood(A, user)
|
||||
|
||||
/datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user)
|
||||
if(!A.blood_DNA)
|
||||
var/list/blood_dna = A.forensic_data?.get_blooddna()
|
||||
if(!blood_dna)
|
||||
to_chat(user, span_notice("No blood found on [A]"))
|
||||
if(A.blood_DNA)
|
||||
qdel(A.blood_DNA)
|
||||
else
|
||||
to_chat(user, span_notice("Blood found on [A]. Analysing..."))
|
||||
spawn(15)
|
||||
for(var/blood in A.blood_DNA)
|
||||
to_chat(user, span_notice("Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"))
|
||||
for(var/blood in blood_dna)
|
||||
to_chat(user, span_notice("Blood type: [blood_dna[blood]]\nDNA: [blood]"))
|
||||
|
||||
/datum/data/pda/utility/scanmode/halogen
|
||||
base_name = "Halogen Counter"
|
||||
|
||||
Reference in New Issue
Block a user