Fixedish the arrivals scanner, still need to add circuitboard to it

This commit is contained in:
Miniature
2011-11-29 19:29:56 +10:30
parent fbf18ddd7e
commit d4ae76820b
+18 -16
View File
@@ -30,12 +30,14 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user)
var/list/marks = list()
var/age = user.age
var/gender = user.gender
/* no dbstuff yet
var/DBQuery/cquery = dbcon.NewQuery("SELECT * from jobban WHERE ckey='[user.ckey]'")
if(!cquery.Execute()) return
else
while(cquery.NextRow())
var/list/row = cquery.GetRowData()
marks += row["rank"]
*/
var/text = {"
<font size=4><center>Report</center></font><br>
<b><u>Name</u></b>: [mname]
@@ -64,22 +66,22 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user)
var/datum/data/record/S = new()
var/datum/data/record/L = new()
G.fields["rank"] = "Unassigned"
G.fields["name"] = H.real_name
G.fields["name"] = mname
G.fields["id"] = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6))
M.fields["name"] = G.fields["name"]
M.fields["id"] = G.fields["id"]
S.fields["name"] = G.fields["name"]
S.fields["id"] = G.fields["id"]
if(H.gender == FEMALE)
if(gender == FEMALE)
G.fields["sex"] = "Female"
else
G.fields["sex"] = "Male"
G.fields["age"] = text("[]", H.age)
G.fields["fingerprint"] = text("[]", md5(H.dna.uni_identity))
G.fields["age"] = text("[]", age)
G.fields["fingerprint"] = text("[]", fingerprint)
G.fields["p_stat"] = "Active"
G.fields["m_stat"] = "Stable"
M.fields["b_type"] = text("[]", H.b_type)
M.fields["b_dna"] = H.dna.unique_enzymes
M.fields["b_type"] = text("[]", bloodtype)
M.fields["b_dna"] = dna
M.fields["mi_dis"] = "None"
M.fields["mi_dis_d"] = "No minor disabilities have been declared."
M.fields["ma_dis"] = "None"
@@ -97,16 +99,16 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user)
S.fields["notes"] = "No notes."
//Begin locked reporting
L.fields["name"] = H.real_name
L.fields["sex"] = H.gender
L.fields["age"] = H.age
L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]")
L.fields["rank"] = H.mind.assigned_role
L.fields["b_type"] = H.b_type
L.fields["b_dna"] = H.dna.unique_enzymes
L.fields["enzymes"] = H.dna.struc_enzymes
L.fields["identity"] = H.dna.uni_identity
L.fields["image"] = H_icon//What the person looks like. Naked, in this case.
L.fields["name"] = mname
L.fields["sex"] = gender
L.fields["age"] = age
L.fields["id"] = md5("[mname][user.mind.assigned_role]")
L.fields["rank"] = "Unknown"
L.fields["b_type"] = bloodtype
L.fields["b_dna"] = dna
L.fields["enzymes"] = user.dna.struc_enzymes
L.fields["identity"] = user.dna.uni_identity
L.fields["image"] = getFlatIcon(user,0)//What the person looks like. Naked, in this case.
//End locked reporting
data_core.general += G