cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes civilian: Return of the Assistant King (#17103)

Browse Source 
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
This commit is contained in:
Fox McCloud
2021-11-16 13:49:08 -05:00
committed by GitHub
parent e8add7384e
commit 55a6c23bc7
36 changed files with 148 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/character.dm
+5 -5
View File
@@ -974,7 +974,7 @@
var/icon/clothes_s = null
var/uniform_dmi='icons/mob/clothing/uniform.dmi'
if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
if(job_support_low & JOB_ASSISTANT) //This gives the preview icon clothes depending on which job(if any) is set to 'high'
clothes_s = new /icon(uniform_dmi, "grey_s")
clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
if(backbag == 2)
@@ -2037,7 +2037,7 @@
var/available_in_days = job.available_in_days(user.client)
html += "<del class='dark'>[rank]</del></td><td class='bad'><b> \[IN [(available_in_days)] DAYS]</b></td></tr>"
continue
if((job_support_low & JOB_CIVILIAN) && (job.title != "Civilian"))
if((job_support_low & JOB_ASSISTANT) && (job.title != "Assistant"))
html += "<font color=orange>[rank]</font></td><td></td></tr>"
continue
if((job.title in GLOB.command_positions) || (job.title == "AI"))//Bold head jobs
@@ -2078,8 +2078,8 @@
// HTML += "<a href='?_src_=prefs;preference=job;task=input;text=[rank]'>"
if(job.title == "Civilian")//Civilian is special
if(job_support_low & JOB_CIVILIAN)
if(job.title == "Assistant") // Assistant is special
if(job_support_low & JOB_ASSISTANT)
html += " <font color=green>Yes</font></a>"
else
html += " <font color=red>No</font></a>"
@@ -2109,7 +2109,7 @@
if(GET_RANDOM_JOB)
html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Get random job if preferences unavailable</font></a></u></center><br>"
if(BE_ASSISTANT)
html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be a civilian if preferences unavailable</font></a></u></center><br>"
html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Be an assistant if preferences unavailable</font></a></u></center><br>"
if(RETURN_TO_LOBBY)
html += "<center><br><u><a href='?_src_=prefs;preference=job;task=random'><font color=white>Return to lobby if preferences unavailable</font></a></u></center><br>"
code/modules/client/preference/preferences.dm
+2 -2
View File
@@ -520,7 +520,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
ShowChoices(user)
return
if(role == "Civilian")
if(role == "Assistant")
if(active_character.job_support_low & job.flag)
active_character.job_support_low &= ~job.flag
else
@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
ShowChoices(user)
return
if(role == "Civilian")
if(role == "Assistant")
if(active_character.job_support_low & job.flag)
active_character.job_support_low &= ~job.flag
else