cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Searchtag Update (#4312)

Browse Source 
Added a new "Search" (Orange with an S) tag to the security hub, and cleaned up the awful messy sprites that were in use for the criminal tags.
This commit is contained in:
Kaedwuff
2018-03-24 13:31:10 +02:00
committed by Erki
parent c07ba5f6f3
commit e6c7186954
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/security.dm
+8 -1
View File
@@ -104,6 +104,8 @@
switch(crimstat)
if("*Arrest*")
background = "'background-color:#DC143C;'"
if("Search")
background = "'background-color:#FFAE00;'"
if("Incarcerated")
background = "'background-color:#CD853F;'"
if("Parolled")
@@ -203,6 +205,8 @@
switch(crimstat)
if("*Arrest*")
background = "'background-color:#DC143C;'"
if("Search")
background = "'background-color:#FFAE00;'"
if("Incarcerated")
background = "'background-color:#CD853F;'"
if("Parolled")
@@ -515,6 +519,7 @@ What a mess.*/
temp += "<ul>"
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=none'>None</a></li>"
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=arrest'>*Arrest*</a></li>"
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=search'>Search</a></li>"
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=incarcerated'>Incarcerated</a></li>"
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=parolled'>Parolled</a></li>"
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>"
@@ -565,6 +570,8 @@ What a mess.*/
active2.fields["criminal"] = "None"
if("arrest")
active2.fields["criminal"] = "*Arrest*"
if("search")
active2.fields["criminal"] = "Search"
if("incarcerated")
active2.fields["criminal"] = "Incarcerated"
if("parolled")
@@ -620,7 +627,7 @@ What a mess.*/
if(3)
R.fields["age"] = rand(5, 85)
if(4)
R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
R.fields["criminal"] = pick("None", "*Arrest*", "Search", "Incarcerated", "Parolled", "Released")
if(5)
R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
if(PDA_Manifest.len)
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -533,7 +533,7 @@
for (var/datum/data/record/R in data_core.security)
if (R.fields["id"] == E.fields["id"])
var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")
var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Search", "Incarcerated", "Parolled", "Released", "Cancel")
if(hasHUD(usr, "security"))
if(setcriminal != "Cancel")
code/modules/mob/living/carbon/human/life.dm
+3 -1
View File
@@ -1498,6 +1498,9 @@
if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
holder.icon_state = "hudwanted"
break
else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Search"))
holder.icon_state = "hudsearch"
break
else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
holder.icon_state = "hudprisoner"
break
@@ -1506,7 +1509,6 @@
break
else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released"))
holder.icon_state = "hudreleased"
break
hud_list[WANTED_HUD] = holder
if ( BITTEST(hud_updateflag, IMPLOYAL_HUD) \