diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index e328aa3a773..af9d8b193cf 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -6,6 +6,7 @@ total_positions = -1 spawn_positions = -1 supervisors = "absolutely everyone" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 5aed4ee603f..e46623d78ca 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -6,6 +6,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "Nanotrasen officials and Space law" + selection_color = "#ccccff" equip(var/mob/living/carbon/human/H) @@ -36,6 +37,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the captain" + selection_color = "#ddddff" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 2a598bbda96..171eda2bb4a 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -12,6 +12,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -37,6 +38,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -57,6 +59,7 @@ total_positions = 3 spawn_positions = 2 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -79,6 +82,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -102,6 +106,7 @@ total_positions = 2 spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -123,6 +128,7 @@ total_positions = 3 spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -148,6 +154,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -176,6 +183,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -208,6 +216,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -228,6 +237,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -248,6 +258,7 @@ var/global/lawyer = 0//Checks for another lawyer total_positions = 2 spawn_positions = 2 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index cf0dc454c5e..538b229501b 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -7,6 +7,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d397164791f..6fad5f93243 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -6,6 +6,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the captain" + selection_color = "#ffeeaa" equip(var/mob/living/carbon/human/H) @@ -31,6 +32,7 @@ total_positions = 5 spawn_positions = 5 supervisors = "the chief engineer" + selection_color = "#fff5cc" equip(var/mob/living/carbon/human/H) @@ -56,6 +58,7 @@ total_positions = 3 spawn_positions = 2 supervisors = "the chief engineer" + selection_color = "#fff5cc" equip(var/mob/living/carbon/human/H) @@ -79,6 +82,7 @@ total_positions = 2 spawn_positions = 1 supervisors = "the chief engineer and research director" + selection_color = "#fff5cc" equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index c8ae0945866..dc320cbbab2 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -22,5 +22,8 @@ //Supervisors, who this person answers to directly var/supervisors = "" + //Sellection screen color + var/selection_color = "#ffffff" + /datum/job/proc/equip(var/mob/living/carbon/human/H) return 1 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 8e1db23afcd..f7c907a44c7 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -6,6 +6,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the captain" + selection_color = "#ffddf0" equip(var/mob/living/carbon/human/H) @@ -31,6 +32,7 @@ total_positions = 5 spawn_positions = 3 supervisors = "the chief medical officer" + selection_color = "#ffeef0" equip(var/mob/living/carbon/human/H) @@ -56,6 +58,7 @@ total_positions = 2 spawn_positions = 2 supervisors = "the chief medical officer and research director" + selection_color = "#ffeef0" equip(var/mob/living/carbon/human/H) @@ -80,6 +83,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the chief medical officer and research director" + selection_color = "#ffeef0" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index c54b3e7a86c..016ada28f6e 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -6,6 +6,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the captain" + selection_color = "#ffddff" equip(var/mob/living/carbon/human/H) @@ -28,6 +29,7 @@ total_positions = 5 spawn_positions = 3 supervisors = "the research director" + selection_color = "#ffeeff" equip(var/mob/living/carbon/human/H) @@ -51,6 +53,7 @@ total_positions = 2 spawn_positions = 2 supervisors = "the chief medical officer and the research director" + selection_color = "#ffeeff" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index cdc478df430..2246c2e2e20 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -6,6 +6,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the captain" + selection_color = "#ffdddd" equip(var/mob/living/carbon/human/H) @@ -38,6 +39,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of security" + selection_color = "#ffeeee" equip(var/mob/living/carbon/human/H) @@ -70,6 +72,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of security" + selection_color = "#ffeeee" equip(var/mob/living/carbon/human/H) @@ -106,6 +109,7 @@ total_positions = 5 spawn_positions = 5 supervisors = "the head of security" + selection_color = "#ffeeee" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index f249ada8cbc..3d62ba78d8d 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -5,6 +5,7 @@ faction = "Station" total_positions = 0 spawn_positions = 1 + selection_color = "#ccffcc" equip(var/mob/living/carbon/human/H) @@ -21,6 +22,7 @@ total_positions = 0 spawn_positions = 1 supervisors = "your laws and the AI" //Nodrak + selection_color = "#ddffdd" equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 7cef4ab032c..e6a9e486e45 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -185,38 +185,44 @@ datum/preferences var/HTML = "" HTML += "
" HTML += "Choose occupation chances
Unavailable occupations are in red.
" + HTML += "" for(var/datum/job/job in job_master.occupations) + HTML += "" continue if((job_civilian_low & ASSISTANT) && (rank != "Assistant")) - HTML += "[rank]
" + HTML += "[rank]" continue if((rank in command_positions) || (rank == "AI"))//Bold head jobs - HTML += "[rank]" + HTML += "[rank]" else - HTML += "[rank]" + HTML += "[rank]" + + HTML += "" continue if(GetJobDepartment(job, 1) & job.flag) - HTML += "\[High]" + HTML += " \[High]" else if(GetJobDepartment(job, 2) & job.flag) - HTML += "\[Medium]" + HTML += " \[Medium]" else if(GetJobDepartment(job, 3) & job.flag) - HTML += "\[Low]" + HTML += " \[Low]" else - HTML += "\[NEVER]" - HTML += "
" + HTML += " \[NEVER]" + HTML += "" - HTML += "
" + HTML += "
" var/rank = job.title if(jobban_isbanned(user, rank)) - HTML += "[rank]
" + HTML += "[rank]
\[BANNED]
" + + HTML += "" if(rank == "Assistant")//Assistant is special if(job_civilian_low & ASSISTANT) - HTML += "\[Yes]" + HTML += " \[Yes]" else - HTML += "\[No]" - HTML += "
" + HTML += " \[No]" + HTML += "

" HTML += "\[Done\]" HTML += "
" diff --git a/html/changelog.html b/html/changelog.html index e06e450049b..ca97f44a192 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -65,6 +65,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Erro updated: