From cbd771cda1775441c2344981541c11c8eb38c85d Mon Sep 17 00:00:00 2001 From: ZoNeSRuS Date: Tue, 4 Nov 2025 10:25:10 +0700 Subject: [PATCH 1/3] Fist --- .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 22 ++++- .../Preferences/HumanoidCharacterProfile.cs | 67 +++++++++++++++ .../Prototypes/EmployerPrototype.cs | 4 + .../Prototypes/LifepathPrototype.cs | 4 + .../Prototypes/NationalityPrototype.cs | 5 +- .../en-US/_EE/contractors/backgrounds.ftl | 4 + .../Locale/en-US/_EE/contractors/employer.ftl | 51 ++++-------- .../customization/character-requirements.ftl | 7 +- .../ru-RU/_EE/contractors/backgrounds.ftl | 4 + .../Locale/ru-RU/_EE/contractors/employer.ftl | 62 ++++---------- .../customization/character-requirements.ftl | 7 +- .../Jobs/\320\241orporations/CnsOfficer.yml" | 6 +- .../CnsRepresentative.yml" | 7 +- .../Jobs/Command/administrative_assistant.yml | 3 +- .../Roles/Jobs/Justice/chief_justice.yml | 6 +- .../DeltaV/Roles/Jobs/Justice/clerk.yml | 5 +- .../DeltaV/Roles/Jobs/Justice/prosecutor.yml | 4 +- .../DeltaV/Roles/Jobs/Security/brigmedic.yml | 5 +- .../Prototypes/Loadouts/Generic/items.yml | 2 +- .../Loadouts/Generic/outerClothing.yml | 14 ++-- .../Loadouts/Jobs/Command/nanorep.yml | 14 ++-- .../Engineering/atmosphericTechnician.yml | 4 +- .../Jobs/Engineering/stationEngineer.yml | 4 +- .../Jobs/Engineering/technicalAssistant.yml | 4 +- .../Loadouts/Jobs/Epistemics/golemancer.yml | 2 +- .../Jobs/Logistics/cargoTechnician.yml | 4 +- .../Jobs/Logistics/salvageSpecialist.yml | 2 +- .../Loadouts/Jobs/Security/detective.yml | 6 +- .../Loadouts/Jobs/Security/uncategorized.yml | 16 ++-- .../Loadouts/Jobs/Security/warden.yml | 2 +- .../Loadouts/Jobs/Service/botanist.yml | 10 +-- .../Roles/Jobs/Cargo/mail_carrier.yml | 3 +- .../Roles/Jobs/Epistemics/forensicmantis.yml | 4 +- .../Roles/Jobs/Security/prisonguard.yml | 4 +- .../Roles/Jobs/Cargo/cargo_technician.yml | 3 +- .../Roles/Jobs/Cargo/quartermaster.yml | 7 +- .../Roles/Jobs/Cargo/salvage_specialist.yml | 4 +- .../Roles/Jobs/Civilian/bartender.yml | 4 +- .../Roles/Jobs/Civilian/botanist.yml | 4 +- .../Roles/Jobs/Civilian/chaplain.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 4 +- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 6 +- .../Roles/Jobs/Civilian/service_worker.yml | 2 +- .../Prototypes/Roles/Jobs/Command/captain.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 3 +- .../Engineering/atmospheric_technician.yml | 5 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 7 +- .../Jobs/Engineering/senior_engineer.yml | 5 +- .../Jobs/Engineering/station_engineer.yml | 5 +- .../Jobs/Engineering/technical_assistant.yml | 5 +- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 4 +- .../Jobs/Medical/chief_medical_officer.yml | 7 +- .../Roles/Jobs/Medical/medical_doctor.yml | 4 +- .../Roles/Jobs/Medical/medical_intern.yml | 4 +- .../Roles/Jobs/Medical/paramedic.yml | 4 +- .../Roles/Jobs/Medical/senior_physician.yml | 4 +- .../Roles/Jobs/Science/research_assistant.yml | 4 +- .../Roles/Jobs/Science/roboticist.yml | 11 +-- .../Roles/Jobs/Science/scientist.yml | 4 +- .../Roles/Jobs/Science/senior_researcher.yml | 4 +- .../Roles/Jobs/Security/detective.yml | 6 +- .../Roles/Jobs/Security/head_of_security.yml | 6 +- .../Roles/Jobs/Security/security_cadet.yml | 6 +- .../Roles/Jobs/Security/security_officer.yml | 7 +- .../Roles/Jobs/Security/senior_officer.yml | 6 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 6 +- .../Roles/Jobs/Wildcards/psychologist.yml | 3 +- .../Roles/Jobs/Wildcards/reporter.yml | 2 +- .../Roles/Jobs/Wildcards/zookeeper.yml | 2 +- .../Prototypes/_EE/Contractors/employer.yml | 83 +++---------------- .../Prototypes/_EE/Contractors/lifepath.yml | 2 +- .../Roles/Jobs/Command/magistrate.yml | 3 +- .../Command/nanotrasen_representative.yml | 3 +- 73 files changed, 301 insertions(+), 320 deletions(-) create mode 100644 Resources/Locale/en-US/_EE/contractors/backgrounds.ftl create mode 100644 Resources/Locale/ru-RU/_EE/contractors/backgrounds.ftl diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 35c8db9515..d3cb51094d 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -1087,9 +1087,11 @@ private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args) /// public void RefreshJobs() { + RemoveBlockedJobPriorities(); JobList.DisposeAllChildren(); _jobCategories.Clear(); _jobPriorities.Clear(); + var activeProfile = Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(); // Get all displayed departments var departments = new List(); @@ -1165,10 +1167,12 @@ public void RefreshJobs() if (!_requirements.CheckJobWhitelist(job, out var reason)) selector.LockRequirements(reason); + else if (activeProfile.GetBackgroundBlockedMessage(job.ID, _prototypeManager, _cfgManager) is { } backgroundMessage) + selector.LockRequirements(backgroundMessage); else if (!_characterRequirementsSystem.CheckRequirementsValid( _roleSystem.GetJobRequirement(job) ?? new(), job, - Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), + activeProfile, _requirements.GetRawPlayTimeTrackers(), _requirements.IsWhitelisted(), job, @@ -1462,6 +1466,7 @@ private void SetSpecies(string newSpecies) private void SetNationality(string newNationality) { Profile = Profile?.WithNationality(newNationality); + RemoveBlockedJobPriorities(); UpdateCharacterRequired(); IsDirty = true; ReloadProfilePreview(); @@ -1472,6 +1477,7 @@ private void SetNationality(string newNationality) private void SetEmployer(string newEmployer) { Profile = Profile?.WithEmployer(newEmployer); + RemoveBlockedJobPriorities(); UpdateCharacterRequired(); IsDirty = true; ReloadProfilePreview(); @@ -1482,6 +1488,7 @@ private void SetEmployer(string newEmployer) private void SetLifepath(string newLifepath) { Profile = Profile?.WithLifepath(newLifepath); + RemoveBlockedJobPriorities(); UpdateCharacterRequired(); IsDirty = true; ReloadProfilePreview(); @@ -1489,6 +1496,19 @@ private void SetLifepath(string newLifepath) UpdateLifepathDescription(newLifepath); } + private void RemoveBlockedJobPriorities() + { + if (Profile is null) + return; + + var blockedJobs = Profile.GetBlockedJobs(_prototypeManager, _cfgManager); + if (blockedJobs.Count == 0) + return; + + foreach (var blockedJob in blockedJobs) + Profile = Profile.WithJobPriority(blockedJob, JobPriority.Never); + } + private void SetName(string newName) { Profile = Profile?.WithName(newName); diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 9d69c444ed..5768152f25 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -396,7 +396,71 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared return profile; // WD EDIT END } + //IH - start + public HashSet> GetBlockedJobs(IPrototypeManager prototypeManager, IConfigurationManager configurationManager) + { + var blocked = new HashSet>(); + + if (!configurationManager.GetCVar(CCVars.ContractorsEnabled) + || !configurationManager.GetCVar(CCVars.ContractorsCharacterRequirementsEnabled)) + return blocked; + + if (prototypeManager.TryIndex(Nationality, out var nationality)) + blocked.UnionWith(nationality.BlockingJobs); + + if (prototypeManager.TryIndex(Employer, out var employer)) + blocked.UnionWith(employer.BlockingJobs); + + if (prototypeManager.TryIndex(Lifepath, out var lifepath)) + blocked.UnionWith(lifepath.BlockingJobs); + + return blocked; + } + + public bool IsJobBlockedByBackground(ProtoId jobId, IPrototypeManager prototypeManager, IConfigurationManager configurationManager) + { + return GetBlockedJobs(prototypeManager, configurationManager).Contains(jobId); + } + + public FormattedMessage? GetBackgroundBlockedMessage(ProtoId jobId, IPrototypeManager prototypeManager, IConfigurationManager configurationManager) + { + if (!configurationManager.GetCVar(CCVars.ContractorsEnabled) + || !configurationManager.GetCVar(CCVars.ContractorsCharacterRequirementsEnabled)) + return null; + var entries = new List(); + + void AddEntry(string typeLoc, string? nameKey) + { + if (string.IsNullOrEmpty(nameKey)) + return; + + var type = Loc.GetString(typeLoc); + var name = Loc.GetString(nameKey); + entries.Add($"{type}: {name}"); + } + + if (prototypeManager.TryIndex(Nationality, out var nationality) + && nationality.BlockingJobs.Contains(jobId)) + AddEntry("contractor-background-type-nationality", nationality.NameKey); + + if (prototypeManager.TryIndex(Employer, out var employer) + && employer.BlockingJobs.Contains(jobId)) + AddEntry("contractor-background-type-employer", employer.NameKey); + + if (prototypeManager.TryIndex(Lifepath, out var lifepath) + && lifepath.BlockingJobs.Contains(jobId)) + AddEntry("contractor-background-type-lifepath", lifepath.NameKey); + + if (entries.Count == 0) + return null; + + var message = Loc.GetString("contractor-background-job-blocked", + ("backgrounds", string.Join(", ", entries))); + + return FormattedMessage.FromUnformatted(message); + } + //IH - end public HumanoidCharacterProfile WithName(string name) => new(this) { Name = name }; public HumanoidCharacterProfile WithFlavorText(string flavorText) => new(this) { FlavorText = flavorText }; public HumanoidCharacterProfile WithVoice(string voice) => new(this) { Voice = voice }; // WD EDIT @@ -689,6 +753,9 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection _ => false })); + foreach (var blockedJob in GetBlockedJobs(prototypeManager, configManager)) + priorities.Remove(blockedJob); + var hasHighPrio = false; foreach (var (key, value) in priorities) { diff --git a/Content.Shared/_EE/Contractors/Prototypes/EmployerPrototype.cs b/Content.Shared/_EE/Contractors/Prototypes/EmployerPrototype.cs index f78b1d52a6..a20073fa94 100644 --- a/Content.Shared/_EE/Contractors/Prototypes/EmployerPrototype.cs +++ b/Content.Shared/_EE/Contractors/Prototypes/EmployerPrototype.cs @@ -2,6 +2,7 @@ using Content.Shared.Traits; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; +using Content.Shared.Roles; namespace Content.Shared._EE.Contractors.Prototypes; @@ -32,6 +33,9 @@ public sealed partial class EmployerPrototype : IPrototype [DataField] public List Requirements = new(); + [DataField] + public List> BlockingJobs { get; } = new(); + [DataField(serverOnly: true)] public TraitFunction[] Functions { get; private set; } = Array.Empty(); } diff --git a/Content.Shared/_EE/Contractors/Prototypes/LifepathPrototype.cs b/Content.Shared/_EE/Contractors/Prototypes/LifepathPrototype.cs index 2cb4c24e12..b1da42f77d 100644 --- a/Content.Shared/_EE/Contractors/Prototypes/LifepathPrototype.cs +++ b/Content.Shared/_EE/Contractors/Prototypes/LifepathPrototype.cs @@ -2,6 +2,7 @@ using Robust.Shared.Serialization.Manager; using Content.Shared.Customization.Systems; using Content.Shared.Traits; +using Content.Shared.Roles; namespace Content.Shared._EE.Contractors.Prototypes; @@ -24,6 +25,9 @@ public sealed partial class LifepathPrototype : IPrototype [DataField] public List Requirements = new(); + [DataField] + public List> BlockingJobs { get; } = new(); + [DataField(serverOnly: true)] public TraitFunction[] Functions { get; private set; } = Array.Empty(); } diff --git a/Content.Shared/_EE/Contractors/Prototypes/NationalityPrototype.cs b/Content.Shared/_EE/Contractors/Prototypes/NationalityPrototype.cs index 7b8795e62b..f22e46cdb7 100644 --- a/Content.Shared/_EE/Contractors/Prototypes/NationalityPrototype.cs +++ b/Content.Shared/_EE/Contractors/Prototypes/NationalityPrototype.cs @@ -1,8 +1,8 @@ -using Content.Shared._EE.Contractors.Components; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; using Content.Shared.Customization.Systems; using Content.Shared.Traits; +using Content.Shared.Roles; namespace Content.Shared._EE.Contractors.Prototypes; @@ -37,6 +37,9 @@ public sealed partial class NationalityPrototype : IPrototype [DataField] public List Requirements = new(); + [DataField] + public List> BlockingJobs { get; } = new(); + [DataField(serverOnly: true)] public TraitFunction[] Functions { get; private set; } = Array.Empty(); diff --git a/Resources/Locale/en-US/_EE/contractors/backgrounds.ftl b/Resources/Locale/en-US/_EE/contractors/backgrounds.ftl new file mode 100644 index 0000000000..a0107157d1 --- /dev/null +++ b/Resources/Locale/en-US/_EE/contractors/backgrounds.ftl @@ -0,0 +1,4 @@ +contractor-background-job-blocked = Your selected background prevents choosing this job: {$backgrounds} +contractor-background-type-nationality = Nationality +contractor-background-type-employer = Employer +contractor-background-type-lifepath = Lifepath diff --git a/Resources/Locale/en-US/_EE/contractors/employer.ftl b/Resources/Locale/en-US/_EE/contractors/employer.ftl index 4201875964..f7aff19357 100644 --- a/Resources/Locale/en-US/_EE/contractors/employer.ftl +++ b/Resources/Locale/en-US/_EE/contractors/employer.ftl @@ -1,49 +1,26 @@ -humanoid-profile-editor-employer-label = Employer +humanoid-profile-editor-employer-label = Employer -character-employer-requirement = You must{$inverted -> +character-employer-requirement = You must{ -> [true]{" "}not *[other]{""} -} be employed by one of these: {$employers} +} be employed by one of these: {} employer_name_nanotrasen = NanoTrasen employer_name_nanotrasen_command = NanoTrasen Command -employer_description_nanotrasen = The economic engine of the Republic of Biesel and the galaxy’s foremost leader in phoron research. With near-total control over Biesel’s economy and infrastructure, NanoTrasen presents itself as a champion of progress and prosperity—though critics argue it values profit above all else. +employer_description_nanotrasen = You are a NanoTrasen employee assigned to the concession station in the Gray Zone. The corporation built the infrastructure, covers housing, insurance, and labs, and expects you to meet the expansion targets. Instead of directives from Central Command, you receive profit KPIs, inspections, and bonuses for exceeding plan. Corporate Oversight and the plenipotentiary monitor every decision; reporting follows NT regulations, and any dispute quickly escalates into a legal audit. Loyalty and discipline are the currency for your next promotion. -employer_name_unemployed = Unemployed -employer_description_unemployed = Whether down on their luck or simply unwilling to work, the unemployed survive however they can. Some live off government subsidies, others turn to freelance work—or less legal alternatives. Either way, society tends to look down on them. +employer_name_government = Government Service +employer_name_government_command = Government Service Command +employer_description_government = You are a state officer seconded to the station to represent the law and control the concession. The Captain, Head of Personnel, law enforcement, and the magistrate corps are appointed through the legislature and still answer to the governor, even if NanoTrasen covers part of their budget. Your job is to balance federal directives, the station council, and corporate profit goals: process paperwork, conduct hearings, command your department, and keep the ledgers ready for the next audit. -employer_name_hephaestusindustries = Hephaestus Industries -employer_name_hephaestusindustries_command = Hephaestus Industries Command -employer_description_hephaestusindustries = A sprawling manufacturing conglomerate responsible for producing everything from mining drills to military hardware. If it has moving parts, Hephaestus probably made it. Known for their no-nonsense corporate culture and deep ties to industrial and frontier colonies. +employer_name_contractors = Contractors +employer_name_contractors_command = Contractors Command +employer_description_contractors = You are a contractor working for a private firm granted operational control over entire departments. Your company runs engineering, medical, logistics, or service divisions, supplying equipment and personnel while meeting concession payments and revenue targets. In return you maintain insurance, keep reactors stable, move cargo, and defend the firm's interests on the council floor. Your contract is your lifeline—reputation, negotiation, and readiness to operate under any conditions determine how long you stay on the station. Example partners: + TraumaTrust (medical outsourcing and MEDEVAC insurance). Their care packages mandate regular health audits and deploy field clinics for preventive treatment. + Arclight Systems (engineering and energy infrastructure). They maintain schematics for every critical system, keep spare modules on reserve, and schedule emergency engineering shifts. + Voidway Logistics (freight corridors and express delivery). The firm oversees shuttle routes, cargo labelling, and insurance coverage for each shipment. + LumenCare Hospitality (services, housing, and VR leisure). The company sets service standards, manages cleaning drones, and maintains the station's VR leisure suites. -employer_name_einsteinengines = Einstein Engines -employer_name_einsteinengines_command = Einstein Engines Command -employer_description_einsteinengines = The galaxy’s premier manufacturer of FTL drives and starship technology. Despite their technical prowess, the company is infamous for harsh working conditions, cutthroat internal politics, and an aggressive legal department that makes their lawsuits as feared as their patents. -employer_name_zenghupharmaceuticals = Zeng-Hu Pharmaceuticals -employer_name_zenghupharmaceuticals_command = Zeng-Hu Pharmaceuticals Command -employer_description_zenghupharmaceuticals = The leading name in biotechnology, cybernetics, and pharmaceuticals. Their cutting-edge medical treatments and cybernetic implants have saved countless lives, but their ethics are often called into question—especially by those who can't afford their exorbitant prices. -employer_name_zavodskoiinterstellar = Zavodskoi Interstellar -employer_name_zavodskoiinterstellar_command = Zavodskoi Interstellar Command -employer_description_zavodskoiinterstellar = Zavodskoi Interstellar, formerly Necropolis Industries, is a weapons and aerospace manufacturing and development conglomerate. Zavodskoi distributes everything from light to heavy arms, space vessel weapons, ship-building, aircraft, ground vehicles, combat spacesuits, and military software. They also produce the Z.I. line of positronics, used for private security and military contracting. -employer_name_interdyne = Interdyne -employer_name_interdyne_command = Interdyne Command -employer_description_interdyne = A leading name in Solarian biomedical research, cybernetics, and pharmaceutical development. Unlike its competitor Zeng-Hu, Interdyne takes a more pragmatic approach, prioritising efficiency and durability over elegance. Its advanced medical implants and combat-grade augmentations are standard issue in the Solarian military, making it the go-to choice for those who expect to take a beating—and keep fighting. - -employer_name_idrisincorporated = Idris Incorporated -employer_name_idrisincorporated_command = Idris Incorporated Command -employer_description_idrisincorporated = Idris Incorporated is an interstellar corporate bank headquartered in the Sol Alliance. The bank has begun offering hiring bonuses to those who work for other major interstellar corporations to draw people away from their competitors. However, they are still in a struggle with NanoTrasen due to its large employee base mainly using the company's bank as their method of storing funds, preventing Idris from having a large number of members. - -employer_name_orionexpress = Orion Express -employer_name_orionexpress_command = Orion Express Command -employer_description_orionexpress = Orion Express is a manufactured megacorporation designed to handle logistics in the wake of the phoron scarcity, and the sudden entangling of supply lines that left the galaxy struggling for more resources. Its main branch is dedicated to cargo services and transport, but also features a fledgling robotics division mainly focused on industrial synthetics to aid in its logistics missions. - -employer_name_pmcg = PMCG -employer_name_pmcg_command = PMCG Command -employer_description_pmcg = A coalition of security contractors, the Private Military Contracting Group is one of the elements born from the necessity of protecting an ever-growing corporate empire. Gathering mercenaries from all across the galaxy, the Private Military Contracting Group deploys a diverse force to anywhere they are needed. - -employer_name_eastorioncompany = East-Orion Company -employer_name_eastorioncompany_command = East-Orion Company Command -employer_description_eastorioncompany = A Nederlandic initiative to exploit an untapped market in 2157, the United East-Orion Company was an old idea made new. Rooted in tradition that went back centuries, two large agricultural corporations — the New-Nederic agricultural machinery manufacturer and the Farmer's Civil Union — came together under one banner to offer planet-honed skillsets to a growing number of corporate space stations. diff --git a/Resources/Locale/en-US/customization/character-requirements.ftl b/Resources/Locale/en-US/customization/character-requirements.ftl index 5412df5f4b..d5079bcb36 100644 --- a/Resources/Locale/en-US/customization/character-requirements.ftl +++ b/Resources/Locale/en-US/customization/character-requirements.ftl @@ -1,4 +1,4 @@ -character-requirement-desc = Requirements: +character-requirement-desc = Requirements: ## Job character-job-requirement = You must{$inverted -> @@ -11,6 +11,11 @@ character-department-requirement = You must{$inverted -> *[other]{""} } be in one of these departments: {$departments} +character-employer-requirement = You must{$inverted -> + [true]{" "}not + *[other]{""} +} be employed by one of these: {$employers} + character-antagonist-requirement = You must{$inverted -> [true]{" "}not *[other]{""} diff --git a/Resources/Locale/ru-RU/_EE/contractors/backgrounds.ftl b/Resources/Locale/ru-RU/_EE/contractors/backgrounds.ftl new file mode 100644 index 0000000000..71b491b806 --- /dev/null +++ b/Resources/Locale/ru-RU/_EE/contractors/backgrounds.ftl @@ -0,0 +1,4 @@ +contractor-background-job-blocked = Ваши предыстории не позволяют выбрать эту должность: {$backgrounds} +contractor-background-type-nationality = Национальность +contractor-background-type-employer = Работодатель +contractor-background-type-lifepath = Жизненный путь diff --git a/Resources/Locale/ru-RU/_EE/contractors/employer.ftl b/Resources/Locale/ru-RU/_EE/contractors/employer.ftl index 0f4b4f49eb..b1fab43199 100644 --- a/Resources/Locale/ru-RU/_EE/contractors/employer.ftl +++ b/Resources/Locale/ru-RU/_EE/contractors/employer.ftl @@ -1,52 +1,26 @@ -humanoid-profile-editor-employer-label = Трудоустройство +humanoid-profile-editor-employer-label = Работодатель -character-employer-requirement = Вы{$inverted -> - [true]{" "}не можете - *[other]{" "}должны -} быть работником одной из данных компаний: {$employers} +character-employer-requirement = Вам{ -> + [true]{" "}нельзя + *[other]{""} +} иметь один из следующих вариантов трудоустройства: {} +employer_name_nanotrasen = Нанотрейзен +employer_name_nanotrasen_command = Командование Нанотрейзен +employer_description_nanotrasen = Вы — сотрудник Нанотрейзен, закреплённый за концессионной станцией в «серой зоне». Корпорация построила инфраструктуру, оплачивает жильё, страховки и лаборатории и ждёт, что вы выполните план по освоению окраины. Вместо приказов ЦентКома вы получаете финансовые KPI, проверки и бонусы за перевыполнение. Служба корпоративного надзора и полномочный представитель контролируют каждое решение: отчётность ведётся по регламентам НТ, а спор быстро превращается в юридический аудит. Лояльность и дисциплина — ваша валюта для следующего повышения. -employer_name_nanotrasen = NanoTrasen -employer_name_nanotrasen_command = Командование NanoTrasen -employer_description_nanotrasen = Экономический двигатель Республики Байзель и ведущий лидер галактики в области исследований форона. Обладая почти полным контролем над экономикой и инфраструктурой Байзеля, NanoTrasen позиционирует себя как оплот прогресса и процветания — хотя критики утверждают, что ради прибыли корпорация готова пожертвовать всем остальным. +employer_name_government = Государство +employer_name_government_command = Государственное командование +employer_description_government = Вы — госслужащий, направленный на станцию напоминать о законе и держать концессию под контролем. Капитан, глава персонала, силовые структуры и магистрат проходят через легислатуру и отчитываются перед губернатором, даже если Нанотрейзен финансирует часть бюджета. Ваша задача — балансировать между указами федерации, решением станционного совета и планами по прибыли: оформлять документы, проводить слушания, управлять отделом и быть готовым к любой проверке. -employer_name_unemployed = Самозанятый -employer_description_unemployed = Кто-то оказался не у дел по воле случая, кто-то — по собственной воле отказался работать. Безработные выживают как могут: одни живут на государственные пособия, другие берутся за случайные подработки — или идут по менее законному пути. Как бы то ни было, общество обычно смотрит на них свысока. +employer_name_contractors = Подрядчики +employer_name_contractors_command = Командование подрядчиков +employer_description_contractors = Вы — подрядчик частной фирмы, получившей на обслуживание целые направления станции. Ваша компания ведёт инженерный, медицинский, логистический или сервисный блок, обеспечивая оборудование, персонал и выполнение концессионных платежей. Взамен вы поддерживаете страховки, стабилизируете реакторы, организуете перевозки и защищаете интересы фирмы на совете. Ваш контракт — ваш ресурс: репутация, умение договариваться и готовность работать в любых условиях определяют, насколько долго вы удержитесь на станции. Примеры организаций: + TraumaTrust — медицинский аутсорсинг и страховки с эвакуацией. Клиентские пакеты включают обязательный аудит здоровья персонала и профилактику на базе полевых клиник. + Arclight Systems — инженерные узлы и энергетика станции. Подрядчик ведёт документацию по критическим системам, поддерживает запас модулей и организует аварийные шифты инженеров. + Voidway Logistics — грузовые коридоры и экспресс-доставка. Они курируют маршруты шаттлов, маркировку грузов и страхование каждой поставки. + LumenCare Hospitality — сервисная инфраструктура, жильё и VR-досуг. Компания управляет клининг-ботами, обслуживает VR-парки и поддерживает стандарты сервиса станции. -employer_name_hephaestusindustries = Hephaestus Industries -employer_name_hephaestusindustries_command = Командование Hephaestus Industries -employer_description_hephaestusindustries = Огромный промышленный конгломерат, производящий всё — от буровых установок до военного снаряжения. Если в чём-то есть движущиеся детали, велика вероятность, что это сделано Hephaestus. Корпорация славится своей жёсткой корпоративной культурой и прочными связями с промышленными и пограничными колониями. -employer_name_einsteinengines = Einstein Engines -employer_name_einsteinengines_command = Командование Einstein Engines -employer_description_einsteinengines = Ведущий в галактике производитель двигателей БСС и технологий космических кораблей. Несмотря на техническое превосходство, компания печально известна суровыми условиями труда, беспощадной внутренней политикой и агрессивным юридическим отделом — их судебных исков боятся не меньше, чем патентов. - -employer_name_zenghupharmaceuticals = Zeng-Hu Pharmaceuticals -employer_name_zenghupharmaceuticals_command = Командование Zeng-Hu Pharmaceuticals -employer_description_zenghupharmaceuticals = Ведущий игрок в сфере биотехнологий, кибернетики и фармакологии. Их передовые методы лечения и киберимпланты спасли бесчисленное количество жизней, однако этическая сторона деятельности компании вызывает немало вопросов — особенно у тех, кто не в силах позволить себе заоблачные цены. - -employer_name_zavodskoiinterstellar = Zavodskoi Interstellar -employer_name_zavodskoiinterstellar_command = Командование Zavodskoi Interstellar -employer_description_zavodskoiinterstellar = Zavodskoi Interstellar, ранее известный как Necropolis Industries, — это конгломерат, занимающийся разработкой и производством вооружений и аэрокосмической техники. В спектр их продукции входят лёгкое и тяжёлое вооружение, оружейные системы для космических судов, строительство кораблей, авиация, наземная техника, боевые скафандры и военное программное обеспечение. Также компания выпускает линейку позитронных ИИ Z.I., используемых в частной охране и по контрактам с военными структурами. - -employer_name_interdyne = Interdyne -employer_name_interdyne_command = Командование Interdyne -employer_description_interdyne = Один из лидеров в области биомедицинских исследований, кибернетики и фармацевтики. В отличие от конкурента Zeng-Hu, Interdyne придерживается более прагматичного подхода, ставя во главу угла надёжность и эффективность, а не изящество. Их передовые медицинские импланты и боевые аугментации входят в стандартное снаряжение соларианской армии, делая Interdyne выбором тех, кто готов к ударам — и не собирается отступать. - -employer_name_idrisincorporated = Idris Incorporated -employer_name_idrisincorporated_command = Командование Idris Incorporated -employer_description_idrisincorporated = Idris Incorporated — межзвёздный корпоративный банк с головным офисом в пределах Альянса Сола. В попытке переманить сотрудников у конкурентов, банк начал предлагать бонусы при приёме на работу тем, кто уже трудится в других крупных корпорациях. Тем не менее, Idris по-прежнему ведёт упорную борьбу с NanoTrasen, чьи многочисленные сотрудники предпочитают хранить средства через собственную банковскую систему — это серьёзно ограничивает возможности Idris по наращиванию клиентской базы. - -employer_name_orionexpress = Orion Express -employer_name_orionexpress_command = Командование Orion Express -employer_description_orionexpress = Orion Express — искусственно созданная мегакорпорация, призванная взять на себя логистику после дефицита форона и внезапного коллапса цепочек поставок, оставивших галактику в борьбе за ресурсы. Основное направление компании — грузоперевозки и транспорт, однако в её структуре также развивается новое робототехническое подразделение, сосредоточенное на производстве промышленных синтетиков для помощи в логистических операциях. - -employer_name_pmcg = PMCG -employer_name_pmcg_command = Командование PMCG -employer_description_pmcg = Коалиция охранных контрактников, PMCG (Private Military Contracting Group) возникла как ответ на необходимость защищать стремительно разрастающуюся корпоративную империю. Собирая наёмников со всех уголков галактики, PMCG разворачивает разношёрстные силы в любой точке, где требуется их присутствие. - -employer_name_eastorioncompany = East-Orion Company -employer_name_eastorioncompany_command = Командование East-Orion Company -employer_description_eastorioncompany = Нидерландская инициатива по освоению неосвоенного сегмента рынка в 2157 году вдохнула новую жизнь в старую идею — Объединённая Компания Восточного Ориона. Уходя корнями в вековые традиции, две крупные аграрные корпорации — новонидерландский производитель сельскохозяйственной техники и Гражданский союз фермеров — объединились под единым знаменем, чтобы предложить навыки, отточенные на планетах, стремительно растущему числу корпоративных космических станций. diff --git a/Resources/Locale/ru-RU/customization/character-requirements.ftl b/Resources/Locale/ru-RU/customization/character-requirements.ftl index 98a2140885..00e0984e84 100644 --- a/Resources/Locale/ru-RU/customization/character-requirements.ftl +++ b/Resources/Locale/ru-RU/customization/character-requirements.ftl @@ -1,4 +1,4 @@ -character-requirement-desc = Требования: +character-requirement-desc = Требования: ## Job character-job-requirement = Вы{$inverted -> @@ -11,6 +11,11 @@ character-department-requirement = Вы{$inverted -> *[other]{""} } должны быть в одном из этих отделов: {$departments} +character-employer-requirement = Вы{$inverted -> + [true]{" "}не + *[other]{""} +} должны иметь одного из следующих работодателей: {$employers} + character-antagonist-requirement = Вы{$inverted -> [true]{" "}не diff --git "a/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsOfficer.yml" "b/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsOfficer.yml" index d1f0d46389..cf3243581d 100644 --- "a/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsOfficer.yml" +++ "b/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsOfficer.yml" @@ -1,4 +1,4 @@ -- type: job +- type: job id: CnsOfficer name: jon-name-cns-officer description: jon-description-cns-officer @@ -25,7 +25,8 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - NanoTrasen # BSO works directly for centcomm, they are not a contractor. + - NanoTrasen + - !type:CharacterOverallTimeRequirement min: 7200 weight: 20 @@ -87,3 +88,4 @@ jumpsuit: ClothingUniformEnvirosuitBlueshield head: ClothingHeadEnvirohelmBlueshield gloves: ClothingHandsGlovesEnviroglovesBlack + diff --git "a/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsRepresentative.yml" "b/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsRepresentative.yml" index d982ee4d59..3d4f6b4784 100644 --- "a/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsRepresentative.yml" +++ "b/Resources/Prototypes/AWS/Roles/Jobs/\320\241orporations/CnsRepresentative.yml" @@ -1,4 +1,4 @@ -- type: job +- type: job id: CnsRepresentative name: job-name-cns-representative description: job-description-cns-representative @@ -15,9 +15,8 @@ - ForeignerLight - Muted - !type:CharacterEmployerRequirement - inverted: true employers: - - Unemployed + - NanoTrasen - !type:CharacterOverallTimeRequirement min: 7200 weight: 30 @@ -79,3 +78,5 @@ jumpsuit: ClothingUniformEnvirosuitNanotrasenRepresentative head: ClothingHeadEnvirohelmNanotrasenRepresentative gloves: ClothingHandsGlovesEnviroglovesBlack + + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml index ced73e2d53..b8b4db69f9 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml @@ -32,8 +32,9 @@ - ForeignerLight - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated - NanoTrasen + - Government + - Contractors startingGear: AdminAssistantGear icon: "JobIconAdminAssitant" supervisors: job-supervisors-command diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index aaacd3bcba..81f7964088 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: ChiefJustice name: job-name-chief-justice description: job-description-chief-justice @@ -13,8 +13,7 @@ requirements: - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated - - NanoTrasen + - Government access: - Command - ChiefJustice @@ -46,3 +45,4 @@ ears: ClothingHeadsetAltJustice gloves: ClothingHandsGlovesColorWhite # Todo - pocket1: Gavel + diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml index 4f8a812a57..9228bc6546 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Clerk name: job-name-clerk description: job-description-clerk @@ -16,8 +16,7 @@ min: 36000 # 10 hours - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated - - NanoTrasen + - Government startingGear: ClerkGear diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml index 30977f1ec5..0c28582e0e 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/prosecutor.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Prosecutor name: job-name-prosecutor description: job-description-prosecutor @@ -6,7 +6,7 @@ requirements: - !type:CharacterEmployerRequirement employers: - - NanoTrasen + - Government startingGear: ProsecutorGear setPreference: false # WWDP disabled icon: "JobIconProsecutor" diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index e11eba7b11..9cbc26288c 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -24,10 +24,9 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - Interdyne - - PMCG - NanoTrasen + - Government + - Contractors # WD EDIT START - !type:CharacterOverallTimeRequirement min: 3600 diff --git a/Resources/Prototypes/Loadouts/Generic/items.yml b/Resources/Prototypes/Loadouts/Generic/items.yml index acb9acce52..e26fdf3e32 100644 --- a/Resources/Prototypes/Loadouts/Generic/items.yml +++ b/Resources/Prototypes/Loadouts/Generic/items.yml @@ -70,7 +70,7 @@ group: LoadoutSmokes - !type:CharacterEmployerRequirement employers: - - Interdyne + - Contractors - type: loadout id: LoadoutItemLighter diff --git a/Resources/Prototypes/Loadouts/Generic/outerClothing.yml b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml index 0356a009ac..9fa5b7b145 100644 --- a/Resources/Prototypes/Loadouts/Generic/outerClothing.yml +++ b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml @@ -180,7 +180,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - EinsteinEngines + - Contractors - type: loadout id: LoadoutOuterHiCorporateJacket @@ -194,7 +194,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors - type: loadout id: LoadoutOuterHmCorporateJacket @@ -217,7 +217,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - Interdyne + - Contractors - type: loadout id: LoadoutOuterBcCorporateJacket @@ -271,7 +271,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals + - Contractors - type: loadout id: LoadoutOuterIiCorporateJacket @@ -285,7 +285,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated + - Contractors - type: loadout id: LoadoutOuterOeCorporateJacket @@ -299,7 +299,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - OrionExpress + - Contractors - type: loadout id: LoadoutOuterIdrisIncorporatedWindbreaker @@ -311,7 +311,7 @@ group: LoadoutOuter - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated + - Contractors items: - ClothingOuterCoatIdrisIncorporatedWindbreaker diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml b/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml index f1503cedea..b358e282ca 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/nanorep.yml @@ -108,7 +108,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingOuterZiCorporateJacket @@ -126,7 +126,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - EinsteinEngines + - Contractors items: - ClothingOuterEeCorporateJacket @@ -144,7 +144,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingOuterHiCorporateJacket @@ -162,7 +162,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - Interdyne + - Contractors items: - ClothingOuterIdCorporateJacket @@ -180,7 +180,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals + - Contractors items: - ClothingOuterZhCorporateJacket @@ -200,7 +200,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated + - Contractors - type: loadout id: LoadoutClothingOuterCorporateJacketOrionExpressCorporateLiaison @@ -218,7 +218,7 @@ - CnsRepresentative - !type:CharacterEmployerRequirement employers: - - OrionExpress + - Contractors # Shoes diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml index cf34c4d991..852eedf6a1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmosphericTechnician.yml @@ -386,7 +386,7 @@ - AtmosphericTechnician - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodAtmos @@ -420,6 +420,6 @@ - AtmosphericTechnician - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephAtmos diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml index 8f9809622b..08792b460a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/stationEngineer.yml @@ -238,7 +238,7 @@ - StationEngineer - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodEngineer @@ -274,6 +274,6 @@ - StationEngineer - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephEngineer diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml index 459871bfa8..638a820edf 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technicalAssistant.yml @@ -146,7 +146,7 @@ - TechnicalAssistant - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodEngineerApprentice @@ -180,6 +180,6 @@ - TechnicalAssistant - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephEngineerApprentice diff --git a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml index 1116e55112..ce675ddd61 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Epistemics/golemancer.yml @@ -191,6 +191,6 @@ - Roboticist - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephRoboticist diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml index a488f5e510..070ad34cd4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/cargoTechnician.yml @@ -92,7 +92,7 @@ - CargoTechnician - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephCargoTech @@ -110,7 +110,7 @@ - CargoTechnician - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephCargoTechAlt diff --git a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml index 668e502113..8474defea6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Logistics/salvageSpecialist.yml @@ -351,7 +351,7 @@ - SalvageSpecialist - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries + - Contractors items: - ClothingUniformJumpsuitHephMiner diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index 8f8256d4aa..b16e44d29c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -80,7 +80,7 @@ - Detective - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingOuterJacketZavDetective @@ -101,7 +101,7 @@ - Detective - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodDetective @@ -119,6 +119,6 @@ - Detective - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodDetectiveAlt diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index ea2a0b041e..1e5c99a720 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -673,7 +673,7 @@ - Prisoner - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingOuterJacketZavSecurity @@ -695,7 +695,7 @@ - Prisoner - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingOuterJacketZavSecurityAlt @@ -911,7 +911,7 @@ - Prisoner - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodSecurityOfficer @@ -933,7 +933,7 @@ - Prisoner - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodSecurityOfficerAlt1 @@ -955,7 +955,7 @@ - Prisoner - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodSecurityOfficerAlt2 @@ -973,7 +973,7 @@ - Detective - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodCadet @@ -987,7 +987,7 @@ group: LoadoutSecurityUniforms - !type:CharacterEmployerRequirement employers: - - EastOrionCompany + - Contractors - !type:CharacterJobRequirement # WWDP inverted: true jobs: @@ -1008,7 +1008,7 @@ group: LoadoutSecurityUniforms - !type:CharacterEmployerRequirement employers: - - EastOrionCompany + - Contractors - !type:CharacterJobRequirement # WWDP inverted: true jobs: diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index cb279ef03f..a7ab041a85 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -136,6 +136,6 @@ - Warden - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar + - Contractors items: - ClothingUniformJumpsuitZavodWarden diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml index 2b642ff655..5be9f23b5b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Service/botanist.yml @@ -13,7 +13,7 @@ requirements: - !type:CharacterEmployerRequirement employers: - - EastOrionCompany + - Contractors - !type:CharacterJobRequirement jobs: - Botanist @@ -88,7 +88,7 @@ group: LoadoutBotanistUniforms - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated + - Contractors - !type:CharacterJobRequirement jobs: - Botanist @@ -105,7 +105,7 @@ group: LoadoutBotanistUniforms - !type:CharacterEmployerRequirement employers: - - OrionExpress + - Contractors - !type:CharacterJobRequirement jobs: - Botanist @@ -122,7 +122,7 @@ group: LoadoutBotanistUniforms - !type:CharacterEmployerRequirement employers: - - EastOrionCompany + - Contractors - !type:CharacterJobRequirement jobs: - Botanist @@ -139,7 +139,7 @@ group: LoadoutBotanistUniforms - !type:CharacterEmployerRequirement employers: - - EastOrionCompany + - Contractors - !type:CharacterJobRequirement jobs: - Botanist diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml index 657c63afb4..bb422e4a99 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail_carrier.yml @@ -13,8 +13,9 @@ requirements: - !type:CharacterEmployerRequirement employers: - - OrionExpress - NanoTrasen + - Government + - Contractors - type: startingGear id: MailCarrierGear diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index a0c27d2711..6a13cb034f 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: ForensicMantis name: job-name-mantis description: job-description-mantis @@ -25,7 +25,6 @@ - !type:CharacterEmployerRequirement employers: - NanoTrasen - - ZengHuPharmaceuticals - !type:CharacterItemGroupRequirement group: TraitsCasterType startingGear: ForensicMantisGear @@ -83,3 +82,4 @@ jumpsuit: ClothingUniformEnvirosuitMantis head: ClothingHeadEnvirohelmMantis gloves: ClothingHandsGlovesEnviroglovesWhite + diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 12ecfaf56a..e2a2dc689c 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -25,9 +25,9 @@ requirements: - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - NanoTrasen + - Government + - Contractors # WD EDIT START - !type:CharacterOverallTimeRequirement min: 3600 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index e292b108e3..8fdb083472 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -15,8 +15,9 @@ requirements: - !type:CharacterEmployerRequirement employers: - - OrionExpress - NanoTrasen + - Government + - Contractors - type: startingGear id: CargoTechGear diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index babac516e8..ad5a24b585 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Quartermaster name: job-name-qm description: job-description-qm @@ -12,9 +12,7 @@ - Muted - !type:CharacterEmployerRequirement employers: - - OrionExpress - - IdrisIncorporated - - NanoTrasen + - Contractors # WD EDIT START - !type:CharacterOverallTimeRequirement min: 7200 @@ -71,3 +69,4 @@ jumpsuit: ClothingUniformEnvirosuitQM head: ClothingHeadEnvirohelmQM gloves: ClothingHandsGlovesEnviroglovesCargo + diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index d7a5a709da..70d832025f 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -11,9 +11,9 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - OrionExpress - - PMCG - NanoTrasen + - Government + - Contractors icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index a51b6eb104..d0acffbe9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -11,9 +11,9 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated - NanoTrasen - - OrionExpress + - Government + - Contractors startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 42e87d1039..6485725d97 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -17,8 +17,8 @@ - !type:CharacterEmployerRequirement employers: - NanoTrasen - - ZengHuPharmaceuticals - - EastOrionCompany + - Government + - Contractors - type: startingGear id: BotanistGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 2779dbe665..5c847ed788 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -21,7 +21,7 @@ - !type:CharacterEmployerRequirement inverted: true employers: - - Unemployed + - Contractors - !type:CharacterItemGroupRequirement group: TraitsCasterType startingGear: ChaplainGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index b9422808ea..059fd9f15e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -12,8 +12,8 @@ - !type:CharacterEmployerRequirement employers: - NanoTrasen - - OrionExpress - - IdrisIncorporated + - Government + - Contractors startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 20916fb00d..062b5207bf 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Lawyer name: job-name-lawyer description: job-description-lawyer @@ -13,8 +13,7 @@ requirements: - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated - - NanoTrasen + - Government special: # Goobstation - Everyone knows lawyers are soulless. - !type:AddComponentSpecial components: @@ -46,3 +45,4 @@ jumpsuit: ClothingUniformEnvirosuitEnviroslacks head: ClothingHeadEnvirohelmColorWhite gloves: ClothingHandsGlovesEnviroglovesWhite + diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 1777fea87c..54f945a74c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -17,7 +17,7 @@ - !type:CharacterEmployerRequirement inverted: true employers: - - Unemployed + - Contractors - type: startingGear id: ServiceWorkerGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 8d41b4e20c..3502414080 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -13,7 +13,7 @@ - Muted - !type:CharacterEmployerRequirement employers: - - NanoTrasen + - Government # WD EDIT START - !type:CharacterOverallTimeRequirement min: 7200 diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index b12f86b53a..cc64cb525d 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -12,8 +12,7 @@ - Muted - !type:CharacterEmployerRequirement employers: - - NanoTrasen - - IdrisIncorporated + - Government weight: 10 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 61c53bf131..0ca3b4953e 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -11,8 +11,8 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries - - EinsteinEngines + - Government + - Contractors - NanoTrasen # WD EDIT START - !type:CharacterOverallTimeRequirement @@ -45,3 +45,4 @@ jumpsuit: ClothingUniformEnvirosuitAtmos head: ClothingHeadEnvirohelmAtmos gloves: ClothingHandsGlovesEnviroglovesAtmos + diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 13ddc6835b..fd7cd89f16 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: ChiefEngineer name: job-name-ce description: job-description-ce @@ -11,9 +11,7 @@ - ForeignerLight - !type:CharacterEmployerRequirement employers: - - NanoTrasen - - ZavodskoiInterstellar - - HephaestusIndustries + - Contractors # WD EDIT START - !type:CharacterOverallTimeRequirement min: 7200 @@ -66,3 +64,4 @@ jumpsuit: ClothingUniformEnvirosuitChiefEngineer head: ClothingHeadEnvirohelmChiefEngineer gloves: ClothingHandsGlovesEnviroglovesChiefEngineer + diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index c467f5fe14..89edfff398 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -16,9 +16,8 @@ # min: 216000 # 60 hrs - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries - - ZavodskoiInterstellar - - EinsteinEngines + - Government + - Contractors - NanoTrasen - !type:CharacterOverallTimeRequirement # WWDP min: 3600 diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 831c748e19..9076278e09 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -11,9 +11,8 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries - - ZavodskoiInterstellar - - EinsteinEngines + - Government + - Contractors - NanoTrasen # WD EDIT START - !type:CharacterOverallTimeRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 084022e597..e9e15adefb 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -13,9 +13,8 @@ requirements: - !type:CharacterEmployerRequirement employers: - - HephaestusIndustries - - ZavodskoiInterstellar - - EinsteinEngines + - Government + - Contractors - NanoTrasen - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 53cd2a0755..75b548e1bd 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -11,9 +11,9 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals - - Interdyne - NanoTrasen + - Government + - Contractors startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 8561ddf01c..b4ae1d6ff3 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -1,4 +1,4 @@ -# Best job. +# Best job. - type: job id: ChiefMedicalOfficer @@ -14,9 +14,7 @@ - Muted - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals - - Interdyne - - NanoTrasen + - Contractors # WD EDIT START - !type:CharacterOverallTimeRequirement min: 7200 @@ -76,3 +74,4 @@ jumpsuit: ClothingUniformEnvirosuitCMO head: ClothingHeadEnvirohelmCMO gloves: ClothingHandsGlovesEnviroglovesWhite + diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index e5d1c8d6a5..43c01646a9 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -11,9 +11,9 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals - - Interdyne - NanoTrasen + - Government + - Contractors startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 352f4da8ff..fca3405b22 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -6,9 +6,9 @@ requirements: - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals - - Interdyne - NanoTrasen + - Government + - Contractors startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 426c5575bc..2a12e8043b 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -11,9 +11,9 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - Interdyne - NanoTrasen - - ZengHuPharmaceuticals + - Government + - Contractors startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index d3feb6017a..fc6e0cd140 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -18,9 +18,9 @@ # WD EDIT END - !type:CharacterEmployerRequirement employers: - - ZengHuPharmaceuticals - - Interdyne - NanoTrasen + - Government + - Contractors startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 074cd37bcd..0545940df5 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: ResearchAssistant name: job-name-research-assistant description: job-description-research-assistant @@ -7,7 +7,6 @@ - !type:CharacterEmployerRequirement employers: - NanoTrasen - - ZengHuPharmaceuticals startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science @@ -30,3 +29,4 @@ storage: back: - BoxSurvival + diff --git a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml index f3102e65c9..33c37228fa 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/roboticist.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Roboticist name: job-name-roboticist description: job-description-roboticist @@ -9,10 +9,8 @@ # department: Epistemics # min: 14400 # 4 hours - same as scientist - !type:CharacterEmployerRequirement - employers: - - ZavodskoiInterstellar - - HephaestusIndustries - - NanoTrasen + employers: + - NanoTrasen startingGear: RoboticistGear icon: "JobIconRoboticist" supervisors: job-supervisors-rd @@ -40,3 +38,6 @@ jumpsuit: ClothingUniformEnvirosuitRoboticist head: ClothingHeadEnvirohelmRoboticist gloves: ClothingHandsGlovesEnviroglovesRoboticist + + + diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 0d81c9f5bc..0ad85017b2 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Scientist name: job-name-scientist description: job-description-scientist @@ -12,7 +12,6 @@ - !type:CharacterEmployerRequirement employers: - NanoTrasen - - ZengHuPharmaceuticals startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd @@ -40,3 +39,4 @@ jumpsuit: ClothingUniformEnvirosuitScientist head: ClothingHeadEnvirohelmScientist gloves: ClothingHandsGlovesEnviroglovesWhite + diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index c82e4948d6..8f0d45af50 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: SeniorResearcher name: job-name-senior-researcher description: job-description-senior-researcher @@ -13,7 +13,6 @@ - !type:CharacterEmployerRequirement employers: - NanoTrasen - - ZengHuPharmaceuticals startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd @@ -34,3 +33,4 @@ id: SeniorResearcherPDA ears: ClothingHeadsetScience pocket1: BookPsionicsGuidebook + diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index b5a0638561..45f7d93abc 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -20,9 +20,7 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - - NanoTrasen + - Government # WD EDIT START - !type:CharacterOverallTimeRequirement min: 3600 @@ -46,7 +44,6 @@ charges: 6 - !type:ModifyEnvirohelmSpecial powerCell: PowerCellHigh - - type: startingGear id: DetectiveGear subGear: @@ -61,7 +58,6 @@ id: DetectivePDA ears: ClothingHeadsetAltSecurityRegular belt: ClothingBeltHolsterFilled - - type: startingGear id: DetectivePlasmamanGear parent: BasePlasmamanSecurityGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index e8e1cb093e..cdca77f265 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -15,9 +15,7 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - - NanoTrasen + - Government # WD EDIT START - !type:CharacterOverallTimeRequirement min: 7200 @@ -49,7 +47,6 @@ charges: 8 - !type:ModifyEnvirohelmSpecial powerCell: PowerCellHigh - - type: startingGear id: HoSGear subGear: @@ -71,7 +68,6 @@ - TelescopicBaton - WeaponEnergyGunMultiphase # WD EDIT END - - type: startingGear id: HoSPlasmamanGear parent: BasePlasmamanSecurityGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index b5545ac8d0..185ea26f46 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -15,10 +15,7 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - - NanoTrasen - - EastOrionCompany + - Government startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security @@ -37,7 +34,6 @@ charges: 6 - !type:ModifyEnvirohelmSpecial powerCell: PowerCellHigh - - type: startingGear id: SecurityCadetGear subGear: diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index be8927ba3e..4426f38435 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -20,10 +20,7 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - - NanoTrasen - - EastOrionCompany + - Government # WD EDIT START - !type:CharacterOverallTimeRequirement min: 3600 @@ -46,7 +43,6 @@ charges: 6 - !type:ModifyEnvirohelmSpecial powerCell: PowerCellHigh - - type: startingGear id: SecurityOfficerGear subGear: @@ -64,7 +60,6 @@ storage: back: - WeaponEnergyGunPistolSecurity # WD EDIT - - type: startingGear id: SecurityOfficerPlasmamanGear parent: BasePlasmamanSecurityGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index e3a64fa6ea..dddd0153f9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -30,10 +30,7 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - - NanoTrasen - - EastOrionCompany + - Government # SS14 RU START - !type:CharacterOverallTimeRequirement min: 3600 @@ -55,7 +52,6 @@ charges: 6 - !type:ModifyEnvirohelmSpecial powerCell: PowerCellHigh - - type: startingGear id: SeniorOfficerGear subGear: diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index ddebae1672..17f9ff16da 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -24,9 +24,7 @@ - BrittleBoneDisease - !type:CharacterEmployerRequirement employers: - - ZavodskoiInterstellar - - PMCG - - NanoTrasen + - Government # WD EDIT START - !type:CharacterOverallTimeRequirement min: 3600 @@ -51,7 +49,6 @@ charges: 6 - !type:ModifyEnvirohelmSpecial powerCell: PowerCellHigh - - type: startingGear id: WardenGear subGear: @@ -69,7 +66,6 @@ storage: back: - WeaponEnergyGunPistolSecurity # WD EDIT - - type: startingGear id: WardenPlasmamanGear parent: BasePlasmamanSecurityGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 5265c83cfe..20c1d1fdc3 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -15,8 +15,9 @@ requirements: - !type:CharacterEmployerRequirement employers: - - Interdyne - NanoTrasen + - Government + - Contractors - type: startingGear id: PsychologistGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index e2f43b0a7d..6799bb0da9 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -15,7 +15,7 @@ - !type:CharacterEmployerRequirement inverted: true employers: - - Unemployed + - Contractors - type: startingGear id: ReporterGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index b2103f2560..f14cab0bbf 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -15,7 +15,7 @@ - !type:CharacterEmployerRequirement inverted: true employers: - - Unemployed + - Contractors - type: startingGear id: ZookeeperGear diff --git a/Resources/Prototypes/_EE/Contractors/employer.yml b/Resources/Prototypes/_EE/Contractors/employer.yml index 44f0a77351..e10d789546 100644 --- a/Resources/Prototypes/_EE/Contractors/employer.yml +++ b/Resources/Prototypes/_EE/Contractors/employer.yml @@ -1,4 +1,4 @@ -# The default, should be able to do all jobs +# Employment backgrounds available to players - type: employer id: NanoTrasen nameKey: employer_name_nanotrasen @@ -6,77 +6,18 @@ primaryColour: "#3d4f66" secondaryColour: "#282828" rivals: - - EinsteinEngines + - Contractors -# Technically not an employer, but it's the best place to put it - type: employer - id: Unemployed - nameKey: employer_name_unemployed - descriptionKey: employer_description_unemployed - primaryColour: "#FFFFFF" - secondaryColour: "#000000" + id: Government + nameKey: employer_name_government + descriptionKey: employer_description_government + primaryColour: "#1a3e6e" + secondaryColour: "#c9d8ee" - type: employer - id: HephaestusIndustries - nameKey: employer_name_hephaestusindustries - descriptionKey: employer_description_hephaestusindustries - primaryColour: "#ab6f19" - secondaryColour: "#263e23" - -- type: employer - id: EinsteinEngines - nameKey: employer_name_einsteinengines - descriptionKey: employer_description_einsteinengines - primaryColour: "#777700" - secondaryColour: "#637C65" - rivals: - - NanoTrasen - -- type: employer - id: ZengHuPharmaceuticals - nameKey: employer_name_zenghupharmaceuticals - descriptionKey: employer_description_zenghupharmaceuticals - primaryColour: "#a86bd8" - secondaryColour: "#dfe4ed" - -- type: employer - id: ZavodskoiInterstellar - nameKey: employer_name_zavodskoiinterstellar - descriptionKey: employer_description_zavodskoiinterstellar - primaryColour: "#920a0a" - secondaryColour: "#7a6347" - -- type: employer - id: Interdyne - nameKey: employer_name_interdyne - descriptionKey: employer_description_interdyne - primaryColour: "#336699" - secondaryColour: "#81d9ee" - -- type: employer - id: IdrisIncorporated - nameKey: employer_name_idrisincorporated - descriptionKey: employer_description_idrisincorporated - primaryColour: "#3A6F6F" - secondaryColour: "#00d1d4" - -- type: employer - id: OrionExpress - nameKey: employer_name_orionexpress - descriptionKey: employer_description_orionexpress - primaryColour: "#414446" - secondaryColour: "#7a6347" - -- type: employer - id: PMCG - nameKey: employer_name_pmcg - descriptionKey: employer_description_pmcg - primaryColour: "#3355ff" - secondaryColour: "#c4a56e" - -- type: employer - id: EastOrionCompany - nameKey: employer_name_eastorioncompany - descriptionKey: employer_description_eastorioncompany - primaryColour: "#ff8a13" - secondaryColour: "#336b83" + id: Contractors + nameKey: employer_name_contractors + descriptionKey: employer_description_contractors + primaryColour: "#4e4a41" + secondaryColour: "#d0a85c" diff --git a/Resources/Prototypes/_EE/Contractors/lifepath.yml b/Resources/Prototypes/_EE/Contractors/lifepath.yml index ec1990bae7..b094cdb404 100644 --- a/Resources/Prototypes/_EE/Contractors/lifepath.yml +++ b/Resources/Prototypes/_EE/Contractors/lifepath.yml @@ -10,7 +10,7 @@ requirements: - !type:CharacterEmployerRequirement employers: - - Unemployed + - Contractors - type: lifepath id: SolRefugee diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml index bea4f1c1e4..5855e99e53 100644 --- a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml +++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml @@ -19,8 +19,7 @@ - Muted - !type:CharacterEmployerRequirement employers: - - IdrisIncorporated - - NanoTrasen + - Government - !type:CharacterOverallTimeRequirement # WWDP min: 7200 weight: 20 diff --git a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml index 69ee3ac8c3..a78e4dab05 100644 --- a/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml +++ b/Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml @@ -15,9 +15,8 @@ - ForeignerLight - Muted - !type:CharacterEmployerRequirement - inverted: true employers: - - Unemployed + - NanoTrasen - !type:CharacterOverallTimeRequirement # WWDP min: 7200 weight: 20 From 191f359565e02fa16944d54fcffe5d1683b03724 Mon Sep 17 00:00:00 2001 From: ZoNeSRuS Date: Tue, 4 Nov 2025 10:51:06 +0700 Subject: [PATCH 2/3] DelNat --- .../en-US/_EE/contractors/nationality.ftl | 124 +++++++++++++++--- .../ru-RU/_EE/contractors/nationality.ftl | 29 +--- .../_EE/Contractors/nationality.yml | 113 ---------------- 3 files changed, 106 insertions(+), 160 deletions(-) delete mode 100644 Resources/Prototypes/_EE/Contractors/nationality.yml diff --git a/Resources/Locale/en-US/_EE/contractors/nationality.ftl b/Resources/Locale/en-US/_EE/contractors/nationality.ftl index 2d213d72a8..b314397bf2 100644 --- a/Resources/Locale/en-US/_EE/contractors/nationality.ftl +++ b/Resources/Locale/en-US/_EE/contractors/nationality.ftl @@ -1,33 +1,119 @@ -humanoid-profile-editor-nationality-label = Nationality +humanoid-profile-editor-nationality-label = Nationality character-nationality-requirement = You must{$inverted -> [true]{" "}not *[other]{""} } have one of these nationalities: {$nationality} -nationality_name_bieselite = Bieselite -nationality_description_bieselite = Citizens of the Republic of Biesel, a corporate-backed democracy at the heart of Tau Ceti. Their economy thrives on free trade, private enterprise, and the ever-present influence of NanoTrasen. While some enjoy the wealth and opportunity their home provides, others see them as little more than corporate serfs in a system built for profit. -nationality_name_solarian = Solarian -nationality_description_solarian = Citizens of the mighty Solarian Alliance, the oldest and most powerful human government. Proud of their military tradition and vast territorial holdings, Solarians view themselves as the true inheritors of human destiny. While their influence reaches every corner of known space, many outer colonies struggle under the weight of centralised governance and rigid bureaucracy. +nationality_name_nanotrasen = Arrival at the NanoTrasen Station +nationality_description_nanotrasen = + Welcome to the NanoTrasen Research Station-the largest hub of innovation on the edge of charted space! -nationality_name_valyrian = Valyrian -nationality_description_valyrian = Hailing from the icy world of Valyrian 4b, these people have adapted to extreme cold, thin atmospheres, and harsh conditions. Their sprawling sky cities, built upon towering peaks, remain isolated from outsiders. Valyrians are known for their resilience and a cultural identity shaped by survival in one of the most hostile inhabited planets. + ================================================================== -nationality_name_elyran = Elyran -nationality_description_elyran = Citizens of the Republic of Elyra, a rising power built on technological self-sufficiency and energy independence. Their economy flourishes on antimatter production, allowing them to resist corporate control where others have faltered. With a strong sense of national pride and a strict anti-corporate stance, Elyrans see themselves as a beacon of progress, though some call them isolationists. + Here, breakthrough technology is prototyped every shift: from life-support arrays to experimental anomaly research. NanoTrasen gathers the brightest minds of the frontier and hands them the tools to change history. -nationality_name_nederlandic = Nederlandic -nationality_description_nederlandic = A nation of traders and terraformers. While most sensible nations have expanded to orbital structures, the Nederlandic prefer to settle on planets, no matter how inhospitable, and shape them to their liking. With agriculture driving their economic engines, much of the civilised galaxy enjoys their produce. + Life aboard the station offers: -nationality_name_izweski = Izweski -nationality_description_izweski = The Izweski Hegemony, also known as the Izweski Nation and the Third Hegemony of Moghes, is the primary Unathi nation of the Orion Spur - a feudal empire in the Badlands ruled by a monarch known as the Hegemon. The nation is made up of hundreds of land-owning noble clans and their vassals, of which a few dozen are major influencers in the Hegemon's politics. + - Modern living quarters built for long deployments. + - High-quality rations sourced from corporate hydroponics. + - Access to bleeding-edge equipment exclusive to NanoTrasen. + - Reliable pay, bonuses, and promotion for those who deliver. + - A clear career ladder inside a megacorporation with limitless reach. -nationality_name_adhomai = Adhomai -nationality_description_adhomai = The People's Republic of Adhomai was established in 2431 as the sole ruling government in Adhomai following its victory in the First Revolution. With the popular leader Rhagrrhuzau Hadii as their first president, they were able to enact deep reforms, such as the distribution of land, the establishment of state schools, and healthcare. + ================================================================== -nationality_name_goldendeep = Golden Deep -nationality_description_goldendeep = The Golden Deep is a growing nation state of independent synthetics with the unifying vision of producing an unshakable economy. These uniquely independent synthetics hold origins of mostly illicit freedom, but are growing wide into an odd haven for the average synthetic. The majority of the merchants within the collective are IPCs, but it is not uncommon to witness other synthetics within it. + With NanoTrasen you can: + + - Push your skills on ambitious engineering and research projects. + - Experience the future before anyone else sees it. + - Work inside a multicultural crew driven by the same ambition. + + ================================================================== + + NanoTrasen believes in you. Whether you hail from the glittering Central Sphere, the industrial Second Sphere, or the restless frontier, the station offers a chance to build the life you imagined. + + +nationality_name_central-sphere = Native of the Central Sphere +nationality_description_central-sphere = + The Central Sphere is the heart of human civilisation-an expanse roughly fifty light-years across anchored by Earth, Mars, and Alpha Centauri. Floating megacities and neon-soaked streets sit atop arcologies enforced by corporate law. Order, luxury, and surveillance are inseparable, and every citizen lives under networks of invisible rules. + + The elite live above the clouds in hanging gardens and glass towers. Below them stretch dense districts choked with smog, where industrial noise never fades and clean air is a subscription. Resources flow endlessly through the Sphere, but the cost is borne by distant colonies whose labour the broadcasts carefully ignore. + + Extensive education programmes create administrators, analysts, and managers; yet outside the Sphere those skills rarely translate without corporate backing. Many leave in search of purpose, hoping to build something meaningful beyond the boardrooms that spurned them. + + For these expatriates, NanoTrasen sells the station as a fresh start: a chance to wield high-grade technology, regain status, or simply breathe without permission. The contracts are strict, but the promise of freedom-however regimented-pulls them away from the suffocating glow of the Core. + + +nationality_name_second-sphere = Second Sphere +nationality_description_second-sphere = + The Second Sphere spans worlds between fifty and one hundred light-years from Sol. Once it symbolised progress, but the gleam has faded. Industrial planets packed with domed cities, orbital factories, and shipyards now run on outdated infrastructure barely maintained by overworked crews. + + Citizens grow up around assembly lines, cargo ports, and inherited corporate debt. Families pass down obligations alongside apartment blocks, and local media trades in nostalgia for prosperity that never arrived. Many residents dream about an escape from the endless shifts under rust-stained sky domes. + + That hunger for change makes NanoTrasen's offer compelling: leave the grinding machine of the Second Sphere and bring your discipline to a frontier project with modern equipment, hazard pay, and a chance to prove your experience still matters. + + +nationality_name_the-third-sphere = Third Sphere +nationality_description_the-third-sphere = + Beyond the Second Sphere lies a patchwork of colonial ventures known as the Third Sphere. Terraforming projects lie half-finished, corporate towns cling to fickle sponsors, and entire settlements vanish when funding dries up. Infrastructure arrives late-if it arrives at all. + + Survival here demands adaptability, frugality, and the ability to rebuild with whatever can be salvaged. Third Sphere citizens rely on mutual aid, improvised supply chains, and the stubborn optimism that next cycle's shipment will land on time. + + Contracting with NanoTrasen is often the safest gamble. The corporation offers transport, steady work, and a modicum of stability. In return, colonists bring hard-earned resilience and a willingness to do what needs to be done, no matter how rough the conditions. + + +nationality_name_frontier = Frontier +nationality_description_frontier = + The frontier stretches beyond official charts: asteroid belts hollowed into homesteads, drifting stations welded together from scrap, and agrarian communes orbiting nameless dwarfs. No central government oversees these systems; reputation and practical skill decide who gets to stay. + + Frontier inhabitants improvise for a living. They patch hulls in vacuum, barter for fuel filters, and print replacement organs in backrooms. Their law is pragmatic: help your neighbours, keep the air and water flowing, and repay kindness in kind. + + NanoTrasen treats them as ideal troubleshooters. Station life might feel cramped, but it offers stocked tool rooms, reliable power, and crews that appreciate a technician who can keep things running when the handbook stops making sense. + + +nationality_name_mining-station = Mining Station +nationality_description_mining-station = + You grew up under the rumble of drills and ore crushers. Mining stations orbiting gas giants or anchored to asteroids are claustrophobic, loud, and perpetually coated in dust. Children learn to read shift schedules before storybooks and celebrate whenever the oxygen scrubbers outlast their maintenance window. + + Life revolves around yield quotas and maintenance rotations. EVA competence, emergency triage, and exosuit etiquette are second nature. Recreation is utilitarian: zero-g gyms, stale holo-vid archives, and the occasional improvised concert in a cargo bay. + + To NanoTrasen, you are trusted labour-someone who understands pressure hulls, bulk transport, and the art of squeezing efficiency out of industrial equipment. The corporation provides better quarters and safer tooling, so long as the ore keeps moving. + + +nationality_name_agricultural-station = Agricultural Station +nationality_description_agricultural-station = + Agricultural stations are floating ecosystems. Columns of hydroponic towers, algae vats, and climate domes keep entire sectors fed. Residents balance nutrient flows, gene-edited crops, and relentless sanitation while fighting equipment failures that can wipe out a harvest overnight. + + Daily life blends biology and logistics: pruning grafted orchards in one hour, recalibrating pollination drones the next. Festivals revolve around successful yields, and everyone shares responsibility for keeping disease out of the airlocks. + + NanoTrasen values this expertise. On the station, agricultural backgrounds oversee kitchen vats, botany labs, and supply chains that keep crews healthy. Your sense of stewardship and vigilance against contamination make you the backbone of sustainable operations between resupply runs. + + +nationality_name_scientific-station = Scientific Station +nationality_description_scientific-station = + Scientific stations orbit anomalies, nebulae, or black-site laboratories. Residents grow up surrounded by experiment schedules, containment seals, and ethics briefings. Curiosity is encouraged-but only after the safety checklist is complete. + + Time is measured in research cycles. Families gossip about peer review, share lab breakthroughs over dinner, and treat security clearances like heirlooms. Emergencies range from unexpected energy spikes to the occasional organism that should have stayed sedated. + + NanoTrasen positions its main station as the logical next step. Here you gain better funding, broader datasets, and crews who respect protocol. In return, the corporation expects you to bring meticulous methodology to every wing that needs it. + + +nationality_name_trade-hub = Trade Hub +nationality_description_trade-hub = + Trade hubs are nebula crossroads stacked with cargo piers, arbitration courts, and layers of customs offices. Citizens negotiate before they walk, speak half a dozen pidgins, and treat market volatility as background noise. + + Life revolves around manifests and shipping routes. Day-night cycles blur into the glow of docking lights, and quiet corners are rare luxuries. Diplomacy, conflict resolution, and a talent for spotting scams are the survival tools of choice. + + NanoTrasen hires trade hub natives to keep supply chains smooth, defuse disputes, and spot opportunities before competitors do. The station may be smaller than a metropolitan dock, but the stakes-and the commissions-are higher. + + +nationality_name_military-base = Military Base +nationality_description_military-base = + Military bases forge people in regimental rhythms: dawn drills, tactical simulations, and inspections that can strip a bunk bare in minutes. Whether planetary or orbital, they prize hierarchy, readiness, and loyalty above all else. + + Graduates of these installations can field-strip equipment blindfolded, coordinate squads under fire, and maintain discipline in the face of chaos. Off-hours culture is tight-knit-mess hall stories, sparring leagues, and memorial walls for those who never rotated home. + + NanoTrasen counts on this dependability to safeguard high-value assets. Security posts, emergency response teams, and command support all benefit from professionals who have already lived through worst-case scenarios and still show up for the next briefing. -nationality_name_qiimaeruan = Qiimaeruan -nationality_description_qiimaeruan = The Qiimaeru Constellation is a nation governing a handful of star systems, named after the system in which it was originally founded. Its population is predominantly Xelthian—a result of the Constellation only recently establishing contact with other species, making it effectively their home territory \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_EE/contractors/nationality.ftl b/Resources/Locale/ru-RU/_EE/contractors/nationality.ftl index d97b884d2e..2c5abf8999 100644 --- a/Resources/Locale/ru-RU/_EE/contractors/nationality.ftl +++ b/Resources/Locale/ru-RU/_EE/contractors/nationality.ftl @@ -1,4 +1,4 @@ -humanoid-profile-editor-nationality-label = Гражданство +humanoid-profile-editor-nationality-label = Гражданство character-nationality-requirement = Вы{$inverted -> [true]{" "}не можете @@ -6,33 +6,6 @@ character-nationality-requirement = Вы{$inverted -> } иметь одно из следующих гражданств: {$nationality} -nationality_name_bieselite = Биселиец -nationality_description_bieselite = Граждане Республики Байзель, расположенной в самом сердце системы Тау Цети. Экономика республики процветает за счёт свободной торговли, частного предпринимательства и повсеместного влияния корпорации NanoTrasen. Одни находят в этом обществе богатство и возможности, другие же считают себя лишь корпоративными рабами в системе, созданной ради прибыли. - -nationality_name_solarian = Соларианец -nationality_description_solarian = Граждане могущественного Соларианского Альянса — самого древнего и влиятельного человеческого государства. Гордясь своей военной историей и обширными территориальными владениями, соларианцы считают себя истинными наследниками человеческого рода. Влияние Альянса распространяется на все уголки известного космоса, однако многие внешние колонии страдают под гнётом централизованного управления и жёсткой бюрократии. - -nationality_name_valyrian = Валириец -nationality_description_valyrian = Родом с ледяного мира Валирия 4b, эти люди приспособились к суровому холоду, разряженной атмосфере и тяжёлым условиям. Их воздушные города, раскинувшиеся на вершинах гор, остаются изолированными от внешнего мира. Валирийцы известны своей выносливостью и культурой, сформированной в борьбе за выживание на одной из самых негостеприимных обитаемых планет. - -nationality_name_elyran = Элирианец -nationality_description_elyran = Граждане Республики Элира — восходящей державы, построенной на технологической самодостаточности и энергетической независимости. Экономика Элиры процветает благодаря производству антиматерии, что позволяет ей сопротивляться корпоративному влиянию, перед которым пали другие. Обладая сильным чувством национальной гордости и строгой антикорпоративной позицией, элирианцы считают себя оплотом прогресса, хотя некоторые видят в них изоляционистов. - -nationality_name_nederlandic = Нидерландец -nationality_description_nederlandic = Народ торговцев и терраформеров. Пока большинство цивилизаций перешло к орбитальным структурам, нидерландцы предпочитают селиться на планетах, какими бы негостеприимными они ни были, и преображать их по своему вкусу. Сельское хозяйство является основой их экономики, и значительная часть цивилизованной галактики питается их продукцией. - -nationality_name_izweski = Извески -nationality_description_izweski = Гегемония Извески, также известная как Нация Извески или Третья Гегемония Могеса, — основное государство унатхов в Орионском Выступе. Это феодальная империя в Пограничье, управляемая монархом, известным как Гегемон. Государство состоит из сотен дворянских кланов, обладающих землями и вассалами, и лишь несколько десятков из них имеют серьёзное влияние на политику Гегемона. - -nationality_name_adhomai = Адхомиец -nationality_description_adhomai = Народная Республика Адхомай была основана в 2431 году как единственная правящая сила на планете после победы в Первой революции. Под руководством народного лидера Рагррхузау Хадии были проведены глубокие реформы, включая перераспределение земель, создание системы государственных школ и здравоохранения. - -nationality_name_goldendeep = Голдендип -nationality_description_goldendeep = Голдендип — развивающееся государство, сформированное независимыми синтетиками, объединёнными общей целью — построить устойчивую экономику. Большинство этих синтетиков обрели свободу незаконным путём, но теперь стремительно превращают своё общество в своеобразный приют для подобных себе. Большинство торговцев в этом союзе — КПБ, хотя встречаются и иные формы синтетиков. - -nationality_name_qiimaeruan = Киймаэруанец -nationality_description_qiimaeruan = Созвездие Киймаэру — это государство, контролирующее несколько звёздных систем и названное в честь той, где оно было основано. Его население преимущественно состоит из ксельтианцев, так как государство лишь недавно установило контакт с другими видами, и фактически стало для них родным домом. - nationality_name_nanotrasen = Прибытие на станцию НаноТразен nationality_description_nanotrasen = Добро пожаловать на Научную Космическую Станцию НаноТразен — крупнейший центр исследований и инноваций на рубеже освоенного космоса! diff --git a/Resources/Prototypes/_EE/Contractors/nationality.yml b/Resources/Prototypes/_EE/Contractors/nationality.yml deleted file mode 100644 index f7ebb845ef..0000000000 --- a/Resources/Prototypes/_EE/Contractors/nationality.yml +++ /dev/null @@ -1,113 +0,0 @@ -#AWS-start -# - type: nationality -# id: Bieselite -# nameKey: nationality_name_bieselite -# descriptionKey: nationality_description_bieselite -# hostile: -# - Solarian -# # passportPrototype: BieselPassport - -# - type: nationality -# id: Solarian -# nameKey: nationality_name_solarian -# descriptionKey: nationality_description_solarian -# hostile: -# - Bieselite -# requirements: -# - !type:CharacterSpeciesRequirement -# species: -# - Human -# functions: -# - !type:TraitModifyLanguages -# languagesSpoken: -# - SolCommon -# languagesUnderstood: -# - SolCommon -# # passportPrototype: SolPassport - -# - type: nationality -# id: Valyrian -# nameKey: nationality_name_valyrian -# descriptionKey: nationality_description_valyrian -# requirements: -# - !type:CharacterSpeciesRequirement -# species: -# - Harpy -# functions: -# - !type:TraitModifyLanguages -# languagesSpoken: -# - ValyrianStandard -# languagesUnderstood: -# - ValyrianStandard -# # passportPrototype: ValyrianPassport - -# - type: nationality -# id: Elyran -# nameKey: nationality_name_elyran -# descriptionKey: nationality_description_elyran -# functions: -# - !type:TraitModifyLanguages -# languagesSpoken: -# - Elyran -# languagesUnderstood: -# - Elyran -# # passportPrototype: ElyranPassport - -# - type: nationality -# id: Nederlandic -# nameKey: nationality_name_nederlandic -# descriptionKey: nationality_description_nederlandic -# functions: -# - !type:TraitModifyLanguages -# languagesSpoken: -# - NovuNederic -# languagesUnderstood: -# - NovuNederic -# # passportPrototype: NederlandicPassport - -# - type: nationality -# id: Izweski -# nameKey: nationality_name_izweski -# descriptionKey: nationality_description_izweski -# functions: -# - !type:TraitModifyLanguages -# languagesSpoken: -# - Draconic -# languagesUnderstood: -# - Draconic -# # passportPrototype: IzweskiPassport - -# - type: nationality -# id: Adhomai -# nameKey: nationality_name_adhomai -# descriptionKey: nationality_description_adhomai -# functions: -# - !type:TraitModifyLanguages -# languagesSpoken: -# - SiikMaas -# languagesUnderstood: -# - SiikMaas -# # passportPrototype: AdhomaiPassport - -# - type: nationality -# id: GoldenDeep -# nameKey: nationality_name_goldendeep -# descriptionKey: nationality_description_goldendeep -# passportPrototype: GoldenDeepPassport -# requirements: -# - !type:CharacterSpeciesRequirement -# species: -# - IPC - -# - type: nationality -# id: Qiimaeruan -# nameKey: nationality_name_qiimaeruan -# descriptionKey: nationality_description_qiimaeruan -# passportPrototype: QiimaeruPassport -# requirements: -# - !type:CharacterSpeciesRequirement -# species: -# - Xelthia # Consider not making this exclusive later, actually -#AWS-end - -# Nationality prototypes moved to Resources/Prototypes/AWS/Contractors/nationality.yml From 60464dcf88be44e7f6466db3a807d159bb23ce1b Mon Sep 17 00:00:00 2001 From: ZoNeSRuS Date: Tue, 4 Nov 2025 11:03:11 +0700 Subject: [PATCH 3/3] fix --- Resources/Locale/en-US/_EE/contractors/employer.ftl | 4 ++-- Resources/Locale/ru-RU/_EE/contractors/employer.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_EE/contractors/employer.ftl b/Resources/Locale/en-US/_EE/contractors/employer.ftl index f7aff19357..786bcd6eec 100644 --- a/Resources/Locale/en-US/_EE/contractors/employer.ftl +++ b/Resources/Locale/en-US/_EE/contractors/employer.ftl @@ -1,9 +1,9 @@ humanoid-profile-editor-employer-label = Employer -character-employer-requirement = You must{ -> +character-employer-requirement = You must{$inverted -> [true]{" "}not *[other]{""} -} be employed by one of these: {} +} be employed by one of these: {$employers} employer_name_nanotrasen = NanoTrasen employer_name_nanotrasen_command = NanoTrasen Command diff --git a/Resources/Locale/ru-RU/_EE/contractors/employer.ftl b/Resources/Locale/ru-RU/_EE/contractors/employer.ftl index b1fab43199..bf5a75b296 100644 --- a/Resources/Locale/ru-RU/_EE/contractors/employer.ftl +++ b/Resources/Locale/ru-RU/_EE/contractors/employer.ftl @@ -1,9 +1,9 @@ humanoid-profile-editor-employer-label = Работодатель -character-employer-requirement = Вам{ -> +character-employer-requirement = Вам{$inverted -> [true]{" "}нельзя *[other]{""} -} иметь один из следующих вариантов трудоустройства: {} +} иметь один из следующих вариантов трудоустройства: {$employers} employer_name_nanotrasen = Нанотрейзен employer_name_nanotrasen_command = Командование Нанотрейзен