From a5fdb154dd57f0ee969cd65b79136364842d611b Mon Sep 17 00:00:00 2001 From: UrPrice Date: Wed, 16 Oct 2024 04:59:08 +0300 Subject: [PATCH 1/2] SS220 (upstream 65 localization) --- Resources/Locale/en-US/ss220/job/job-name.ftl | 15 +++++++++++++++ Resources/Locale/ru-RU/ss220/job/job-name.ftl | 14 ++++++++++++++ .../Objects/Misc/identification_cards.yml | 8 ++++---- .../Objects/Misc/identification_cards.yml | 14 +++++++------- 4 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 Resources/Locale/en-US/ss220/job/job-name.ftl diff --git a/Resources/Locale/en-US/ss220/job/job-name.ftl b/Resources/Locale/en-US/ss220/job/job-name.ftl new file mode 100644 index 00000000000000..eb109356969289 --- /dev/null +++ b/Resources/Locale/en-US/ss220/job/job-name.ftl @@ -0,0 +1,15 @@ +job-name-magistrate = magistrate + +job-name-cc-default = central commander +job-name-cc-agent = central command agent +job-name-cc-oficier = central command oficier +job-name-cc-operational-oficier = operational central command oficier + +job-name-cburn-agent = CBURN agent +job-name-cc-srt-operative = SRT Operative +job-name-ert-commander = ERT Leader +job-name-ert-chaplain = ERT Chaplain + +job-name-nt-admiral = NanoTrasen Admiral +job-name-nt-politician = NanoTrasen Diplomat +job-name-ussp = USSP diff --git a/Resources/Locale/ru-RU/ss220/job/job-name.ftl b/Resources/Locale/ru-RU/ss220/job/job-name.ftl index c24eddf63b63ad..abaa1ad08902f5 100644 --- a/Resources/Locale/ru-RU/ss220/job/job-name.ftl +++ b/Resources/Locale/ru-RU/ss220/job/job-name.ftl @@ -1 +1,15 @@ job-name-magistrate = магистрат + +job-name-cc-default = ЦК +job-name-cc-agent = агент ЦК +job-name-cc-oficier = офицер ЦК +job-name-cc-operational-oficier = полевой офицер ЦК + +job-name-cburn-agent = агент РХБЗ +job-name-cc-srt-operative = оперативник ГСН +job-name-ert-commander = лидер отряда ОБР +job-name-ert-chaplain = священник ОБР + +job-name-nt-admiral = адмирал NanoTrasen +job-name-nt-politician = дипломат NanoTrasen +job-name-ussp = СССП diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 8b65c6ecdd9365..5129c7cbd3d9a9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -497,7 +497,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Central Commander + jobTitle: job-name-cc-default #SS220 (upstream 65 localization) jobIcon: JobIconNanotrasen - type: Access groups: @@ -518,7 +518,7 @@ - state: gold - state: ert_commander - type: IdCard - jobTitle: Лидер отряда ОБР # SS220 new CentComm + jobTitle: job-name-ert-commander # SS220 new CentComm #SS220 (upstream 65 localization) - type: PresetIdCard job: ERTLeader - type: Item @@ -638,7 +638,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Centcomm Agent + jobTitle: job-name-cc-agent #SS220 (upstream 65 localization) # SS220 new CentComm begin - type: Access groups: @@ -823,7 +823,7 @@ - type: IdCard # SS220 new CentComm begin # SS220 CBURN questions changes name 05.07.2024 - jobTitle: Агент РХБЗ + jobTitle: job-name-cburn-agent #SS220 (upstream 65 localization) - type: Access groups: - AllAccess # SS220 Fast fix access diff --git a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml index 249ece99318c16..c2830130cf6565 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Misc/identification_cards.yml @@ -8,7 +8,7 @@ description: Карта, необходимая для доступа в различные части станций и кораблей. components: - type: IdCard - jobTitle: СССП + jobTitle: job-name-ussp #SS220 (upstream 65 localization) - type: Sprite layers: - state: ussp @@ -37,7 +37,7 @@ - state: silver - state: idcentcom - type: IdCard - jobTitle: Дипломат NanoTrasen + jobTitle: job-name-nt-politician #SS220 (upstream 65 localization) - type: Access groups: - AllAccess # SS220 Fast fix access @@ -50,7 +50,7 @@ description: Карта, необходимая для доступа в различные части станций и кораблей. components: - type: IdCard - jobTitle: Полевой Офицер ЦК + jobTitle: job-name-cc-operational-oficier #SS220 (upstream 65 localization) - type: Access groups: - AllAccess # SS220 Fast fix access @@ -63,7 +63,7 @@ description: Карта, необходимая для доступа в различные части станций и кораблей. components: - type: IdCard - jobTitle: Офицер ЦК + jobTitle: job-name-cc-oficier #SS220 (upstream 65 localization) - type: Access groups: - AllAccess # SS220 Fast fix access @@ -76,7 +76,7 @@ description: Карта, необходимая для доступа в различные части станций и кораблей. components: - type: IdCard - jobTitle: Оперативник ГСН + jobTitle: job-name-cc-srt-operative #SS220 (upstream 65 localization) - type: Access groups: - AllAccess # SS220 Fast fix access @@ -118,7 +118,7 @@ description: Карта, необходимая для доступа в различные части станций и кораблей. components: - type: IdCard - jobTitle: Адмирал NanoTrasen + jobTitle: job-name-nt-admiral #SS220 (upstream 65 localization) - type: Access groups: - AllAccess # SS220 Fast fix access @@ -142,7 +142,7 @@ name: prisoner ID card components: - type: IdCard - jobTitle: Заключённый + jobTitle: job-name-prisoner #SS220 (upstream 65 localization) - type: Sprite layers: - state: orange From ed3a51ded8cc3441f9f6903a3c0bde96f2c20980 Mon Sep 17 00:00:00 2001 From: UrPrice Date: Wed, 16 Oct 2024 05:05:46 +0300 Subject: [PATCH 2/2] Central Commander Localization Fix --- .../Prototypes/Entities/Objects/Misc/identification_cards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 5129c7cbd3d9a9..e07a3fd57a37a9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -609,7 +609,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Central Commander + jobTitle: job-name-cc-default # #SS220 (upstream 65 localization) - type: Access groups: - AllAccess