cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/MultiZ.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
CaelAislinn
2012-02-06 02:51:49 +10:00
parent 9e4539fdce b2120f22e9
commit b1c66d2342
27 changed files with 153 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/detective_work.dm
+6 -3
View File
@@ -714,8 +714,11 @@ turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info)
this.dir = d
this.desc = "These bloody footprints appear to have been made by [info]."
if(istype(M,/mob/living/carbon/human))
this.blood_DNA.len++
this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.b_type)
if(this.blood_DNA.len)
this.blood_DNA.len++
this.blood_DNA[this.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
else
this.blood_DNA = list(list(M.dna.unique_enzymes,M.dna.b_type))
proc/get_tracks(mob/M)
if(istype(M,/mob/living))
@@ -754,7 +757,7 @@ proc/blood_incompatible(donor,receiver)
afterattack(atom/A as obj|turf|area, mob/user as mob)
if(istype(A))
user.visible_message("[user] starts to wipe the prints off of [A] with \the [src]!")
user.visible_message("[user] starts to wipe the prints and blood off of [A] with \the [src]!")
if(do_after(user,30))
user.visible_message("[user] finishes wiping away the evidence!")
A.clean_blood()