diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 253a40be69d54..698d72b2b9c55 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -64,7 +64,7 @@
. = ..()
// Adding an extra break for the sake of presentation
if(stamina_damage != 0)
- offensive_notes = "It takes [span_warning("[CEILING(100 / stamina_damage, 1)] stunning hit\s")] to stun an enemy."
+ offensive_notes = "Количество ударов, требуемого для оглушения: [span_warning("[CEILING(100 / stamina_damage, 1)]")]."
register_item_context()
diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm
index d082e2c7e06ab..1b71affd72e46 100644
--- a/code/modules/jobs/job_types/atmospheric_technician.dm
+++ b/code/modules/jobs/job_types/atmospheric_technician.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
- supervisors = SUPERVISOR_CE
+ supervisors = JOB_CHIEF_ENGINEER_RU
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index 87c86c8845944..2bbc2d89a3480 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "BARTENDER"
diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm
index 82fa967c0133a..df779633d3f01 100644
--- a/code/modules/jobs/job_types/botanist.dm
+++ b/code/modules/jobs/job_types/botanist.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "BOTANIST"
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index bbce74c51feb6..bdea6954e512b 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -7,7 +7,7 @@
faction = FACTION_STATION
total_positions = 5
spawn_positions = 3
- supervisors = SUPERVISOR_QM
+ supervisors = JOB_QUARTERMASTER_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "CARGO_TECHNICIAN"
diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm
index 9138b335a544b..300b08faf965e 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "CHAPLAIN"
diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm
index ead5655911e92..9014f84ef5974 100644
--- a/code/modules/jobs/job_types/chemist.dm
+++ b/code/modules/jobs/job_types/chemist.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
- supervisors = SUPERVISOR_CMO
+ supervisors = JOB_CHIEF_MEDICAL_OFFICER_RU
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 3a62a4b446a56..dd179ae30b1a9 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_CAPTAIN
+ supervisors = JOB_CAPTAIN_RU
req_admin_notify = 1
minimal_player_age = 7
exp_requirements = 180
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index bb8ab00b598df..515f9158b7ae0 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_CAPTAIN
+ supervisors = JOB_CAPTAIN_RU
req_admin_notify = 1
minimal_player_age = 7
exp_requirements = 180
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index 870f5ea7e61c9..41956fa6875d8 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "CLOWN"
diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm
index f8d56a7de63e4..bfedb338ccd89 100644
--- a/code/modules/jobs/job_types/cook.dm
+++ b/code/modules/jobs/job_types/cook.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "COOK"
var/cooks = 0 //Counts cooks amount
diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm
index 3197cf58fce03..83dffdb22d6e5 100644
--- a/code/modules/jobs/job_types/curator.dm
+++ b/code/modules/jobs/job_types/curator.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
config_tag = "CURATOR"
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index 3dcc5ac005fec..679ed54333458 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -7,7 +7,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOS
+ supervisors = JOB_HEAD_OF_SECURITY_RU
minimal_player_age = 7
exp_requirements = 300
exp_required_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm
index d2b0b27dd7e6a..12bc0553f4148 100644
--- a/code/modules/jobs/job_types/geneticist.dm
+++ b/code/modules/jobs/job_types/geneticist.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
- supervisors = SUPERVISOR_RD
+ supervisors = JOB_RESEARCH_DIRECTOR_RU
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index 087cafaf2d593..7476cf221f2d7 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_CAPTAIN
+ supervisors = JOB_CAPTAIN_RU
req_admin_notify = 1
minimal_player_age = 10
exp_requirements = 180
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index 55827b1dfdb7a..99990de207354 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_CAPTAIN
+ supervisors = JOB_CAPTAIN_RU
req_admin_notify = 1
minimal_player_age = 14
exp_requirements = 300
diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm
index d63c18b10a316..ccbabbff65dbd 100644
--- a/code/modules/jobs/job_types/janitor.dm
+++ b/code/modules/jobs/job_types/janitor.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "JANITOR"
diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm
index 2338aca09b1e4..d66b18d7f4ec5 100644
--- a/code/modules/jobs/job_types/lawyer.dm
+++ b/code/modules/jobs/job_types/lawyer.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "LAWYER"
diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm
index a0a0c479b9cc8..0c099ad58f4d5 100644
--- a/code/modules/jobs/job_types/medical_doctor.dm
+++ b/code/modules/jobs/job_types/medical_doctor.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 6
spawn_positions = 4
- supervisors = SUPERVISOR_CMO
+ supervisors = JOB_CHIEF_MEDICAL_OFFICER_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "MEDICAL_DOCTOR"
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index eba86ec2af07a..e364e109dddf1 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOP
+ supervisors = JOB_HEAD_OF_PERSONNEL_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "MIME"
diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm
index b977e6cb8fc01..279b60d9be4da 100644
--- a/code/modules/jobs/job_types/paramedic.dm
+++ b/code/modules/jobs/job_types/paramedic.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
- supervisors = SUPERVISOR_CMO
+ supervisors = JOB_CHIEF_MEDICAL_OFFICER_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "PARAMEDIC"
diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm
index dbd490d30c188..49bc643aa29b6 100644
--- a/code/modules/jobs/job_types/quartermaster.dm
+++ b/code/modules/jobs/job_types/quartermaster.dm
@@ -9,7 +9,7 @@
total_positions = 1
spawn_positions = 1
minimal_player_age = 7
- supervisors = SUPERVISOR_CAPTAIN
+ supervisors = JOB_CAPTAIN_RU
exp_required_type_department = EXP_TYPE_SUPPLY
exp_granted_type = EXP_TYPE_CREW
config_tag = "QUARTERMASTER"
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index 22ef734958326..59cfb7fa25674 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -9,7 +9,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_CAPTAIN
+ supervisors = JOB_CAPTAIN_RU
req_admin_notify = 1
minimal_player_age = 7
exp_required_type_department = EXP_TYPE_SCIENCE
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index 1239cbc029b9d..9b70c22b904b9 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
- supervisors = SUPERVISOR_RD
+ supervisors = JOB_RESEARCH_DIRECTOR_RU
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm
index c01ac335354a2..593fd881248cb 100644
--- a/code/modules/jobs/job_types/scientist.dm
+++ b/code/modules/jobs/job_types/scientist.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 5
spawn_positions = 3
- supervisors = SUPERVISOR_RD
+ supervisors = JOB_RESEARCH_DIRECTOR_RU
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index d273092a1eaa1..0431c1bcd29f3 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 3
- supervisors = SUPERVISOR_QM
+ supervisors = JOB_QUARTERMASTER_RU
exp_granted_type = EXP_TYPE_CREW
config_tag = "SHAFT_MINER"
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index 4506a2ae22535..7a56f8a8a0051 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 5
spawn_positions = 5
- supervisors = SUPERVISOR_CE
+ supervisors = JOB_CHIEF_ENGINEER_RU
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
exp_granted_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm b/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm
index aba9cddaa54db..1946e43b1a18e 100644
--- a/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm
+++ b/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 0
spawn_positions = 0
- supervisors = SUPERVISOR_QM
+ supervisors = JOB_QUARTERMASTER_RU
spawn_type = /mob/living/basic/gorilla/cargorilla
config_tag = "CARGO_GORILLA"
random_spawns_possible = FALSE
diff --git a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
index 6fcb8d94707f5..4f5925ecfb5d4 100644
--- a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
+++ b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
@@ -7,7 +7,7 @@
faction = FACTION_STATION
total_positions = 0
spawn_positions = 0
- supervisors = SUPERVISOR_HOS
+ supervisors = JOB_HEAD_OF_SECURITY_RU
minimal_player_age = 7
exp_requirements = 6000 //100 HOURS! We want really hard boiled people
exp_required_type = EXP_TYPE_CREW
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index 132a090fc5008..2854a3387ba45 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
- supervisors = SUPERVISOR_HOS
+ supervisors = JOB_HEAD_OF_SECURITY_RU
minimal_player_age = 7
exp_requirements = 300
exp_required_type = EXP_TYPE_CREW
diff --git a/code/modules/mob/dead/new_player/latejoin_menu.dm b/code/modules/mob/dead/new_player/latejoin_menu.dm
index bb871470e93fd..2e1fc64433142 100644
--- a/code/modules/mob/dead/new_player/latejoin_menu.dm
+++ b/code/modules/mob/dead/new_player/latejoin_menu.dm
@@ -197,20 +197,20 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new)
dept_data += job_datum.title
if(dept_data.len <= 0) //Congratufuckinglations
- tgui_alert(owner, "There are literally no random jobs available for you on this server, ahelp for assistance.", "Oh No!")
+ tgui_alert(owner, "В данный момент для вас нет случайной профессии. Обратитесь в ahelp за помощью.", "О нет!")
return
var/random_job
while(random_job != JOB_CHOICE_YES)
if(dept_data.len <= 0)
- tgui_alert(owner, "It seems that there are no more random jobs available for you!", "Oh No!")
+ tgui_alert(owner, "В данный момент нет доступных для вас случайных профессий!", "О нет!")
return
var/random = pick_n_take(dept_data)
var/list/random_job_options = list(JOB_CHOICE_YES, JOB_CHOICE_REROLL, JOB_CHOICE_CANCEL)
- random_job = tgui_alert(owner, "[random]?", "Random Job", random_job_options)
+ random_job = tgui_alert(owner, "[job_title_ru(random)]?", "Случайная должность", random_job_options)
if(random_job == JOB_CHOICE_CANCEL)
return
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 74133ba76faf1..ff983db9b7f55 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -108,21 +108,21 @@
/proc/get_job_unavailable_error_message(retval, jobtitle)
switch(retval)
if(JOB_AVAILABLE)
- return "[jobtitle] доступна для выбора."
+ return "[job_title_ru(jobtitle)] доступна для выбора."
if(JOB_UNAVAILABLE_GENERIC)
- return "[jobtitle] недоступна для выбора."
+ return "[job_title_ru(jobtitle)] недоступна для выбора."
if(JOB_UNAVAILABLE_BANNED)
- return "На данный момент вам выдан бан роли на [jobtitle]."
+ return "На данный момент вам выдан бан роли на [job_title_ru(jobtitle)]."
if(JOB_UNAVAILABLE_PLAYTIME)
- return "У вас не наиграно достаточно часов для игры за [jobtitle]."
+ return "У вас не наиграно достаточно часов для игры за [job_title_ru(jobtitle)]."
if(JOB_UNAVAILABLE_ACCOUNTAGE)
- return "Ваш аккаунт недостаточно стар для игры за [jobtitle]."
+ return "Ваш аккаунт недостаточно стар для игры за [job_title_ru(jobtitle)]."
if(JOB_UNAVAILABLE_SLOTFULL)
- return "[jobtitle] уже заполнена до максимума."
+ return "Роль [job_title_ru(jobtitle)] уже заполнена до максимума."
if(JOB_UNAVAILABLE_ANTAG_INCOMPAT)
- return "[jobtitle] несовместим с некоторыми выбранными вами ролями антагонистов."
+ return "[job_title_ru(jobtitle)] несовместим с некоторыми выбранными вами ролями антагонистов."
if(JOB_UNAVAILABLE_AGE)
- return "Ваш персонаж недостаточно стар для игры за [jobtitle]."
+ return "Ваш персонаж недостаточно стар для игры за [job_title_ru(jobtitle)]."
return GENERIC_JOB_UNAVAILABLE_ERROR
diff --git a/tgui/packages/tgui/interfaces/JobSelection.tsx b/tgui/packages/tgui/interfaces/JobSelection.tsx
index 5a2087bceeb85..ecf4ad1839ed5 100644
--- a/tgui/packages/tgui/interfaces/JobSelection.tsx
+++ b/tgui/packages/tgui/interfaces/JobSelection.tsx
@@ -127,13 +127,13 @@ export const JobSelection = (props) => {
{data.shuttle_status}
)}
- It is currently {data.round_duration} into the shift.
+ Смена идёт уже: {data.round_duration}.