cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00: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 07:18:13 -07:00
committed by GitHub
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

9
code/game/objects/items/stacks/stack.dm
View File

@@ -334,11 +334,7 @@
S.add(transfer)
if (prob(transfer/orig_amount * 100))
transfer_fingerprints_to(S)
if(blood_DNA)
if(S.blood_DNA)
S.blood_DNA |= blood_DNA
else
S.blood_DNA = blood_DNA.Copy()
transfer_blooddna_to(S)
return transfer
return 0
@@ -361,8 +357,7 @@
newstack.color = color
if (prob(transfer/orig_amount * 100))
transfer_fingerprints_to(newstack)
if(blood_DNA)
newstack.blood_DNA |= blood_DNA
transfer_blooddna_to(newstack)
return newstack
return null

3
code/game/objects/items/stacks/stack_vr.dm
View File

@@ -6,8 +6,7 @@
if(pulledby)
pulledby.start_pulling(S)
transfer_fingerprints_to(S)
if(blood_DNA)
S.blood_DNA |= blood_DNA
S.init_forensic_data().merge_blooddna(forensic_data)
use(transfer)
S.add(transfer)