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

TG: 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.
 Revision: r3032
Author: 	 baloh.matevz
This commit is contained in:
Ren Erthilo
2012-04-19 23:39:32 +01:00
parent 316092a048
commit da779a1834
11 changed files with 66 additions and 25 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 -5
View File
@@ -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)
code/game/jobs/job/civilian_chaplain.dm
+8 -2
View File
@@ -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
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)
@@ -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
code/game/jobs/job/job.dm
+3
View File
@@ -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
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"
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)
code/game/jobs/job/science.dm
+4 -1
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"
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)
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)
@@ -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)
code/game/jobs/job/silicon.dm
+2
View File
@@ -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
code/modules/mob/new_player/preferences.dm
+23 -17
View File
@@ -41,6 +41,9 @@ var/const
BE_PAI =(1<<9)
datum/preferences
var
real_name
@@ -359,46 +362,49 @@ 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>"
if(job.alt_titles)
HTML += "</a> <a href=\"byond://?src=\ref[user];preferences=1;alt_title=1;job=\ref[job]\">\[[GetAltTitle(job)]\]</a><br>"
else
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>"
user << browse(null, "window=preferences")
user << browse(HTML, "window=mob_occupation;size=350x600")
user << browse(HTML, "window=mob_occupation;size=320x600")
return