The same error in two pull requests.

This commit is contained in:
davipatury
2017-02-25 09:56:27 -03:00
parent 58e0a1f136
commit 26d5a016f0
+40 -41
View File
@@ -134,48 +134,47 @@
temp = null
if(href_list["temp_action"])
if(href_list["temp_action"])
var/temp_href = splittext(href_list["temp_action"], "=")
switch(temp_href[1])
if("del_all2")
for(var/datum/data/record/R in data_core.security)
qdel(R)
setTemp("<h3>All records deleted.</h3>")
if("del_r2")
if(active2)
qdel(active2)
if("del_rg2")
if(active1)
for(var/datum/data/record/R in data_core.medical)
if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"])
qdel(R)
qdel(active1)
active1 = null
if(active2)
qdel(active2)
active2 = null
screen = SEC_DATA_R_LIST
if("criminal")
if(active2)
switch(temp_href[2])
if("none")
active2.fields["criminal"] = "None"
if("arrest")
active2.fields["criminal"] = "*Arrest*"
if("incarcerated")
active2.fields["criminal"] = "Incarcerated"
if("parolled")
active2.fields["criminal"] = "Parolled"
if("released")
active2.fields["criminal"] = "Released"
var/temp_href = splittext(href_list["temp_action"], "=")
switch(temp_href[1])
if("del_all2")
for(var/datum/data/record/R in data_core.security)
qdel(R)
setTemp("<h3>All records deleted.</h3>")
if("del_r2")
if(active2)
qdel(active2)
if("del_rg2")
if(active1)
for(var/datum/data/record/R in data_core.medical)
if(R.fields["name"] == active1.fields["name"] && R.fields["id"] == active1.fields["id"])
qdel(R)
qdel(active1)
active1 = null
if(active2)
qdel(active2)
active2 = null
screen = SEC_DATA_R_LIST
if("criminal")
if(active2)
switch(temp_href[2])
if("none")
active2.fields["criminal"] = "None"
if("arrest")
active2.fields["criminal"] = "*Arrest*"
if("incarcerated")
active2.fields["criminal"] = "Incarcerated"
if("parolled")
active2.fields["criminal"] = "Parolled"
if("released")
active2.fields["criminal"] = "Released"
for(var/mob/living/carbon/human/H in mob_list)
H.sec_hud_set_security_status()
if("rank")
if(active1)
active1.fields["rank"] = temp_href[2]
if(temp_href[2] in joblist)
active1.fields["real_rank"] = temp_href[2]
for(var/mob/living/carbon/human/H in mob_list)
H.sec_hud_set_security_status()
if("rank")
if(active1)
active1.fields["rank"] = temp_href[2]
if(temp_href[2] in joblist)
active1.fields["real_rank"] = temp_href[2]
if(href_list["scan"])
if(scan)