Merge pull request #7258 from Baystation12/master

Updating dev-freeze from master.
This commit is contained in:
Zuhayr
2014-12-07 11:28:27 +10:30
7 changed files with 24 additions and 10 deletions

View File

@@ -598,6 +598,8 @@ What a mess.*/
R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
if(5)
R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
if(PDA_Manifest.len)
PDA_Manifest.Cut()
if(6)
R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable")
continue
@@ -610,4 +612,4 @@ What a mess.*/
/obj/machinery/computer/secure_data/detective_computer
icon = 'icons/obj/computer.dmi'
icon_state = "messyfiles"
icon_state = "messyfiles"