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

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

Browse Source
This commit is contained in:
caelaislinn
2012-06-14 22:52:33 +10:00
parent 3f19d356d6 a278b7c29f
commit 16eabd55ea
10 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/DetectiveWork/detective_work.dm
+9 -9
View File
@@ -513,10 +513,10 @@ obj/machinery/computer/forensic_scanning
prints[print] = atom_fingerprints[print]
else
var/list/templist[4]
templist[1] = atom_suit_fibers
templist[2] = atom_blood_DNA
templist[1] = atom_suit_fibers.Copy()
templist[2] = atom_blood_DNA.Copy()
templist[3] = atom_name
templist[4] = atom_fingerprints
templist[4] = atom_fingerprints.Copy()
misc[atom_reference] = templist //Store it!
//Has prints.
if(atom_fingerprints)
@@ -560,17 +560,17 @@ obj/machinery/computer/forensic_scanning
//It's not in there! We gotta add it.
update_fingerprints(main_print, atom_fingerprints[main_print])
var/list/data_point[4]
data_point[1] = atom_fingerprints
data_point[2] = atom_suit_fibers
data_point[3] = atom_blood_DNA
data_point[1] = atom_fingerprints.Copy()
data_point[2] = atom_suit_fibers.Copy()
data_point[3] = atom_blood_DNA.Copy()
data_point[4] = atom_name
data_entry[atom_reference] = data_point
continue
//No print at all! New data entry, go!
var/list/data_point[4]
data_point[1] = atom_fingerprints
data_point[2] = atom_suit_fibers
data_point[3] = atom_blood_DNA
data_point[1] = atom_fingerprints.Copy()
data_point[2] = atom_suit_fibers.Copy()
data_point[3] = atom_blood_DNA.Copy()
data_point[4] = atom_name
var/list/new_file[2]
new_file[1] = atom_fingerprints[main_print]
code/modules/DetectiveWork/scanner.dm
+3 -3
View File
@@ -164,9 +164,9 @@
blood[main_blood] = A.blood_DNA[blood]
return 1
var/list/sum_list[4] //Pack it back up!
sum_list[1] = A.fingerprints
sum_list[2] = A.suit_fibers
sum_list[3] = A.blood_DNA
sum_list[1] = A.fingerprints.Copy()
sum_list[2] = A.suit_fibers.Copy()
sum_list[3] = A.blood_DNA.Copy()
sum_list[4] = "\The [A] in \the [get_area(A)]"
stored["\ref [A]"] = sum_list
return 0
code/modules/mob/death.dm
+2
View File
@@ -47,6 +47,8 @@
/mob/proc/death(gibbed)
timeofdeath = world.time
var/log_file = file("[time2text(world.timeofday, "statistics/DD-MM-YYYY.txt")]")
log_file << "Death | \The [get_area(src)] | [bruteloss], [oxyloss], [toxloss], [fireloss][attack_log && attack_log.len? " | attack_log[attack_log.len]" : ""]"
if(client)
client.onDeath()