cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7258 from Baystation12/master

Browse Source 
Updating dev-freeze from master.
This commit is contained in:
Zuhayr
2014-12-07 11:28:27 +10:30
parent ba1f4a8f03 1c098461b2
commit 1dc68e22bc
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/computer3/computers/medical.dm
View File

@@ -377,6 +377,8 @@
src.active1.fields["p_stat"] = "Physically Unfit"
if("disabled")
src.active1.fields["p_stat"] = "Disabled"
if(PDA_Manifest.len)
PDA_Manifest.Cut()
if (href_list["m_stat"])
if (src.active1)
@@ -525,4 +527,4 @@
src.printing = null
interact()
return
return

4
code/WorkInProgress/computer3/computers/security.dm
View File

@@ -594,6 +594,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
@@ -606,4 +608,4 @@ What a mess.*/
/obj/machinery/computer3/secure_data/detective_computer
icon = 'icons/obj/computer.dmi'
icon_state = "messyfiles"
icon_state = "messyfiles"