cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes DNA Consoles Labeling DNA of Disfigured People "Unknown" (#19924)

Browse Source 
* DNA consoles will no longer label DNA based on the condition of the donor's face.

* DNA scanners now check the data core for DNA.
This commit is contained in:
Shadowmech88
2018-10-11 13:46:09 -05:00
committed by jknpj
parent 5c6102536d
commit a882425a82
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/defines/obj.dm
View File

@@ -53,6 +53,12 @@
return R return R
return null return null
/obj/effect/datacore/proc/find_record_by_dna(var/target_dna, var/list/which)
for (var/datum/data/record/E in which)
if (E.fields["b_dna"] == target_dna)
return E
return null
/obj/effect/datacore/proc/find_general_record_by_name(var/target_name) /obj/effect/datacore/proc/find_general_record_by_name(var/target_name)
for(var/datum/data/record/E in general) for(var/datum/data/record/E in general)
if(E.fields["name"] == target_name) if(E.fields["name"] == target_name)
@@ -62,6 +68,9 @@
/obj/effect/datacore/proc/find_medical_record_by_name(var/target_name) /obj/effect/datacore/proc/find_medical_record_by_name(var/target_name)
return find_record_by_name(target_name, medical) return find_record_by_name(target_name, medical)
/obj/effect/datacore/proc/find_medical_record_by_dna(var/target_dna)
return find_record_by_dna(target_dna, medical)
/obj/effect/datacore/proc/find_security_record_by_name(var/target_name) /obj/effect/datacore/proc/find_security_record_by_name(var/target_name)
return find_record_by_name(target_name, security) return find_record_by_name(target_name, security)

18
code/game/dna/dna_modifier.dm
View File

@@ -970,7 +970,11 @@
databuf.types = DNA2_BUF_UI // DNA2_BUF_UE databuf.types = DNA2_BUF_UI // DNA2_BUF_UE
databuf.dna = src.connected.occupant.dna.Clone() databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant)) if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name var/datum/data/record/med_record = data_core.find_medical_record_by_dna(connected.occupant.dna.unique_enzymes)
if(med_record)
databuf.dna.real_name = med_record.fields["name"]
else
databuf.dna.real_name=connected.occupant.name
databuf.dna.flavor_text=connected.occupant.flavor_text databuf.dna.flavor_text=connected.occupant.flavor_text
databuf.name = "Unique Identifier" databuf.name = "Unique Identifier"
src.buffers[bufferId] = databuf src.buffers[bufferId] = databuf
@@ -985,7 +989,11 @@
databuf.types = DNA2_BUF_UI|DNA2_BUF_UE databuf.types = DNA2_BUF_UI|DNA2_BUF_UE
databuf.dna = src.connected.occupant.dna.Clone() databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant)) if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name var/datum/data/record/med_record = data_core.find_medical_record_by_dna(connected.occupant.dna.unique_enzymes)
if(med_record)
databuf.dna.real_name = med_record.fields["name"]
else
databuf.dna.real_name=connected.occupant.name
databuf.dna.flavor_text=connected.occupant.flavor_text databuf.dna.flavor_text=connected.occupant.flavor_text
databuf.name = "Unique Identifier + Unique Enzymes" databuf.name = "Unique Identifier + Unique Enzymes"
src.buffers[bufferId] = databuf src.buffers[bufferId] = databuf
@@ -1000,7 +1008,11 @@
databuf.types = DNA2_BUF_SE databuf.types = DNA2_BUF_SE
databuf.dna = src.connected.occupant.dna.Clone() databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant)) if(ishuman(connected.occupant))
databuf.dna.real_name=connected.occupant.name var/datum/data/record/med_record = data_core.find_medical_record_by_dna(connected.occupant.dna.unique_enzymes)
if(med_record)
databuf.dna.real_name = med_record.fields["name"]
else
databuf.dna.real_name=connected.occupant.name
databuf.name = "Structural Enzymes" databuf.name = "Structural Enzymes"
src.buffers[bufferId] = databuf src.buffers[bufferId] = databuf
return 1 return 1