From bd4afff0f854d77e1c06497419cba5881556c74f Mon Sep 17 00:00:00 2001 From: kerfus-owo Date: Tue, 17 Mar 2026 20:57:06 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D1=83=D1=83=D1=83=D0=B2=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Preferences/loadout-groups.ftl | 18 +++- .../Loadouts/Jobs/Medical/psychologist.yml | 8 +- .../ADT/Loadouts/loadout_groups.yml | 94 +++++++++++++++++++ .../Prototypes/ADT/Loadouts/role_loadouts.yml | 1 + .../ADT/Roles/Jobs/Civilian/barber.yml | 1 - .../Prototypes/Loadouts/loadout_groups.yml | 13 +++ .../Prototypes/Loadouts/role_loadouts.yml | 11 ++- .../Roles/Jobs/Civilian/bartender.yml | 2 +- .../Roles/Jobs/Civilian/botanist.yml | 2 +- .../Roles/Jobs/Civilian/chaplain.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/mime.yml | 2 +- .../Roles/Jobs/Civilian/service_worker.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Roles/Jobs/Wildcards/psychologist.yml | 2 +- .../Roles/Jobs/Wildcards/reporter.yml | 2 +- 16 files changed, 148 insertions(+), 16 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index 5f780a7d2d9..e1d1814daed 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -18,8 +18,8 @@ loadout-group-blueshield-back = ОСЩ, рюкзак loadout-group-blueshield-outer-clothing = ОСЩ, верхняя одежда # Civilian -loadout-chef-pocket1-adt = Шеф Повар, карман 1 -loadout-group-chef-id-adt = Шеф-Повар, ID +loadout-chef-pocket1-adt = Шеф-повар, карман 1 +loadout-group-chef-id-adt = Шеф-повар, ID loadout-group-librarian-backpack = Библиотекарь, рюкзак loadout-group-librarian-id-adt = Библиотекарь, ID loadout-group-passenger-id-adt = Ассистент, ID @@ -42,8 +42,15 @@ loadout-group-boxer-head-adt = Боксёр, голова loadout-group-service-worker-gloves-adt = Сервисный работник, перчатки loadout-group-service-worker-id-adt = Сервисный работник, ID loadout-group-service-worker-jumpsuit-adt = Сервисный работник, комбинезон -loadout-group-chef-gloves-adt = Шеф-Повар, перчатки -loadout-group-chef-neck-adt = Шеф-Повар, шея +loadout-group-chef-gloves-adt = Шеф-повар, перчатки +loadout-group-chef-neck-adt = Шеф-повар, шея +loadout-group-chef-shoes-adt = Шеф-повар, обувь +loadout-group-bartender-shoes-adt = Бармен, обувь +loadout-group-botanist-shoes-adt = Ботаник, обувь +loadout-barber-shoes-adt = Парикмахер, обувь +loadout-group-reporter-shoes-adt = Репортёр, обувь +loadout-group-service-worker-shoes-adt = Сервисный работник, обувь +loadout-group-mime-shoes-adt = Мим, обувь # Cargo loadout-group-quartermaster-id-adt = Квартирмейстер, ID @@ -65,6 +72,7 @@ loadout-miner-id-adt = Шахтёр, ID # Chaplain loadout-chaplain-blessedbook-adt = Священник, священная книга loadout-group-chaplain-id-adt = Священник, ID +loadout-group-chaplain-shoes-adt = Священник, обувь # Engineering loadout-chief-engineer-ears-adt = Старший инженер, ухо @@ -130,6 +138,7 @@ loadout-group-medical-intern-id-adt = Интерн, ID # Wildcards loadout-group-psychologist-id-adt = Психолог, ID +loadout-group-psychologist-shoes-adt = Психолог, обувь # Juridical loadout-group-lawyer-id-adt = Адвокат, ID @@ -139,6 +148,7 @@ loadout-group-lawyer-backpack = Магистрат, рюкзак # Command loadout-captain-ears-adt = Капитан, ухо loadout-HoP-ears-adt = Глава персонала, ухо +loadout-HoP-shoes = Глава персонала, обувь # Consultant Centcom loadout-ccc-ears-adt = консультант Центком, ухо diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/psychologist.yml index 7a238d003ab..793cd01c3e9 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/psychologist.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/psychologist.yml @@ -12,4 +12,10 @@ - type: loadout id: ADTPsychotherapistPDA equipment: - id: ADTPsychotherapistPDA \ No newline at end of file + id: ADTPsychotherapistPDA + +#Shoes +- type: loadout + id: ADTBootsLeather + equipment: + shoes: ClothingShoesLeather diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 74974ade6eb..71bbad8c654 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -130,6 +130,7 @@ - LaceupShoes - LizardSkinShoes # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -203,6 +204,7 @@ maxLimit: 1 loadouts: - BlueShoes + - BootsLaceup - MedicalWinterBoots - type: loadoutGroup @@ -904,6 +906,7 @@ loadouts: - SalvageBoots - CargoWinterBoots + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -922,6 +925,7 @@ - JackBoots - SecurityWinterBoots - ADTDetectiveBootsOld + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -929,6 +933,96 @@ - ADTFootWrapsBl - ADTFootWrapsHighBl +- type: loadoutGroup + id: ADTHoPShoes + name: loadout-HoP-shoes + minLimit: 1 + maxLimit: 1 + loadouts: + - BrownShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTBarberShoes + name: loadout-barber-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - BlackShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTPsychologistShoes + name: loadout-group-psychologist-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - ADTBootsLeather + - BootsLaceup + +- type: loadoutGroup + id: ADTReporterShoes + name: loadout-group-reporter-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - WhiteShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTBartenderShoes + name: loadout-group-bartender-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - BlackShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTBotanistShoes + name: loadout-group-botanist-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - BrownShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTChaplainShoes + name: loadout-group-chaplain-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - BlackShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTChefShoes + name: loadout-group-chef-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - BlackShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTMimeShoes + name: loadout-group-mime-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - WhiteShoes + - BootsLaceup + +- type: loadoutGroup + id: ADTServiceWorkerShoes + name: loadout-group-service-worker-shoes-adt + minLimit: 1 + maxLimit: 1 + loadouts: + - BlackShoes + - BootsLaceup + ## Парикмахер # костюмы diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index 15fe40aa5e0..781d5856858 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -258,6 +258,7 @@ - Glasses - ADTBarberJumpsuit - ADTBarberOtherClothing + - ADTBarberShoes # ADT underwear tweak start - ADTTop - ADTBottom diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Civilian/barber.yml b/Resources/Prototypes/ADT/Roles/Jobs/Civilian/barber.yml index e94bca983db..b5b30dcb3c4 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Civilian/barber.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Civilian/barber.yml @@ -16,7 +16,6 @@ - type: startingGear id: ADTBarberGear equipment: - shoes: ClothingShoesColorBlack id: ADTBarberPDA ears: ClothingHeadsetService pocket1: ADTRazor diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 93f088866a7..0224665789e 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -326,6 +326,7 @@ name: loadout-group-passenger-shoes loadouts: - BlackShoes + - BootsLaceup #ADT-Tweak - WinterBoots - type: loadoutGroup @@ -904,6 +905,7 @@ - BrownShoes - CargoWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -963,6 +965,7 @@ - BlackShoes - CargoWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1010,6 +1013,7 @@ - SalvageBoots - CargoWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1066,6 +1070,7 @@ - BrownShoes - EngineeringWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1142,6 +1147,7 @@ - WorkBoots - EngineeringWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1200,6 +1206,7 @@ - WhiteShoes - EngineeringWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1275,6 +1282,7 @@ - ScienceWinterBoots # ADT tweak start - PurpleShoes + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1351,6 +1359,7 @@ - ScienceWinterBoots # ADT tweak start - PurpleShoes + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1543,6 +1552,7 @@ - JackBoots - SecurityWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1707,6 +1717,7 @@ - MedicalWinterBoots - ADTCMOHighBoots # ADT tweak # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1767,6 +1778,7 @@ - WhiteShoes - MedicalWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr @@ -1893,6 +1905,7 @@ - WhiteShoes - MedicalWinterBoots # ADT tweak start + - BootsLaceup - ADTFootWrapsW - ADTFootWrapsHighW - ADTFootWrapsBr diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 5855246c742..e2ec5656cae 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -31,6 +31,7 @@ - HoPJumpsuit - HoPBackpack - HoPOuterClothing + - ADTHoPShoes #ADT-Tweak - Glasses # ADT underwear tweak start - ADTTopHOP @@ -95,6 +96,7 @@ - CommonBackpack - ADTBartenderGloves #ADT-tweak - BartenderOuterClothing + - ADTBartenderShoes #ADT-Tweak - Glasses - ADTBartenderPDA # ADT tweak # ADT underwear tweak start @@ -116,6 +118,7 @@ - ADTServiceWorkerJumpsuit #ADT-tweak - CommonBackpack - ADTServiceWorkerGloves #ADT-tweak + - ADTServiceWorkerShoes #ADT-Tweak - Glasses - ADTServiceWorkerPDA # ADT tweak # ADT underwear tweak start @@ -139,8 +142,9 @@ - ChefMask - ChefJumpsuit - CommonBackpack - - ADTChefGloves # ADT-Tweak - ChefOuterClothing + - ADTChefGloves # ADT-Tweak + - ADTChefShoes #ADT-Tweak - Glasses # ADT-Tweak-Start - ADTChefPocket1 @@ -211,6 +215,7 @@ - ChaplainJumpsuit - CommonBackpack - ChaplainOuterClothing + - ADTChaplainShoes #ADT-Tweak - ChaplainBible - Glasses - ADTChaplainPDA # ADT tweak @@ -261,6 +266,7 @@ - BotanistOuterClothing - Glasses - ADTBotanistPDA # ADT tweak + - ADTBotanistShoes #ADT-Tweak # ADT underwear tweak start - ADTTop - ADTBottom @@ -310,6 +316,7 @@ - MimeJumpsuit - MimeBackpack - MimeOuterClothing + - ADTMimeShoes #ADT-Tweak - MimeBelt - Glasses # ADT underwear tweak start @@ -846,6 +853,7 @@ - CommonBackpack - Glasses - ADTReporterPDA #ADT-tweak + - ADTReporterShoes #ADT-Tweak # ADT underwear tweak start - ADTTop - ADTBottom @@ -866,6 +874,7 @@ - MedicalBackpack - Glasses - ADTPsychologistPDA # ADT tweak + - ADTPsychologistShoes #ADT-Tweak # ADT underwear tweak start - ADTTop - ADTBottom diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 01bd4b2e5a9..a158756d7f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -21,7 +21,7 @@ - type: startingGear id: BartenderGear equipment: - shoes: ClothingShoesColorBlack + #shoes: ClothingShoesColorBlack ADT-Tweak #id: BartenderPDA # ADT - different PDAs in loadouts ears: ClothingHeadsetService #storage: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 6538cd1c44b..ca3e63a561a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -21,7 +21,7 @@ - type: startingGear id: BotanistGear equipment: - shoes: ClothingShoesColorBrown + #shoes: ClothingShoesColorBrown ADT-Tweak # id: BotanistPDA ADT: different PDAs in loadouts ears: ClothingHeadsetService belt: ClothingBeltPlantFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index d21d55718e6..0d6d9ba85ee 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -20,7 +20,7 @@ - type: startingGear id: ChaplainGear equipment: - shoes: ClothingShoesColorBlack + #shoes: ClothingShoesColorBlack ADT-Tweak # id: ChaplainPDA ADT: different PDAs in loadouts ears: ClothingHeadsetService storage: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 86c5679ec5f..034b93d52ec 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -21,7 +21,7 @@ - type: startingGear id: ChefGear equipment: - shoes: ClothingShoesColorBlack + #shoes: ClothingShoesColorBlack ADT-Tweak #id: ChefPDA # ADT: different PDAs in loadouts ears: ClothingHeadsetService belt: ClothingBeltChefFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 054df222699..9fff74eba00 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -31,7 +31,7 @@ id: MimeGear equipment: gloves: ClothingHandsGlovesColorWhite - shoes: ClothingShoesColorWhite + #shoes: ClothingShoesColorWhite ADT-Tweak id: MimePDA pocket1: CrayonMime ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index b80a4d56481..5bb74b8b62d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -21,7 +21,7 @@ - type: startingGear id: ServiceWorkerGear equipment: - shoes: ClothingShoesColorBlack + #shoes: ClothingShoesColorBlack ADT-Tweak #id: ServiceWorkerPDA # ADT: different PDAs in loadouts ears: ClothingHeadsetService #storage: diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index b0b60eb20a7..b8b69926072 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -73,7 +73,7 @@ - type: startingGear id: HoPGear equipment: - shoes: ClothingShoesColorBrown + #shoes: ClothingShoesColorBrown ADT-Tweak id: HoPPDA gloves: ClothingHandsGlovesHop # ears: ClothingHeadsetAltCommand # ADT tweak - выдаются через loadout ADTHoP diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index ba91a837030..190641411a1 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -20,7 +20,7 @@ - type: startingGear id: PsychologistGear equipment: - shoes: ClothingShoesLeather + #shoes: ClothingShoesLeather ADT-Tweak # id: PsychologistPDA ADT: different PDAs in loadouts ears: ClothingHeadsetMedical storage: diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 0a742707a9a..23c12e2a347 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -13,7 +13,7 @@ - type: startingGear id: ReporterGear equipment: - shoes: ClothingShoesColorWhite + #shoes: ClothingShoesColorWhite ADT-Tweak #id: ReporterPDA # ADT: different PDAs in loadouts ears: ClothingHeadsetService # ADT start