Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
dat += "<li>[B.name]: [job.get_ranks(B.name)]"
dat += "<hr style='clear:left;'>"
if(config.wikiurl)
dat += "<a href='?src=\ref[src];job_wiki=[rank]'>Open wiki page in browser</a>"
dat += "<a href='?src=\ref[src];job_wiki=[job.wikiname ? job.wikiname : rank]'>Open wiki page in browser</a>"

var/description = job.get_description_blurb()
if(description)
Expand Down Expand Up @@ -557,6 +557,11 @@ datum/category_item/player_setup_item/proc/prune_occupation_prefs()
/datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
return (job.title in player_alt_titles) ? player_alt_titles[job.title] : job.title

//[INF]
/datum/job
var/wikiname = ""
//[/INF]

#undef JOB_LEVEL_NEVER
#undef JOB_LEVEL_LOW
#undef JOB_LEVEL_MEDIUM
Expand Down
4 changes: 4 additions & 0 deletions maps/sierra/job/jobs_cargo.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/job/qm
title = "Quartermaster"
department = "Снабжения"
wikiname = "Квартирмейстер"
department_flag = SUP
total_positions = 1
spawn_positions = 1
Expand Down Expand Up @@ -35,6 +36,7 @@
/datum/job/cargo_tech
title = "Cargo Technician"
department = "Снабжения"
wikiname = "Карготехник"
department_flag = SUP
total_positions = 2
spawn_positions = 2
Expand Down Expand Up @@ -65,6 +67,7 @@
/datum/job/mining
title = "Prospector"
department = "Снабжения"
wikiname = "Шахтёр"
department_flag = SUP
total_positions = 4
spawn_positions = 4
Expand Down Expand Up @@ -98,6 +101,7 @@
/datum/job/cargo_assistant
title = "Cargo Assistant"
department = "Снабжения"
wikiname = "Помощник по снабжению"
department_flag = SUP
total_positions = 1
spawn_positions = 1
Expand Down
8 changes: 8 additions & 0 deletions maps/sierra/job/jobs_command.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title = "Captain"
department = "Командный"
supervisors = "Центральному Командованию"
wikiname = "Капитан"
department_flag = COM
head_position = 1
minimal_player_age = 21
Expand Down Expand Up @@ -46,6 +47,7 @@
title = "Head of Personnel"
supervisors = "Капитану"
department = "Командный"
wikiname = "Глава персонала"
department_flag = COM|SRV
head_position = 1
total_positions = 1
Expand Down Expand Up @@ -109,6 +111,7 @@
title = "Research Director"
supervisors = "Капитану"
department = "Научный"
wikiname = "Директор исследований"
department_flag = SCI|COM
head_position = 1
total_positions = 1
Expand Down Expand Up @@ -172,6 +175,7 @@
supervisors = "Капитану"
head_position = 1
department = "Медицинский"
wikiname = "Главный врач"
department_flag = MED|COM
total_positions = 1
spawn_positions = 1
Expand Down Expand Up @@ -232,6 +236,7 @@
supervisors = "Капитану"
head_position = 1
department = "Инженерный"
wikiname = "Главный инженер"
department_flag = ENG|COM
total_positions = 1
spawn_positions = 1
Expand Down Expand Up @@ -302,6 +307,7 @@
supervisors = "Капитану"
head_position = 1
department = "Охранный"
wikiname = "Глава службы безопасности"
department_flag = SEC|COM
total_positions = 1
spawn_positions = 1
Expand Down Expand Up @@ -357,6 +363,7 @@
/datum/job/iaa
title = "Internal Affairs Agent"
department = "Командный"
wikiname = "Агент Внутренних Дел"
department_flag = SPT
total_positions = 2
spawn_positions = 2
Expand Down Expand Up @@ -402,6 +409,7 @@
/datum/job/adjutant
title = "Adjutant"
department = "Командный"
wikiname = "Адъютант"
department_flag = SPT
total_positions = 2
spawn_positions = 2
Expand Down
4 changes: 4 additions & 0 deletions maps/sierra/job/jobs_engineering.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/job/senior_engineer
title = "Senior Engineer"
department = "Инженерный"
wikiname = "Старший инженер"
department_flag = ENG
supervisors = "Главному Инженеру"
selection_color = "#5b4d20"
Expand Down Expand Up @@ -51,6 +52,7 @@
/datum/job/engineer
title = "Engineer"
department = "Инженерный"
wikiname = "Инженер"
department_flag = ENG
supervisors = "Главному и Старшему инженеру"
selection_color = "#5b4d20"
Expand Down Expand Up @@ -108,6 +110,7 @@
/datum/job/engineer_trainee
title = "Engineer Trainee"
department = "Инженерный"
wikiname = "Инженер-стажёр"
department_flag = ENG
supervisors = "Главному инженеру и остальным инженерам"
selection_color = "#5b4d20"
Expand Down Expand Up @@ -156,6 +159,7 @@
/datum/job/infsys
title = "Information Technician"
department = "Инженерный"
wikiname = "Информационный Техник"
department_flag = ENG
supervisors = "Главному и Старшему инженерам"
selection_color = "#5b4d20"
Expand Down
3 changes: 3 additions & 0 deletions maps/sierra/job/jobs_exploration.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/job/exploration_leader
title = "Exploration Leader"
department = "Экспедиционный"
wikiname = "Лидер экспедиционной команды"
department_flag = EXP

