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 e1fa773119e..b108fc035b9 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 7149a7550a2..956a6c8ea88 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -1,8 +1,3 @@ - - - - - //Food /datum/job/bartender title = "Bartender" @@ -12,6 +7,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -36,6 +32,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -56,6 +53,7 @@ total_positions = 2 spawn_positions = 2 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -78,6 +76,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -100,6 +99,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) @@ -120,6 +120,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) @@ -144,6 +145,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -172,6 +174,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -205,6 +208,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -226,6 +230,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" + selection_color = "#dddddd" equip(var/mob/living/carbon/human/H) @@ -246,6 +251,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 53e620c38b6..6f66f194b5b 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" alt_titles = list("Counselor") @@ -48,6 +49,7 @@ B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") else B.name = "The Holy Book of [new_religion]" +// feedback_set_details("religion_name","[new_religion]") spawn(1) var/deity_name = "Space Jesus" @@ -66,10 +68,12 @@ var/outoftime = 0 spawn(200) // 20 seconds to choose outoftime = 1 + var/new_book_style = "Bible" + while(!accepted) if(!B) break // prevents possible runtime errors - - switch(input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")) + new_book_style = input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon") + switch(new_book_style) if("Koran") B.icon_state = "koran" B.item_state = "koran" @@ -141,4 +145,6 @@ ticker.Bible_icon_state = B.icon_state ticker.Bible_item_state = B.item_state ticker.Bible_name = B.name +// feedback_set_details("religion_deity","[new_deity]") +// feedback_set_details("religion_book","[new_book_style]") return 1 \ No newline at end of file diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index e17f99c932e..c69a85ae84b 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) @@ -48,6 +49,7 @@ total_positions = 5 spawn_positions = 5 supervisors = "the chief engineer" + selection_color = "#fff5cc" equip(var/mob/living/carbon/human/H) @@ -72,6 +74,7 @@ total_positions = 2 spawn_positions = 2 supervisors = "the chief engineer" + selection_color = "#fff5cc" equip(var/mob/living/carbon/human/H) @@ -95,6 +98,7 @@ total_positions = 1 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 7a005104b9b..217e5e7e087 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -22,6 +22,9 @@ //Supervisors, who this person answers to directly var/supervisors = "" + //Sellection screen color + var/selection_color = "#ffffff" + //List of alternate titles, if any var/list/alt_titles diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index ec5bf5afa7e..f7e28dd9de8 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" alt_titles = list("Virologist", "Surgeon", "Emergency Medical Technician") @@ -57,6 +59,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) @@ -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 3eedd80b16a..255e8ad58d8 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" alt_titles = list("Plasma Researcher", "Xenobiologist") @@ -43,7 +45,7 @@ return 1 - +//Chemist is a medical job damnit /datum/job/chemist title = "Chemist" flag = CHEMIST @@ -52,6 +54,7 @@ total_positions = 1 spawn_positions = 1 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 c7945cda4f7..b3c8452fd61 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) @@ -40,6 +41,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of security" + selection_color = "#ffeeee" equip(var/mob/living/carbon/human/H) @@ -72,6 +74,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of security" + selection_color = "#ffeeee" alt_titles = list("Forensic Technician") @@ -113,6 +116,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 d91b4f89d92..1b608e200dc 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" supervisors = "your laws" @@ -22,6 +23,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 1be2e8cca9d..00ab2bcbba5 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -41,6 +41,9 @@ var/const BE_PAI =(1<<9) + + + datum/preferences var real_name @@ -359,46 +362,49 @@ 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]" - if(job.alt_titles) - HTML += "\[[GetAltTitle(job)]\]
" - else - 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 += "
" user << browse(null, "window=preferences") - user << browse(HTML, "window=mob_occupation;size=350x600") + user << browse(HTML, "window=mob_occupation;size=320x600") return