diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 6ffb8aa394..37cdd7deb6 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -471,20 +471,26 @@
if (href_list["print_p"])
if (!( src.printing ))
src.printing = 1
+ var/datum/data/record/record1 = null
+ var/datum/data/record/record2 = null
+ if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
+ record1 = active1
+ if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
+ record2 = active2
sleep(50)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
P.info = "
Medical Record
"
- if ((istype(src.active1, /datum/data/record) && data_core.general.Find(src.active1)))
- P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"], src.active1.fields["fingerprint"], src.active1.fields["p_stat"], src.active1.fields["m_stat"])
- P.name = text("Medical Record ([])", src.active1.fields["name"])
+ if (record1)
+ P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", record1.fields["name"], record1.fields["id"], record1.fields["sex"], record1.fields["age"], record1.fields["fingerprint"], record1.fields["p_stat"], record1.fields["m_stat"])
+ P.name = text("Medical Record ([])", record1.fields["name"])
else
P.info += "General Record Lost!
"
P.name = "Medical Record"
- if ((istype(src.active2, /datum/data/record) && data_core.medical.Find(src.active2)))
- P.info += text("
\nMedical Data
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", src.active2.fields["b_type"], src.active2.fields["b_dna"], src.active2.fields["mi_dis"], src.active2.fields["mi_dis_d"], src.active2.fields["ma_dis"], src.active2.fields["ma_dis_d"], src.active2.fields["alg"], src.active2.fields["alg_d"], src.active2.fields["cdi"], src.active2.fields["cdi_d"], src.active2.fields["notes"])
+ if (record2)
+ P.info += text("
\nMedical Data
\nBlood Type: []
\nDNA: []
\n
\nMinor Disabilities: []
\nDetails: []
\n
\nMajor Disabilities: []
\nDetails: []
\n
\nAllergies: []
\nDetails: []
\n
\nCurrent Diseases: [] (per disease info placed in log/comment section)
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", record2.fields["b_type"], record2.fields["b_dna"], record2.fields["mi_dis"], record2.fields["mi_dis_d"], record2.fields["ma_dis"], record2.fields["ma_dis_d"], record2.fields["alg"], record2.fields["alg_d"], record2.fields["cdi"], record2.fields["cdi_d"], record2.fields["notes"])
var/counter = 1
- while(src.active2.fields[text("com_[]", counter)])
- P.info += text("[]
", src.active2.fields[text("com_[]", counter)])
+ while(record2.fields[text("com_[]", counter)])
+ P.info += text("[]
", record2.fields[text("com_[]", counter)])
counter++
else
P.info += "Medical Record Lost!
"
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index a48ae5529b..129c677201 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -329,20 +329,26 @@ What a mess.*/
if ("Print Record")
if (!( printing ))
printing = 1
+ var/datum/data/record/record1 = null
+ var/datum/data/record/record2 = null
+ if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
+ record1 = active1
+ if ((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
+ record2 = active2
sleep(50)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc )
P.info = "Security Record
"
- if ((istype(active1, /datum/data/record) && data_core.general.Find(active1)))
- P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"], active1.fields["fingerprint"], active1.fields["p_stat"], active1.fields["m_stat"])
- P.name = text("Security Record ([])", active1.fields["name"])
+ if (record1)
+ P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
\nFingerprint: []
\nPhysical Status: []
\nMental Status: []
", record1.fields["name"], record1.fields["id"], record1.fields["sex"], record1.fields["age"], record1.fields["fingerprint"], record1.fields["p_stat"], record1.fields["m_stat"])
+ P.name = text("Security Record ([])", record1.fields["name"])
else
P.info += "General Record Lost!
"
P.name = "Security Record"
- if ((istype(active2, /datum/data/record) && data_core.security.Find(active2)))
- P.info += text("
\nSecurity Data
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", active2.fields["criminal"], active2.fields["mi_crim"], active2.fields["mi_crim_d"], active2.fields["ma_crim"], active2.fields["ma_crim_d"], active2.fields["notes"])
+ if (record2)
+ P.info += text("
\nSecurity Data
\nCriminal Status: []
\n
\nMinor Crimes: []
\nDetails: []
\n
\nMajor Crimes: []
\nDetails: []
\n
\nImportant Notes:
\n\t[]
\n
\nComments/Log
", record2.fields["criminal"], record2.fields["mi_crim"], record2.fields["mi_crim_d"], record2.fields["ma_crim"], record2.fields["ma_crim_d"], record2.fields["notes"])
var/counter = 1
- while(active2.fields[text("com_[]", counter)])
- P.info += text("[]
", active2.fields[text("com_[]", counter)])
+ while(record2.fields[text("com_[]", counter)])
+ P.info += text("[]
", record2.fields[text("com_[]", counter)])
counter++
else
P.info += "Security Record Lost!
"