total_positions = 1
Expand Down Expand Up @@ -43,6 +44,7 @@
/datum/job/explorer
title = "Explorer"
department = "Экспедиционный"
wikiname = "Исследователь"
department_flag = EXP
total_positions = 3
spawn_positions = 3
Expand Down Expand Up @@ -81,6 +83,7 @@
/datum/job/explorer_pilot
title = "Expeditionary Pilot"
department = "Экспедиционный"
wikiname = "Пилот Экспедиции"
department_flag = EXP
total_positions = 1
spawn_positions = 1
Expand Down
5 changes: 5 additions & 0 deletions maps/sierra/job/jobs_medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title = "Surgeon"
supervisors = "Главному врачу"
department = "Медицинский"
wikiname = "Хирург"
department_flag = MED

minimal_player_age = 14
Expand Down Expand Up @@ -61,6 +62,7 @@
title = "Doctor"
supervisors = "Главному Врачу"
department = "Медицинский"
wikiname = "Врач"
department_flag = MED

total_positions = 3
Expand Down Expand Up @@ -111,6 +113,7 @@
title = "Intern"
supervisors = "Главному Врачу и остальному медицинскому персоналу"
department = "Медицинский"
wikiname = "Интерн"
department_flag = MED

total_positions = 2
Expand Down Expand Up @@ -154,6 +157,7 @@
title = "Chemist"
supervisors = "Главному Врачу"
department = "Медицинский"
wikiname = "Химик"

department_flag = MED

Expand Down Expand Up @@ -188,6 +192,7 @@
title = "Counselor"
supervisors = "Главному Врачу"
department = "Медицинский"
wikiname = "Консультант"

department_flag = MED

Expand Down
2 changes: 2 additions & 0 deletions maps/sierra/job/jobs_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
total_positions = 12
spawn_positions = 12
department = "Гражданский"
wikiname = "Пассажир"
department_flag = CIV
supervisors = "Главе Персонала"
selection_color = "#515151"
Expand Down Expand Up @@ -39,6 +40,7 @@
total_positions = 3
spawn_positions = 3
supervisors = "установленными Вам законами"
wikiname = "Робот"

/datum/job/cyborg/get_description_blurb()
return "Ты - мозги на колесиках. Есть у тебя личность или ты просто продвинутая команда - определяет твой тип это так же влияет на твое устройство - Киборги сделаны из мозга органика, Роботы - позитронного (искусственного) мозга, Дроны - простой печатной платы, не способной к владению личности.\
Expand Down
4 changes: 4 additions & 0 deletions maps/sierra/job/jobs_research.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/job/senior_scientist
title = "Senior Researcher"
department = "Научный"
wikiname = "Старший научный сотрудник"
department_flag = SCI

total_positions = 1
Expand Down Expand Up @@ -51,6 +52,7 @@
/datum/job/scientist
title = "Scientist"
department = "Научный"
wikiname = "Научный сотрудник"
department_flag = SCI
total_positions = 6
spawn_positions = 6
Expand Down Expand Up @@ -105,6 +107,7 @@
/datum/job/roboticist
title = "Roboticist"
department = "Научный"
wikiname = "Робототехник"
department_flag = SCI

total_positions = 2
Expand Down Expand Up @@ -162,6 +165,7 @@
/datum/job/scientist_assistant
title = "Research Assistant"
department = "Научный"
wikiname = "Научный ассистент"
department_flag = SCI

total_positions = 4
Expand Down
4 changes: 4 additions & 0 deletions maps/sierra/job/jobs_security.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/datum/job/warden
title = "Warden"
department = "Охранный"
wikiname = "Варден"
department_flag = SEC
total_positions = 1
spawn_positions = 1
Expand Down Expand Up @@ -46,6 +47,7 @@
/datum/job/detective
title = "Criminal Investigator"
department = "Охранный"
wikiname = "Криминалист"
department_flag = SEC
hud_icon = "huddetective"
total_positions = 2
Expand Down Expand Up @@ -90,6 +92,7 @@
/datum/job/officer
title = "Security Guard"
department = "Охранный"
wikiname = "Офицер СБ"
department_flag = SEC
total_positions = 4
spawn_positions = 4
Expand Down Expand Up @@ -132,6 +135,7 @@
/datum/job/security_assistant
title = "Security Cadet"
department = "Охранный"
wikiname = "Кадет Службы Безопасности"
department_flag = SEC

total_positions = 2
Expand Down
3 changes: 3 additions & 0 deletions maps/sierra/job/jobs_service.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
/datum/job/janitor
title = "Janitor"
department = "Обслуживания"
wikiname = "Уборщик"
department_flag = SRV

total_positions = 2
Expand All @@ -47,6 +48,7 @@
/datum/job/chef
title = "Chef"
department = "Обслуживания"
wikiname = "Повар"
department_flag = SRV
total_positions = 1
spawn_positions = 1
Expand Down Expand Up @@ -74,6 +76,7 @@
department = "Обслуживания"
department_flag = SRV
supervisors = "Главе Персонала"
wikiname = "Бармен"
ideal_character_age = 30
selection_color = "#515151"
outfit_type = /decl/hierarchy/outfit/job/sierra/crew/service/bartender
Expand Down