From 5a07598ce6e82e4dd356ebbe443de5b266ad9d71 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:08:14 +0300
Subject: [PATCH 01/18] our defines
---
code/__DEFINES/bandastation/bandastation.dm | 119 ++++++++++++++++++++
tgstation.dme | 5 +-
2 files changed, 123 insertions(+), 1 deletion(-)
create mode 100644 code/__DEFINES/bandastation/bandastation.dm
diff --git a/code/__DEFINES/bandastation/bandastation.dm b/code/__DEFINES/bandastation/bandastation.dm
new file mode 100644
index 0000000000000..f4de4f2c6e977
--- /dev/null
+++ b/code/__DEFINES/bandastation/bandastation.dm
@@ -0,0 +1,119 @@
+//No department
+#define JOB_ASSISTANT_RU "Гражданский"
+#define JOB_PRISONER_RU "Заключенный"
+//Command
+#define JOB_CAPTAIN_RU "Капитан"
+#define JOB_HEAD_OF_PERSONNEL_RU "Глава персонала"
+#define JOB_HEAD_OF_SECURITY_RU "Глава службы безопасности"
+#define JOB_RESEARCH_DIRECTOR_RU "Директор исследований"
+#define JOB_CHIEF_ENGINEER_RU "Главный инженер"
+#define JOB_CHIEF_MEDICAL_OFFICER_RU "Главный врач"
+#define JOB_BRIDGE_ASSISTANT_RU "Bridge Assistant"
+#define JOB_VETERAN_ADVISOR_RU "Veteran Security Advisor"
+//Silicon
+#define JOB_AI_RU "ИИ"
+#define JOB_CYBORG_RU "Киборг"
+#define JOB_PERSONAL_AI_RU "Персональный ИИ"
+#define JOB_HUMAN_AI_RU "Большой брат"
+//Security
+#define JOB_WARDEN_RU "Смотритель"
+#define JOB_DETECTIVE_RU "Детектив"
+#define JOB_SECURITY_OFFICER_RU "Офицер"
+#define JOB_SECURITY_OFFICER_MEDICAL_RU "Офицер (Медицинский)"
+#define JOB_SECURITY_OFFICER_ENGINEERING_RU "Офицер (Инженерный)"
+#define JOB_SECURITY_OFFICER_SCIENCE_RU "Офицер (Исследований)"
+#define JOB_SECURITY_OFFICER_SUPPLY_RU "Офицер (Снабжения)"
+//Engineering
+#define JOB_STATION_ENGINEER_RU "Станционный инженер"
+#define JOB_ATMOSPHERIC_TECHNICIAN_RU "Атмосферный техник"
+//Medical
+#define JOB_CORONER_RU "Коронер"
+#define JOB_MEDICAL_DOCTOR_RU "Врач"
+#define JOB_PARAMEDIC_RU "Парамедик"
+#define JOB_CHEMIST_RU "Химик"
+//Science
+#define JOB_SCIENTIST_RU "Ученый"
+#define JOB_ROBOTICIST_RU "Робототехник"
+#define JOB_GENETICIST_RU "Генетик"
+//Supply
+#define JOB_QUARTERMASTER_RU "Квартирмейстер"
+#define JOB_CARGO_TECHNICIAN_RU "Грузчик"
+#define JOB_CARGO_GORILLA_RU "Cargo Gorilla"
+#define JOB_SHAFT_MINER_RU "Шахтер"
+//#define JOB_BITRUNNER_RU "Битраннер" // TODO: REMOVE COMMENT
+//Service
+#define JOB_BARTENDER_RU "Бармен"
+#define JOB_BOTANIST_RU "Ботаник"
+#define JOB_COOK_RU "Повар"
+#define JOB_CHEF_RU "Шеф"
+#define JOB_JANITOR_RU "Уборщик"
+#define JOB_CLOWN_RU "Клоун"
+#define JOB_MIME_RU "Мим"
+#define JOB_CURATOR_RU "Куратор"
+#define JOB_LAWYER_RU "Адвокат"
+#define JOB_CHAPLAIN_RU "Священник"
+#define JOB_PSYCHOLOGIST_RU "Психолог"
+
+GLOBAL_LIST_INIT(job_titles_ru, list(
+ //No department
+ JOB_ASSISTANT = JOB_ASSISTANT_RU,
+ JOB_PRISONER = JOB_PRISONER_RU,
+ //Command
+ JOB_CAPTAIN = JOB_CAPTAIN_RU,
+ JOB_HEAD_OF_PERSONNEL = JOB_HEAD_OF_PERSONNEL_RU,
+ JOB_HEAD_OF_SECURITY = JOB_HEAD_OF_SECURITY_RU,
+ JOB_RESEARCH_DIRECTOR = JOB_RESEARCH_DIRECTOR_RU,
+ JOB_CHIEF_ENGINEER = JOB_CHIEF_ENGINEER_RU,
+ JOB_CHIEF_MEDICAL_OFFICER = JOB_CHIEF_MEDICAL_OFFICER_RU,
+ JOB_BRIDGE_ASSISTANT = JOB_BRIDGE_ASSISTANT_RU,
+ JOB_VETERAN_ADVISOR = JOB_VETERAN_ADVISOR_RU,
+ //Silicon
+ JOB_AI = JOB_AI_RU,
+ JOB_CYBORG = JOB_CYBORG_RU,
+ JOB_PERSONAL_AI = JOB_PERSONAL_AI_RU,
+ JOB_HUMAN_AI = JOB_HUMAN_AI_RU,
+ //Security
+ JOB_WARDEN = JOB_WARDEN_RU,
+ JOB_DETECTIVE = JOB_DETECTIVE_RU,
+ JOB_SECURITY_OFFICER = JOB_SECURITY_OFFICER_RU,
+ JOB_SECURITY_OFFICER_MEDICAL = JOB_SECURITY_OFFICER_MEDICAL_RU,
+ JOB_SECURITY_OFFICER_ENGINEERING = JOB_SECURITY_OFFICER_ENGINEERING_RU,
+ JOB_SECURITY_OFFICER_SCIENCE = JOB_SECURITY_OFFICER_SCIENCE_RU,
+ JOB_SECURITY_OFFICER_SUPPLY = JOB_SECURITY_OFFICER_SUPPLY_RU,
+ //Engineering
+ JOB_STATION_ENGINEER = JOB_STATION_ENGINEER_RU,
+ JOB_ATMOSPHERIC_TECHNICIAN = JOB_ATMOSPHERIC_TECHNICIAN_RU,
+ //Medical
+ JOB_CORONER = JOB_CORONER_RU,
+ JOB_MEDICAL_DOCTOR = JOB_MEDICAL_DOCTOR_RU,
+ JOB_PARAMEDIC = JOB_PARAMEDIC_RU,
+ JOB_CHEMIST = JOB_CHEMIST_RU,
+ //Science
+ JOB_SCIENTIST = JOB_SCIENTIST_RU,
+ JOB_ROBOTICIST = JOB_ROBOTICIST_RU,
+ JOB_GENETICIST = JOB_GENETICIST_RU,
+ //Supply
+ JOB_QUARTERMASTER = JOB_QUARTERMASTER_RU,
+ JOB_CARGO_TECHNICIAN = JOB_CARGO_TECHNICIAN_RU,
+ JOB_CARGO_GORILLA = JOB_CARGO_GORILLA_RU,
+ JOB_SHAFT_MINER = JOB_SHAFT_MINER_RU,
+ //JOB_BITRUNNER = JOB_BITRUNNER_RU, // TODO: REMOVE COMMENT
+ //Service
+ JOB_BARTENDER = JOB_BARTENDER_RU,
+ JOB_BOTANIST = JOB_BOTANIST_RU,
+ JOB_COOK = JOB_COOK_RU,
+ JOB_CHEF = JOB_CHEF_RU,
+ JOB_JANITOR = JOB_JANITOR_RU,
+ JOB_CLOWN = JOB_CLOWN_RU,
+ JOB_MIME = JOB_MIME_RU,
+ JOB_CURATOR = JOB_CURATOR_RU,
+ JOB_LAWYER = JOB_LAWYER_RU,
+ JOB_CHAPLAIN = JOB_CHAPLAIN_RU,
+ JOB_PSYCHOLOGIST = JOB_PSYCHOLOGIST_RU,
+))
+
+// Use it ONLY for display!!
+/proc/job_title_ru(title)
+ if(GLOB.job_titles_ru[title])
+ return GLOB.job_titles_ru[title]
+ return title
diff --git a/tgstation.dme b/tgstation.dme
index b8e3e7f3249db..9c7d7adc4cd75 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6311,5 +6311,8 @@
#include "interface\fonts\spess_font.dm"
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
-#include "modular_bandastation\modular_bandastation.dme" // BANDASTATION EDIT
+// BANDASTATION EDIT START
+#include "code\__DEFINES\bandastation\bandastation.dm"
+#include "modular_bandastation\modular_bandastation.dme"
+// BANDASTATION EDIT END
// END_INCLUDE
From 5e463af46662ddd50fc3471c9039aeb03e91ccc3 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:11:26 +0300
Subject: [PATCH 02/18] ru ids and pdas
---
modular_bandastation/modular_bandastation.dme | 1 +
modular_bandastation/ru_jobs/_ru_jobs.dm | 4 +
modular_bandastation/ru_jobs/_ru_jobs.dme | 4 +
.../ru_jobs/code/ru_id_cards.dm | 119 ++++++++++++++++++
modular_bandastation/ru_jobs/code/ru_pda.dm | 7 ++
5 files changed, 135 insertions(+)
create mode 100644 modular_bandastation/ru_jobs/_ru_jobs.dm
create mode 100644 modular_bandastation/ru_jobs/_ru_jobs.dme
create mode 100644 modular_bandastation/ru_jobs/code/ru_id_cards.dm
create mode 100644 modular_bandastation/ru_jobs/code/ru_pda.dm
diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme
index ae12e71105846..15cbaef82a810 100644
--- a/modular_bandastation/modular_bandastation.dme
+++ b/modular_bandastation/modular_bandastation.dme
@@ -20,6 +20,7 @@
#include "gunhud/_gunhud.dme"
#include "keybinding/_keybinding.dme"
#include "pixel_shift/_pixel_shift.dme"
+#include "ru_jobs/_ru_jobs.dme"
#include "translations/_translations.dme"
#include "tts/_tts.dme"
#include "whitelist220/_whitelist220.dme"
diff --git a/modular_bandastation/ru_jobs/_ru_jobs.dm b/modular_bandastation/ru_jobs/_ru_jobs.dm
new file mode 100644
index 0000000000000..b8a60fafe62ba
--- /dev/null
+++ b/modular_bandastation/ru_jobs/_ru_jobs.dm
@@ -0,0 +1,4 @@
+/datum/modpack/ru_jobs
+ name = "RU Jobs"
+ desc = "Русские названия профессий"
+ author = "larentoun"
diff --git a/modular_bandastation/ru_jobs/_ru_jobs.dme b/modular_bandastation/ru_jobs/_ru_jobs.dme
new file mode 100644
index 0000000000000..7e06a7229eb36
--- /dev/null
+++ b/modular_bandastation/ru_jobs/_ru_jobs.dme
@@ -0,0 +1,4 @@
+#include "_ru_jobs.dm"
+
+#include "code/ru_id_cards.dm"
+#include "code/ru_pda.dm"
diff --git a/modular_bandastation/ru_jobs/code/ru_id_cards.dm b/modular_bandastation/ru_jobs/code/ru_id_cards.dm
new file mode 100644
index 0000000000000..9136648b851ae
--- /dev/null
+++ b/modular_bandastation/ru_jobs/code/ru_id_cards.dm
@@ -0,0 +1,119 @@
+/datum/id_trim/job/assistant
+ assignment = JOB_ASSISTANT_RU
+
+/datum/id_trim/job/atmospheric_technician
+ assignment = JOB_ATMOSPHERIC_TECHNICIAN_RU
+
+/datum/id_trim/job/bartender
+ assignment = JOB_BARTENDER_RU
+
+/datum/id_trim/job/bitrunner
+ assignment = JOB_BITRUNNER
+
+/datum/id_trim/job/botanist
+ assignment = JOB_BOTANIST_RU
+
+/datum/id_trim/job/captain
+ assignment = JOB_CAPTAIN_RU
+
+/datum/id_trim/job/cargo_technician
+ assignment = JOB_CARGO_TECHNICIAN_RU
+
+/datum/id_trim/job/chaplain
+ assignment = JOB_CHAPLAIN_RU
+
+/datum/id_trim/job/chemist
+ assignment = JOB_CHEMIST_RU
+
+/datum/id_trim/job/chief_engineer
+ assignment = JOB_CHIEF_ENGINEER_RU
+
+/datum/id_trim/job/chief_medical_officer
+ assignment = JOB_CHIEF_MEDICAL_OFFICER_RU
+
+/datum/id_trim/job/clown
+ assignment = JOB_CLOWN_RU
+
+/datum/id_trim/job/cook
+ assignment = JOB_COOK_RU
+
+/datum/id_trim/job/cook/chef
+ assignment = JOB_CHEF_RU
+
+/datum/id_trim/job/coroner
+ assignment = JOB_CORONER_RU
+
+/datum/id_trim/job/curator
+ assignment = JOB_CURATOR_RU
+
+/datum/id_trim/job/detective
+ assignment = JOB_DETECTIVE_RU
+
+/datum/id_trim/job/geneticist
+ assignment = JOB_GENETICIST_RU
+
+/datum/id_trim/job/head_of_personnel
+ assignment = JOB_HEAD_OF_PERSONNEL_RU
+
+/datum/id_trim/job/head_of_security
+ assignment = JOB_HEAD_OF_SECURITY_RU
+
+/datum/id_trim/job/janitor
+ assignment = JOB_JANITOR_RU
+
+/datum/id_trim/job/lawyer
+ assignment = JOB_LAWYER_RU
+
+/datum/id_trim/job/medical_doctor
+ assignment = JOB_MEDICAL_DOCTOR_RU
+
+/datum/id_trim/job/mime
+ assignment = JOB_MIME_RU
+
+/datum/id_trim/job/paramedic
+ assignment = JOB_PARAMEDIC_RU
+
+/datum/id_trim/job/prisoner
+ assignment = JOB_PRISONER_RU
+
+/datum/id_trim/job/psychologist
+ assignment = JOB_PSYCHOLOGIST_RU
+
+/datum/id_trim/job/quartermaster
+ assignment = JOB_QUARTERMASTER_RU
+
+/datum/id_trim/job/research_director
+ assignment = JOB_RESEARCH_DIRECTOR_RU
+
+/datum/id_trim/job/roboticist
+ assignment = JOB_ROBOTICIST_RU
+
+/datum/id_trim/job/scientist
+ assignment = JOB_SCIENTIST_RU
+
+/datum/id_trim/job/security_officer
+ assignment = JOB_SECURITY_OFFICER_RU
+
+/datum/id_trim/job/security_officer/supply
+ assignment = JOB_SECURITY_OFFICER_SUPPLY_RU
+
+/datum/id_trim/job/security_officer/engineering
+ assignment = JOB_SECURITY_OFFICER_ENGINEERING_RU
+
+/datum/id_trim/job/security_officer/medical
+ assignment = JOB_SECURITY_OFFICER_MEDICAL_RU
+
+/datum/id_trim/job/security_officer/science
+ assignment = JOB_SECURITY_OFFICER_SCIENCE_RU
+
+/datum/id_trim/job/shaft_miner
+ assignment = JOB_SHAFT_MINER_RU
+
+/datum/id_trim/job/station_engineer
+ assignment = JOB_STATION_ENGINEER_RU
+
+/datum/id_trim/job/warden
+ assignment = JOB_WARDEN_RU
+
+/datum/id_trim/job/human_ai
+ assignment = JOB_HUMAN_AI_RU
diff --git a/modular_bandastation/ru_jobs/code/ru_pda.dm b/modular_bandastation/ru_jobs/code/ru_pda.dm
new file mode 100644
index 0000000000000..93f397821f103
--- /dev/null
+++ b/modular_bandastation/ru_jobs/code/ru_pda.dm
@@ -0,0 +1,7 @@
+// Update PDA name
+/datum/outfit/job/post_equip(mob/living/carbon/human/equipped, visualsOnly)
+ . = ..()
+ var/obj/item/card/id/card = equipped.wear_id
+ if(istype(card))
+ var/obj/item/modular_computer/pda/pda = equipped.get_item_by_slot(pda_slot)
+ pda.imprint_id(equipped.real_name, card.get_trim_assignment())
From 2fd6239eb62c25ee6e7c0c33acf07a1a5a2785eb Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:20:52 +0300
Subject: [PATCH 03/18] fix runtimes
---
modular_bandastation/ru_jobs/code/ru_pda.dm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/modular_bandastation/ru_jobs/code/ru_pda.dm b/modular_bandastation/ru_jobs/code/ru_pda.dm
index 93f397821f103..07bb67d8b8761 100644
--- a/modular_bandastation/ru_jobs/code/ru_pda.dm
+++ b/modular_bandastation/ru_jobs/code/ru_pda.dm
@@ -1,7 +1,10 @@
// Update PDA name
/datum/outfit/job/post_equip(mob/living/carbon/human/equipped, visualsOnly)
. = ..()
+ var/obj/item/modular_computer/pda/pda = equipped.get_item_by_slot(pda_slot)
+ if(!istype(pda))
+ return
var/obj/item/card/id/card = equipped.wear_id
- if(istype(card))
- var/obj/item/modular_computer/pda/pda = equipped.get_item_by_slot(pda_slot)
- pda.imprint_id(equipped.real_name, card.get_trim_assignment())
+ if(!istype(card))
+ return
+ pda.imprint_id(equipped.real_name, card.get_trim_assignment())
From 0e0a4e3541c4c8d380551f31a2f14f75874651c6 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:47:54 +0300
Subject: [PATCH 04/18] show ru jobs in prefs and latejoin
---
code/__DEFINES/bandastation/bandastation.dm | 5 +-
.../packages/tgui/interfaces/JobSelection.tsx | 9 +++-
.../interfaces/PreferencesMenu/JobsPage.tsx | 46 ++++++++++++++++++-
3 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/code/__DEFINES/bandastation/bandastation.dm b/code/__DEFINES/bandastation/bandastation.dm
index f4de4f2c6e977..10fd1a69ed1fc 100644
--- a/code/__DEFINES/bandastation/bandastation.dm
+++ b/code/__DEFINES/bandastation/bandastation.dm
@@ -1,3 +1,4 @@
+// Keep this in sync with JOBS_RU from tgui\packages\tgui\interfaces\PreferencesMenu\JobsPage.tsx
//No department
#define JOB_ASSISTANT_RU "Гражданский"
#define JOB_PRISONER_RU "Заключенный"
@@ -40,7 +41,7 @@
#define JOB_CARGO_TECHNICIAN_RU "Грузчик"
#define JOB_CARGO_GORILLA_RU "Cargo Gorilla"
#define JOB_SHAFT_MINER_RU "Шахтер"
-//#define JOB_BITRUNNER_RU "Битраннер" // TODO: REMOVE COMMENT
+#define JOB_BITRUNNER_RU "Битраннер"
//Service
#define JOB_BARTENDER_RU "Бармен"
#define JOB_BOTANIST_RU "Ботаник"
@@ -97,7 +98,7 @@ GLOBAL_LIST_INIT(job_titles_ru, list(
JOB_CARGO_TECHNICIAN = JOB_CARGO_TECHNICIAN_RU,
JOB_CARGO_GORILLA = JOB_CARGO_GORILLA_RU,
JOB_SHAFT_MINER = JOB_SHAFT_MINER_RU,
- //JOB_BITRUNNER = JOB_BITRUNNER_RU, // TODO: REMOVE COMMENT
+ JOB_BITRUNNER = JOB_BITRUNNER_RU,
//Service
JOB_BARTENDER = JOB_BARTENDER_RU,
JOB_BOTANIST = JOB_BOTANIST_RU,
diff --git a/tgui/packages/tgui/interfaces/JobSelection.tsx b/tgui/packages/tgui/interfaces/JobSelection.tsx
index 44f7c8194f70a..8b3f07efd2744 100644
--- a/tgui/packages/tgui/interfaces/JobSelection.tsx
+++ b/tgui/packages/tgui/interfaces/JobSelection.tsx
@@ -13,6 +13,7 @@ import {
} from '../components';
import { Window } from '../layouts';
import { JOB2ICON } from './common/JobToIcon';
+import { JOBS_RU } from './PreferencesMenu/JobsPage'; // BANDASTATION EDIT
type Job = {
unavailable_reason: string | null;
@@ -84,7 +85,13 @@ export const JobEntry = (data: {
>
<>
{jobIcon && }
- {job.command ? {jobName} : jobName}
+ {job.command ? (
+ {JOBS_RU[jobName] ? JOBS_RU[jobName] : jobName}
+ ) : JOBS_RU[jobName] ? (
+ JOBS_RU[jobName]
+ ) : (
+ jobName
+ )}
{
paddingLeft: '0.3em',
}}
>
- {name}
+ {JOBS_RU[name] ? JOBS_RU[name] : name}
@@ -407,3 +407,47 @@ export const JobsPage = () => {
);
};
+
+// BANDASTATION EDIT START
+
+export const JOBS_RU = {
+ Assistant: 'Гражданский',
+ Prisoner: 'Заключенный',
+ Captain: 'Капитан',
+ 'Head of Personnel': 'Глава персонала',
+ 'Head of Security': 'Глава службы безопасности',
+ 'Research Director': 'Директор исследований',
+ 'Chief Engineer': 'Главный инженер',
+ 'Chief Medical Officer': 'Главный врач',
+ AI: 'ИИ',
+ Cyborg: 'Киборг',
+ 'Personal AI': 'Персональный ИИ',
+ 'Human AI': 'Большой брат',
+ Warden: 'Смотритель',
+ Detective: 'Детектив',
+ 'Security Officer': 'Офицер',
+ 'Station Engineer': 'Станционный инженер',
+ 'Atmospheric Technician': 'Атмосферный техник',
+ Coroner: 'Коронер',
+ 'Medical Doctor': 'Врач',
+ Paramedic: 'Парамедик',
+ Chemist: 'Химик',
+ Scientist: 'Ученый',
+ Roboticist: 'Робототехник',
+ Geneticist: 'Генетик',
+ Quartermaster: 'Квартирмейстер',
+ 'Cargo Technician': 'Грузчик',
+ 'Shaft Miner': 'Шахтер',
+ Bitrunner: 'Битраннер',
+ Bartender: 'Бармен',
+ Botanist: 'Ботаник',
+ Cook: 'Повар',
+ Chef: 'Шеф',
+ Janitor: 'Уборщик',
+ Clown: 'Клоун',
+ Mime: 'Мим',
+ Curator: 'Куратор',
+ Lawyer: 'Адвокат',
+ Chaplain: 'Священник',
+ Psychologist: 'Психолог',
+};
From afc65e9912e1e1e27d2b6239388e504039e06281 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:51:25 +0300
Subject: [PATCH 05/18] overlow translate
---
tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
index 2942cf2049df7..b7b9d2431f1cb 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
@@ -317,7 +317,7 @@ const JoblessRoleDropdown = (props) => {
const options = [
{
- displayText: `Join as ${data.overflow_role} if unavailable`,
+ displayText: `Join as ${JOBS_RU[data.overflow_role] ? JOBS_RU[data.overflow_role] : data.overflow_role} if unavailable`,
value: JoblessRole.BeOverflow,
},
{
From 66449a2c7b0cb1896ee5e91d7871dc73b1443490 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:04:07 +0300
Subject: [PATCH 06/18] move ru jobs to different file
---
tgui/packages/tgui/bandastation/ru_jobs.tsx | 41 +++++++++++++++++
.../packages/tgui/interfaces/JobSelection.tsx | 2 +-
.../interfaces/PreferencesMenu/JobsPage.tsx | 45 +------------------
3 files changed, 43 insertions(+), 45 deletions(-)
create mode 100644 tgui/packages/tgui/bandastation/ru_jobs.tsx
diff --git a/tgui/packages/tgui/bandastation/ru_jobs.tsx b/tgui/packages/tgui/bandastation/ru_jobs.tsx
new file mode 100644
index 0000000000000..792ae2ce93b3f
--- /dev/null
+++ b/tgui/packages/tgui/bandastation/ru_jobs.tsx
@@ -0,0 +1,41 @@
+export const JOBS_RU = {
+ Assistant: 'Гражданский',
+ Prisoner: 'Заключенный',
+ Captain: 'Капитан',
+ 'Head of Personnel': 'Глава персонала',
+ 'Head of Security': 'Глава службы безопасности',
+ 'Research Director': 'Директор исследований',
+ 'Chief Engineer': 'Главный инженер',
+ 'Chief Medical Officer': 'Главный врач',
+ AI: 'ИИ',
+ Cyborg: 'Киборг',
+ 'Personal AI': 'Персональный ИИ',
+ 'Human AI': 'Большой брат',
+ Warden: 'Смотритель',
+ Detective: 'Детектив',
+ 'Security Officer': 'Офицер',
+ 'Station Engineer': 'Станционный инженер',
+ 'Atmospheric Technician': 'Атмосферный техник',
+ Coroner: 'Коронер',
+ 'Medical Doctor': 'Врач',
+ Paramedic: 'Парамедик',
+ Chemist: 'Химик',
+ Scientist: 'Ученый',
+ Roboticist: 'Робототехник',
+ Geneticist: 'Генетик',
+ Quartermaster: 'Квартирмейстер',
+ 'Cargo Technician': 'Грузчик',
+ 'Shaft Miner': 'Шахтер',
+ Bitrunner: 'Битраннер',
+ Bartender: 'Бармен',
+ Botanist: 'Ботаник',
+ Cook: 'Повар',
+ Chef: 'Шеф',
+ Janitor: 'Уборщик',
+ Clown: 'Клоун',
+ Mime: 'Мим',
+ Curator: 'Куратор',
+ Lawyer: 'Адвокат',
+ Chaplain: 'Священник',
+ Psychologist: 'Психолог',
+};
diff --git a/tgui/packages/tgui/interfaces/JobSelection.tsx b/tgui/packages/tgui/interfaces/JobSelection.tsx
index 8b3f07efd2744..84bc411606dc8 100644
--- a/tgui/packages/tgui/interfaces/JobSelection.tsx
+++ b/tgui/packages/tgui/interfaces/JobSelection.tsx
@@ -3,6 +3,7 @@ import { Color } from 'common/color';
import { BooleanLike } from 'common/react';
import { useBackend } from '../backend';
+import { JOBS_RU } from '../bandastation/ru_jobs'; // BANDASTATION EDIT
import {
Box,
Button,
@@ -13,7 +14,6 @@ import {
} from '../components';
import { Window } from '../layouts';
import { JOB2ICON } from './common/JobToIcon';
-import { JOBS_RU } from './PreferencesMenu/JobsPage'; // BANDASTATION EDIT
type Job = {
unavailable_reason: string | null;
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
index b7b9d2431f1cb..379e62b77a99d 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
@@ -3,6 +3,7 @@ import { classes } from 'common/react';
import { PropsWithChildren, ReactNode } from 'react';
import { useBackend } from '../../backend';
+import { JOBS_RU } from '../../bandastation/ru_jobs'; // BANDASTATION EDIT
import { Box, Button, Dropdown, Stack, Tooltip } from '../../components';
import {
createSetPreference,
@@ -407,47 +408,3 @@ export const JobsPage = () => {
);
};
-
-// BANDASTATION EDIT START
-
-export const JOBS_RU = {
- Assistant: 'Гражданский',
- Prisoner: 'Заключенный',
- Captain: 'Капитан',
- 'Head of Personnel': 'Глава персонала',
- 'Head of Security': 'Глава службы безопасности',
- 'Research Director': 'Директор исследований',
- 'Chief Engineer': 'Главный инженер',
- 'Chief Medical Officer': 'Главный врач',
- AI: 'ИИ',
- Cyborg: 'Киборг',
- 'Personal AI': 'Персональный ИИ',
- 'Human AI': 'Большой брат',
- Warden: 'Смотритель',
- Detective: 'Детектив',
- 'Security Officer': 'Офицер',
- 'Station Engineer': 'Станционный инженер',
- 'Atmospheric Technician': 'Атмосферный техник',
- Coroner: 'Коронер',
- 'Medical Doctor': 'Врач',
- Paramedic: 'Парамедик',
- Chemist: 'Химик',
- Scientist: 'Ученый',
- Roboticist: 'Робототехник',
- Geneticist: 'Генетик',
- Quartermaster: 'Квартирмейстер',
- 'Cargo Technician': 'Грузчик',
- 'Shaft Miner': 'Шахтер',
- Bitrunner: 'Битраннер',
- Bartender: 'Бармен',
- Botanist: 'Ботаник',
- Cook: 'Повар',
- Chef: 'Шеф',
- Janitor: 'Уборщик',
- Clown: 'Клоун',
- Mime: 'Мим',
- Curator: 'Куратор',
- Lawyer: 'Адвокат',
- Chaplain: 'Священник',
- Psychologist: 'Психолог',
-};
From bd69d6cf16251e51029347072dc075ad1fb9414c Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:05:02 +0300
Subject: [PATCH 07/18] full dep names for officers
---
code/__DEFINES/bandastation/bandastation.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/__DEFINES/bandastation/bandastation.dm b/code/__DEFINES/bandastation/bandastation.dm
index 10fd1a69ed1fc..138050d72cddf 100644
--- a/code/__DEFINES/bandastation/bandastation.dm
+++ b/code/__DEFINES/bandastation/bandastation.dm
@@ -1,4 +1,4 @@
-// Keep this in sync with JOBS_RU from tgui\packages\tgui\interfaces\PreferencesMenu\JobsPage.tsx
+// Keep this in sync with JOBS_RU from tgui\packages\tgui\bandastation\ru_jobs.tsx
//No department
#define JOB_ASSISTANT_RU "Гражданский"
#define JOB_PRISONER_RU "Заключенный"
@@ -20,10 +20,10 @@
#define JOB_WARDEN_RU "Смотритель"
#define JOB_DETECTIVE_RU "Детектив"
#define JOB_SECURITY_OFFICER_RU "Офицер"
-#define JOB_SECURITY_OFFICER_MEDICAL_RU "Офицер (Медицинский)"
-#define JOB_SECURITY_OFFICER_ENGINEERING_RU "Офицер (Инженерный)"
-#define JOB_SECURITY_OFFICER_SCIENCE_RU "Офицер (Исследований)"
-#define JOB_SECURITY_OFFICER_SUPPLY_RU "Офицер (Снабжения)"
+#define JOB_SECURITY_OFFICER_MEDICAL_RU "Офицер (Медицинский отдел)"
+#define JOB_SECURITY_OFFICER_ENGINEERING_RU "Офицер (Инженерный отдел)"
+#define JOB_SECURITY_OFFICER_SCIENCE_RU "Офицер (Отдел исследований)"
+#define JOB_SECURITY_OFFICER_SUPPLY_RU "Офицер (Отдел снабжения)"
//Engineering
#define JOB_STATION_ENGINEER_RU "Станционный инженер"
#define JOB_ATMOSPHERIC_TECHNICIAN_RU "Атмосферный техник"
From 12128ee4b218def842461533b1d56bec6f3c5b73 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:06:33 +0300
Subject: [PATCH 08/18] rename dm file
---
code/__DEFINES/bandastation/{bandastation.dm => ru_jobs.dm} | 0
tgstation.dme | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename code/__DEFINES/bandastation/{bandastation.dm => ru_jobs.dm} (100%)
diff --git a/code/__DEFINES/bandastation/bandastation.dm b/code/__DEFINES/bandastation/ru_jobs.dm
similarity index 100%
rename from code/__DEFINES/bandastation/bandastation.dm
rename to code/__DEFINES/bandastation/ru_jobs.dm
diff --git a/tgstation.dme b/tgstation.dme
index 9c7d7adc4cd75..a7dd425367516 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6312,7 +6312,7 @@
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
// BANDASTATION EDIT START
-#include "code\__DEFINES\bandastation\bandastation.dm"
+#include "code\__DEFINES\bandastation\ru_jobs.dm"
#include "modular_bandastation\modular_bandastation.dme"
// BANDASTATION EDIT END
// END_INCLUDE
From f5b504d8d78e201c7a6b2bff2276774ef8c5cde8 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:16:55 +0300
Subject: [PATCH 09/18] add departments support for latejoin
---
tgui/packages/tgui/bandastation/ru_jobs.tsx | 12 ++++++++++++
tgui/packages/tgui/interfaces/JobSelection.tsx | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/tgui/packages/tgui/bandastation/ru_jobs.tsx b/tgui/packages/tgui/bandastation/ru_jobs.tsx
index 792ae2ce93b3f..d8efbc9ed288f 100644
--- a/tgui/packages/tgui/bandastation/ru_jobs.tsx
+++ b/tgui/packages/tgui/bandastation/ru_jobs.tsx
@@ -39,3 +39,15 @@ export const JOBS_RU = {
Chaplain: 'Священник',
Psychologist: 'Психолог',
};
+
+export const DEPARTMENTS_RU = {
+ Command: 'Командование',
+ Security: 'Безопасность',
+ Service: 'Обслуживание',
+ Cargo: 'Снабжение',
+ Science: 'Исследование',
+ Medical: 'Медицина',
+ Silicon: 'Синтетики',
+ Engineering: 'Инженерия',
+ 'No Department': 'Без отдела',
+};
diff --git a/tgui/packages/tgui/interfaces/JobSelection.tsx b/tgui/packages/tgui/interfaces/JobSelection.tsx
index 84bc411606dc8..70f7c239ffe87 100644
--- a/tgui/packages/tgui/interfaces/JobSelection.tsx
+++ b/tgui/packages/tgui/interfaces/JobSelection.tsx
@@ -3,7 +3,7 @@ import { Color } from 'common/color';
import { BooleanLike } from 'common/react';
import { useBackend } from '../backend';
-import { JOBS_RU } from '../bandastation/ru_jobs'; // BANDASTATION EDIT
+import { DEPARTMENTS_RU, JOBS_RU } from '../bandastation/ru_jobs'; // BANDASTATION EDIT
import {
Box,
Button,
@@ -150,7 +150,9 @@ export const JobSelection = (props) => {
- {departmentName}
+ {DEPARTMENTS_RU[departmentName]
+ ? DEPARTMENTS_RU[departmentName]
+ : departmentName}
Date: Thu, 11 Jul 2024 23:32:08 +0300
Subject: [PATCH 10/18] use wiki for secs deps
---
code/__DEFINES/bandastation/ru_jobs.dm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/__DEFINES/bandastation/ru_jobs.dm b/code/__DEFINES/bandastation/ru_jobs.dm
index 138050d72cddf..b14d9a9e29377 100644
--- a/code/__DEFINES/bandastation/ru_jobs.dm
+++ b/code/__DEFINES/bandastation/ru_jobs.dm
@@ -20,10 +20,10 @@
#define JOB_WARDEN_RU "Смотритель"
#define JOB_DETECTIVE_RU "Детектив"
#define JOB_SECURITY_OFFICER_RU "Офицер"
-#define JOB_SECURITY_OFFICER_MEDICAL_RU "Офицер (Медицинский отдел)"
-#define JOB_SECURITY_OFFICER_ENGINEERING_RU "Офицер (Инженерный отдел)"
-#define JOB_SECURITY_OFFICER_SCIENCE_RU "Офицер (Отдел исследований)"
-#define JOB_SECURITY_OFFICER_SUPPLY_RU "Офицер (Отдел снабжения)"
+#define JOB_SECURITY_OFFICER_MEDICAL_RU "Офицер (Медицина)"
+#define JOB_SECURITY_OFFICER_ENGINEERING_RU "Офицер (Инженерия)"
+#define JOB_SECURITY_OFFICER_SCIENCE_RU "Офицер (Исследование)"
+#define JOB_SECURITY_OFFICER_SUPPLY_RU "Офицер (Снабжение)"
//Engineering
#define JOB_STATION_ENGINEER_RU "Станционный инженер"
#define JOB_ATMOSPHERIC_TECHNICIAN_RU "Атмосферный техник"
From adeefc25d2c2a0dcec9dda618f28addf9190ae50 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:32:24 +0300
Subject: [PATCH 11/18] assign departments in plexagon
---
modular_bandastation/ru_jobs/_ru_jobs.dme | 1 +
modular_bandastation/ru_jobs/code/ru_jobs.dm | 111 +++++++++++++++++++
2 files changed, 112 insertions(+)
create mode 100644 modular_bandastation/ru_jobs/code/ru_jobs.dm
diff --git a/modular_bandastation/ru_jobs/_ru_jobs.dme b/modular_bandastation/ru_jobs/_ru_jobs.dme
index 7e06a7229eb36..8377d94602bb2 100644
--- a/modular_bandastation/ru_jobs/_ru_jobs.dme
+++ b/modular_bandastation/ru_jobs/_ru_jobs.dme
@@ -1,4 +1,5 @@
#include "_ru_jobs.dm"
#include "code/ru_id_cards.dm"
+#include "code/ru_jobs.dm"
#include "code/ru_pda.dm"
diff --git a/modular_bandastation/ru_jobs/code/ru_jobs.dm b/modular_bandastation/ru_jobs/code/ru_jobs.dm
new file mode 100644
index 0000000000000..c5a5e2f325259
--- /dev/null
+++ b/modular_bandastation/ru_jobs/code/ru_jobs.dm
@@ -0,0 +1,111 @@
+/datum/job/ai
+ alternate_titles = list(JOB_AI_RU,)
+
+/datum/job/atmospheric_technician
+ alternate_titles = list(JOB_ATMOSPHERIC_TECHNICIAN_RU,)
+
+/datum/job/bartender
+ alternate_titles = list(JOB_BARTENDER_RU,)
+
+/datum/job/botanist
+ alternate_titles = list(JOB_BOTANIST_RU,)
+
+/datum/job/captain
+ alternate_titles = list(JOB_CAPTAIN_RU,)
+
+/datum/job/cargo_technician
+ alternate_titles = list(JOB_CARGO_TECHNICIAN_RU,)
+
+/datum/job/chemist
+ alternate_titles = list(JOB_CHEMIST_RU,)
+
+/datum/job/chief_engineer
+ alternate_titles = list(JOB_CHIEF_ENGINEER_RU,)
+
+/datum/job/chief_medical_officer
+ alternate_titles = list(JOB_CHIEF_MEDICAL_OFFICER_RU,)
+
+/datum/job/clown
+ alternate_titles = list(JOB_CLOWN_RU,)
+
+/datum/job/cook
+ alternate_titles = list(
+ JOB_CHEF,
+ JOB_COOK_RU,
+ )
+
+/datum/job/coroner
+ alternate_titles = list(JOB_CORONER_RU,)
+
+/datum/job/curator
+ alternate_titles = list(JOB_CURATOR_RU,)
+
+/datum/job/cyborg
+ alternate_titles = list(JOB_CYBORG_RU,)
+
+/datum/job/detective
+ alternate_titles = list(JOB_DETECTIVE_RU,)
+
+/datum/job/geneticist
+ alternate_titles = list(JOB_GENETICIST_RU,)
+
+/datum/job/head_of_personnel
+ alternate_titles = list(JOB_HEAD_OF_PERSONNEL_RU,)
+
+/datum/job/head_of_security
+ alternate_titles = list(JOB_HEAD_OF_SECURITY_RU,)
+
+/datum/job/janitor
+ alternate_titles = list(JOB_JANITOR_RU,)
+
+/datum/job/lawyer
+ alternate_titles = list(JOB_LAWYER_RU,)
+
+/datum/job/doctor
+ alternate_titles = list(JOB_MEDICAL_DOCTOR_RU,)
+
+/datum/job/mime
+ alternate_titles = list(JOB_MIME_RU,)
+
+/datum/job/paramedic
+ alternate_titles = list(JOB_PARAMEDIC_RU,)
+
+/datum/job/prisoner
+ alternate_titles = list(JOB_PRISONER_RU,)
+
+/datum/job/psychologist
+ alternate_titles = list(JOB_PSYCHOLOGIST_RU,)
+
+/datum/job/quartermaster
+ alternate_titles = list(JOB_QUARTERMASTER_RU,)
+
+/datum/job/research_director
+ alternate_titles = list(JOB_RESEARCH_DIRECTOR_RU,)
+
+/datum/job/roboticist
+ alternate_titles = list(JOB_ROBOTICIST_RU,)
+
+/datum/job/scientist
+ alternate_titles = list(JOB_SCIENTIST_RU,)
+
+/datum/job/security_officer
+ alternate_titles = list(
+ JOB_SECURITY_OFFICER_MEDICAL,
+ JOB_SECURITY_OFFICER_ENGINEERING,
+ JOB_SECURITY_OFFICER_SUPPLY,
+ JOB_SECURITY_OFFICER_SCIENCE,
+ JOB_SECURITY_OFFICER_RU,
+ JOB_SECURITY_OFFICER_MEDICAL_RU,
+ JOB_SECURITY_OFFICER_ENGINEERING_RU,
+ JOB_SECURITY_OFFICER_SUPPLY_RU,
+ JOB_SECURITY_OFFICER_SCIENCE_RU,
+ )
+
+/datum/job/shaft_miner
+ alternate_titles = list(JOB_SHAFT_MINER_RU,)
+
+/datum/job/station_engineer
+ alternate_titles = list(JOB_STATION_ENGINEER_RU,)
+
+/datum/job/warden
+ alternate_titles = list(JOB_WARDEN_RU,)
From 2c91ca76bfffb9cc45f476004742c8d0b0b8cb9b Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:32:35 +0300
Subject: [PATCH 12/18] plexagon ru departments
---
tgui/packages/tgui/interfaces/NtosCrewManifest.jsx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx b/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
index 74485397c2df4..70ce115b2c264 100644
--- a/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
+++ b/tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
@@ -1,6 +1,7 @@
import { map } from 'common/collections';
import { useBackend } from '../backend';
+import { DEPARTMENTS_RU } from '../bandastation/ru_jobs'; // BANDASTATION EDIT
import { Button, Section, Table } from '../components';
import { NtosWindow } from '../layouts';
@@ -21,7 +22,15 @@ export const NtosCrewManifest = (props) => {
}
>
{map(manifest, (entries, department) => (
-
+
{entries.map((entry) => (
From a6998f5945c07d7e97b3b34d7257573ed07ca5b0 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:34:29 +0300
Subject: [PATCH 13/18] review
---
code/__DEFINES/bandastation/ru_jobs.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/__DEFINES/bandastation/ru_jobs.dm b/code/__DEFINES/bandastation/ru_jobs.dm
index b14d9a9e29377..1b78a2283032d 100644
--- a/code/__DEFINES/bandastation/ru_jobs.dm
+++ b/code/__DEFINES/bandastation/ru_jobs.dm
@@ -115,6 +115,7 @@ GLOBAL_LIST_INIT(job_titles_ru, list(
// Use it ONLY for display!!
/proc/job_title_ru(title)
- if(GLOB.job_titles_ru[title])
- return GLOB.job_titles_ru[title]
+ var/job_ru_title = GLOB.job_titles_ru[title]
+ if(job_ru_title)
+ return job_ru_title
return title
From d8f4867b0a7ddc2f18daf57fd14ad33baf54cc4e Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:40:14 +0300
Subject: [PATCH 14/18] better ci?
---
tgstation.dme | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tgstation.dme b/tgstation.dme
index a7dd425367516..2c142026188b0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -285,6 +285,7 @@
#include "code\__DEFINES\atmospherics\atmos_mapping_helpers.dm"
#include "code\__DEFINES\atmospherics\atmos_mob_interaction.dm"
#include "code\__DEFINES\atmospherics\atmos_piping.dm"
+#include "code\__DEFINES\bandastation\ru_jobs.dm" // BANDASTATION EDIT
#include "code\__DEFINES\construction\actions.dm"
#include "code\__DEFINES\construction\material.dm"
#include "code\__DEFINES\construction\rcd.dm"
@@ -6311,8 +6312,5 @@
#include "interface\fonts\spess_font.dm"
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
-// BANDASTATION EDIT START
-#include "code\__DEFINES\bandastation\ru_jobs.dm"
-#include "modular_bandastation\modular_bandastation.dme"
-// BANDASTATION EDIT END
+#include "modular_bandastation\modular_bandastation.dme" // BANDASTATION EDIT
// END_INCLUDE
From fa7b9a5d5fbdc00c62e5db73fd0075eaad7942f6 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:46:10 +0300
Subject: [PATCH 15/18] ci, stop bullying me
---
tgstation.dme | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tgstation.dme b/tgstation.dme
index 2c142026188b0..0e0e3511e6d42 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -285,7 +285,9 @@
#include "code\__DEFINES\atmospherics\atmos_mapping_helpers.dm"
#include "code\__DEFINES\atmospherics\atmos_mob_interaction.dm"
#include "code\__DEFINES\atmospherics\atmos_piping.dm"
-#include "code\__DEFINES\bandastation\ru_jobs.dm" // BANDASTATION EDIT
+// BANDASTATION EDIT START
+#include "code\__DEFINES\bandastation\ru_jobs.dm"
+// BANDASTATION EDIT END
#include "code\__DEFINES\construction\actions.dm"
#include "code\__DEFINES\construction\material.dm"
#include "code\__DEFINES\construction\rcd.dm"
From 03727e61e76c850e1cd510a57107cde1bb0c8b21 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:49:16 +0300
Subject: [PATCH 16/18] add readme with modified files
---
modular_bandastation/ru_jobs/README.md | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 modular_bandastation/ru_jobs/README.md
diff --git a/modular_bandastation/ru_jobs/README.md b/modular_bandastation/ru_jobs/README.md
new file mode 100644
index 0000000000000..54a55275e6ed0
--- /dev/null
+++ b/modular_bandastation/ru_jobs/README.md
@@ -0,0 +1,10 @@
+PR: https://github.com/ss220club/Bandastation/pull/343
+
+Modified:
+- tgui/packages/tgui/interfaces/JobSelection.tsx
+- tgui/packages/tgui/interfaces/NtosCrewManifest.jsx
+- tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
+
+Out-of-module:
+- code/__DEFINES/bandastation/ru_jobs.dm
+- tgui/packages/tgui/bandastation/ru_jobs.tsx
From 3ef0df532ca1ba47d7fca642a7f280c21c342378 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Thu, 11 Jul 2024 23:52:08 +0300
Subject: [PATCH 17/18] ci, i beg of you
---
tgstation.dme | 2 --
1 file changed, 2 deletions(-)
diff --git a/tgstation.dme b/tgstation.dme
index 0e0e3511e6d42..574adb488ea74 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -285,9 +285,7 @@
#include "code\__DEFINES\atmospherics\atmos_mapping_helpers.dm"
#include "code\__DEFINES\atmospherics\atmos_mob_interaction.dm"
#include "code\__DEFINES\atmospherics\atmos_piping.dm"
-// BANDASTATION EDIT START
#include "code\__DEFINES\bandastation\ru_jobs.dm"
-// BANDASTATION EDIT END
#include "code\__DEFINES\construction\actions.dm"
#include "code\__DEFINES\construction\material.dm"
#include "code\__DEFINES\construction\rcd.dm"
From 2b77c9ed009447a84e6394c583cf1fe1d8658805 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Fri, 12 Jul 2024 00:08:22 +0300
Subject: [PATCH 18/18] translate it all
---
tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
index 379e62b77a99d..b0c8190de6888 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx
@@ -318,7 +318,7 @@ const JoblessRoleDropdown = (props) => {
const options = [
{
- displayText: `Join as ${JOBS_RU[data.overflow_role] ? JOBS_RU[data.overflow_role] : data.overflow_role} if unavailable`,
+ displayText: `Присоединиться за ${JOBS_RU[data.overflow_role] ? JOBS_RU[data.overflow_role] : data.overflow_role} если не удалось войти`,
value: JoblessRole.BeOverflow,
},
{