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

The job selection page has been changed a little:

Browse Source 
Screenshot:
http://www.kamletos.si/job%20selection%203.PNG

Added this to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3032 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-02-04 21:09:11 +00:00
parent 0fa1f3d924
commit cd85e48c4a
12 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/assistant.dm
+1
View File
@@ -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
code/game/jobs/job/captain.dm
+2
View File
@@ -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)
code/game/jobs/job/civilian.dm
+11
View File
@@ -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)
code/game/jobs/job/civilian_chaplain.dm
+1
View File
@@ -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)
code/game/jobs/job/engineering.dm
+4
View File
@@ -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
code/game/jobs/job/job.dm
+3
View File
@@ -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
code/game/jobs/job/medical.dm
+4
View File
@@ -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)
code/game/jobs/job/science.dm
+3
View File
@@ -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)
code/game/jobs/job/security.dm
+4
View File
@@ -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)
code/game/jobs/job/silicon.dm
+2
View File
@@ -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
code/modules/mob/new_player/preferences.dm
+19 -13
View File
@@ -185,38 +185,44 @@ datum/preferences
var/HTML = "<body>"
HTML += "<tt><center>"
HTML += "<b>Choose occupation chances</b><br>Unavailable occupations are in red.<br>"
HTML += "<table width='100%' cellpadding='1' cellspacing='0' align='center'>"
for(var/datum/job/job in job_master.occupations)
HTML += "<tr bgcolor='[job.selection_color]'><td width='60%' align='right'>"
var/rank = job.title
if(jobban_isbanned(user, rank))
HTML += "<font color=red>[rank]</font><br>"
HTML += "<font color=red>[rank]</font></td><td><font color=red><b> \[BANNED]</b></font></td></tr>"
continue
if((job_civilian_low & ASSISTANT) && (rank != "Assistant"))
HTML += "<font color=orange>[rank]</font><br>"
HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
continue
if((rank in command_positions) || (rank == "AI"))//Bold head jobs
HTML += "<b>[rank]<a href=\"byond://?src=\ref[user];preferences=1;occ=1;job=[rank]\"></b>"
HTML += "<b>[rank]</b>"
else
HTML += "[rank]<a href=\"byond://?src=\ref[user];preferences=1;occ=1;job=[rank]\">"
HTML += "[rank]"
HTML += "</td><td width='40%'>"
HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=1;job=[rank]\">"
if(rank == "Assistant")//Assistant is special
if(job_civilian_low & ASSISTANT)
HTML += "<font color=green>\[Yes]</font>"
HTML += " <font color=green>\[Yes]</font>"
else
HTML += "<font color=red>\[No]</font>"
HTML += "</a><br>"
HTML += " <font color=red>\[No]</font>"
HTML += "</a></td></tr>"
continue
if(GetJobDepartment(job, 1) & job.flag)
HTML += "<font color=blue>\[High]</font>"
HTML += " <font color=blue>\[High]</font>"
else if(GetJobDepartment(job, 2) & job.flag)
HTML += "<font color=green>\[Medium]</font>"
HTML += " <font color=green>\[Medium]</font>"
else if(GetJobDepartment(job, 3) & job.flag)
HTML += "<font color=orange>\[Low]</font>"
HTML += " <font color=orange>\[Low]</font>"
else
HTML += "<font color=red>\[NEVER]</font>"
HTML += "</a><br>"
HTML += " <font color=red>\[NEVER]</font>"
HTML += "</a></td></tr>"
HTML += "<br>"
HTML += "</table><br>"
HTML += "<a href=\"byond://?src=\ref[user];preferences=1;occ=0;job=cancel\">\[Done\]</a>"
HTML += "</center></tt>"
html/changelog.html
+1
View File
@@ -65,6 +65,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<li><b>Erro updated:</b>
<ul>
<li>Examining humans now works a bit differently. Some external suits and helmets can hide certain pieces of clothing so you don't see them when examining. Glasses are also now displayed when examining.</li>
<li>The job selection screen has been changed a little to hopefully make making changes there easier.</li>
</ul>
</ul>