Forensics re-destroyed, but better this time.

All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
This commit is contained in:
Poojawa
2019-08-17 02:43:59 -05:00
parent 8bd54bcc54
commit 088bc484e3
29 changed files with 288 additions and 439 deletions
@@ -81,7 +81,8 @@
add_blood = bloodiness
bloodiness -= add_blood
S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS,S.bloody_shoes[blood_state]+add_blood)
S.add_blood_DNA(return_blood_DNA())
if(blood_DNA && blood_DNA.len)
S.add_blood_DNA(blood_DNA)
S.blood_state = blood_state
update_icon()
H.update_inv_shoes()
@@ -35,7 +35,7 @@
if(infective)
diseases = infective.diseases
var/obj/effect/decal/cleanable/blood/splatter/xeno/splat = new /obj/effect/decal/cleanable/blood/splatter/xeno(loc, diseases)
splat.add_blood_DNA(return_blood_DNA())
splat.transfer_blood_dna(blood_DNA)
if(!step_to(src, get_step(src, direction), 0))
break
@@ -21,9 +21,6 @@
/obj/effect/decal/cleanable/blood/gibs/update_icon()
GET_COMPONENT(D, /datum/component/forensics)
if(D)
Blood_DNA = D.blood_DNA
add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
cut_overlays()
var/mutable_appearance/guts = mutable_appearance(icon, "[icon_state]_guts")
@@ -60,7 +57,7 @@
if(infective)
diseases = infective.diseases
var/obj/effect/decal/cleanable/blood/splatter/splat = new /obj/effect/decal/cleanable/blood/splatter(loc, diseases)
splat.add_blood_DNA(return_blood_DNA())
splat.transfer_blood_dna(blood_DNA)
if(!step_to(src, get_step(src, direction), 0))
break
@@ -7,12 +7,10 @@
blood_state = BLOOD_STATE_BLOOD
bloodiness = MAX_SHOE_BLOODINESS
color = BLOOD_COLOR_HUMAN //default so we don't have white splotches everywhere.
var/list/Blood_DNA = list()
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
C.add_blood_DNA(return_blood_DNA())
if(C.Blood_DNA.len)
Blood_DNA |= C.Blood_DNA.Copy()
if (C.blood_DNA)
blood_DNA |= C.blood_DNA.Copy()
if (bloodiness)
if (C.bloodiness < MAX_SHOE_BLOODINESS)
C.bloodiness += bloodiness
@@ -28,9 +26,6 @@
update_icon()
/obj/effect/decal/cleanable/blood/update_icon()
GET_COMPONENT(D, /datum/component/forensics)
if(D)
Blood_DNA = D.blood_DNA
color = blood_DNA_to_color()
/obj/effect/decal/cleanable/blood/old
+3 -3
View File
@@ -389,9 +389,9 @@
. = ..()
/obj/item/stack/proc/copy_evidences(obj/item/stack/from)
add_blood_DNA(from.return_blood_DNA())
add_fingerprint_list(from.return_fingerprints())
add_hiddenprint_list(from.return_hiddenprints())
blood_DNA = from.blood_DNA
fingerprints = from.fingerprints
fingerprintshidden = from.fingerprintshidden
fingerprintslast = from.fingerprintslast
//TODO bloody overlay