Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LateJoin more translate; Supervisor translate #352

Merged
merged 8 commits into from
Jul 12, 2024
Merged

LateJoin more translate; Supervisor translate #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
045bb99
supervisor ru
larentoun Jul 12, 2024
b667bd6
how much stun translate
larentoun Jul 12, 2024
0cbb21d
late join more translate
larentoun Jul 12, 2024
a963ab0
Update code/game/objects/items/melee/baton.dm
larentoun Jul 12, 2024
bbf6fac
Update code/modules/mob/dead/new_player/latejoin_menu.dm
larentoun Jul 12, 2024
edc468e
Update code/modules/mob/dead/new_player/latejoin_menu.dm
larentoun Jul 12, 2024
3fee765
Update code/modules/mob/dead/new_player/new_player.dm
larentoun Jul 12, 2024
c98d219
Update code/modules/jobs/job_types/_job.dm
larentoun Jul 12, 2024
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
2 changes: 1 addition & 1 deletion code/game/objects/items/melee/baton.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/atmospheric_technician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/bartender.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/botanist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cargo_technician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chaplain/chaplain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chemist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_medical_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/clown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cook.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/curator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/detective.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/geneticist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/head_of_personnel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/head_of_security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/janitor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/lawyer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/medical_doctor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/mime.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/paramedic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/quartermaster.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/research_director.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roboticist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/scientist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/shaft_miner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/station_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/station_trait/cargo_gorilla.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/station_trait/veteran_advisor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/warden.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/dead/new_player/latejoin_menu.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions code/modules/mob/dead/new_player/new_player.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 4 additions & 6 deletions tgui/packages/tgui/interfaces/JobSelection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ export const JobSelection = (props) => {
<NoticeBox info>{data.shuttle_status}</NoticeBox>
)}
<span style={{ color: 'grey' }}>
It is currently {data.round_duration} into the shift.
Смена идёт уже: {data.round_duration}.
</span>
<Button
style={{ position: 'absolute', right: '1em' }}
onClick={() => act('select_job', { job: 'Random' })}
content="Random Job!"
tooltip="Roll target random job. You can re-roll or cancel your random job if you don't like it."
content="Случайная профессия!"
tooltip="Случайно выбрать профессию. Вы можете повторно выбирать случайную профессию или отказаться от этого."
/>
</>
}
Expand All @@ -160,9 +160,7 @@ export const JobSelection = (props) => {
.toString(),
}}
>
{entry.open_slots +
(entry.open_slots === 1 ? ' slot' : ' slots') +
' available'}
{'позиций доступно: ' + entry.open_slots}
</span>
</>
}
Expand Down
Loading