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

Revert "More fingerprint fixes"

Browse Source 
This reverts commit c11502eb53 due to a bug where blood appears on objects when the blood_DNA variable is not null.
This commit is contained in:
Albert Iordache
2012-02-05 16:22:48 +02:00
parent e2e4f3d3aa
commit ec77e9da19
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/detective_work.dm
View File

@@ -718,9 +718,7 @@ turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info)
this.blood_DNA.len++ this.blood_DNA.len++
this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type) this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
else else
var/list/blood_DNA_temp[1] this.blood_DNA = list(list(M.dna.unique_enzymes,M.dna.b_type))
blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.dna.b_type)
this.blood_DNA = blood_DNA_temp
proc/get_tracks(mob/M) proc/get_tracks(mob/M)
if(istype(M,/mob/living)) if(istype(M,/mob/living))

2
code/defines/atom.dm
View File

@@ -5,7 +5,7 @@
var/list/fingerprints = list() var/list/fingerprints = list()
var/list/fingerprintshidden = new/list() var/list/fingerprintshidden = new/list()
var/fingerprintslast = null var/fingerprintslast = null
var/list/blood_DNA = list() var/list/blood_DNA = null
var/last_bumped = 0 var/last_bumped = 0
var/pass_flags = 0 var/pass_flags = 0

8
code/game/magic/cultist/ritual.dm
View File

@@ -559,9 +559,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
R.blood_DNA.len++ R.blood_DNA.len++
R.blood_DNA[R.blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type) R.blood_DNA[R.blood_DNA.len] = list(H.dna.unique_enzymes, H.dna.b_type)
else else
var/list/blood_DNA_temp[1] R.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type))
blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type)
R.blood_DNA = blood_DNA_temp
return return
else else
user << "The book seems full of illegible scribbles. Is this a joke?" user << "The book seems full of illegible scribbles. Is this a joke?"
@@ -606,9 +604,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
var/obj/effect/rune/R = new /obj/effect/rune var/obj/effect/rune/R = new /obj/effect/rune
if(istype(user, /mob/living/carbon/human)) if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
var/list/blood_DNA_temp[1] R.blood_DNA = list(list(H.dna.unique_enzymes, H.dna.b_type))
blood_DNA_temp[1] = list(H.dna.unique_enzymes, H.dna.b_type)
R.blood_DNA = blood_DNA_temp
switch(r) switch(r)
if("teleport") if("teleport")
var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri") var/list/words = list("ire", "ego", "nahlizet", "certum", "veri", "jatkaa", "balaq", "mgar", "karazet", "geeri")