cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Forensics Datum (#11015)

Browse Source 
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:
CHOMPStation2StaffMirrorBot
2025-06-06 16:18:13 +02:00
committed by GitHub
co-authored by Will Kashargul
parent 887639ef5c
commit d7cd22d2d0
69 changed files with 614 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
+4 -3
View File
@@ -468,11 +468,12 @@ var/const/CE_STABLE_THRESHOLD = 0.5
// Update blood information.
if(source.data["blood_DNA"])
B.blood_DNA = list()
var/list/new_data = list()
if(source.data["blood_type"])
B.blood_DNA[source.data["blood_DNA"]] = source.data["blood_type"]
new_data[source.data["blood_DNA"]] = source.data["blood_type"]
else
B.blood_DNA[source.data["blood_DNA"]] = "O+"
new_data[source.data["blood_DNA"]] = "O+"
B.init_forensic_data().merge_blooddna(null,new_data)
// Update virus information.
if(source.data["viruses"])
code/modules/organs/data.dm
+1
View File
@@ -27,6 +27,7 @@
self_clear = TRUE
// Setup cached dna data, as storing the entire DNA cloned is horrifically laggy
b_type = dna.b_type
unique_enzymes = dna.unique_enzymes
body_gender = dna.GetUIState(DNA_UI_GENDER)
if(!isnull(dna.GetUIValue(DNA_UI_SKIN_TONE)))
code/modules/organs/organ.dm
+5 -10
View File
@@ -105,9 +105,7 @@ var/list/organ_cache = list()
E.internal_organs = list()
E.internal_organs |= src
if(data)
if(!blood_DNA)
blood_DNA = list()
blood_DNA[data.unique_enzymes] = data.b_type
add_blooddna_organ(data)
else
data.setup_from_species(GLOB.all_species["Human"])
@@ -131,9 +129,8 @@ var/list/organ_cache = list()
/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
if(new_dna)
data.setup_from_dna(new_dna)
if(blood_DNA)
blood_DNA.Cut()
blood_DNA[data.unique_enzymes] = data.b_type
forensic_data?.clear_blooddna()
add_blooddna_organ(data)
/obj/item/organ/proc/die()
if(robotic < ORGAN_ROBOT)
@@ -460,10 +457,8 @@ var/list/organ_cache = list()
// Pass over the blood.
reagents.trans_to(O, reagents.total_volume)
if(fingerprints) O.fingerprints = fingerprints.Copy()
if(fingerprintshidden) O.fingerprintshidden = fingerprintshidden.Copy()
if(fingerprintslast) O.fingerprintslast = fingerprintslast
transfer_fingerprints_to(O)
transfer_blooddna_to(O)
user.put_in_active_hand(O)
qdel(src)