Ведущие роли + мелкие изменения (#143)

* Мелкий фикс локализации * Еще более мелкий фикс локализации * Вернул серьёрные должности * Изменение флотского панципя и добавление его в лоадаут ПЦК * undo mapedit * удалил ненужные больше прототипы
space-sunrise · Jun 23, 2024 · e21990a · e21990a
1 parent a500322
commit e21990a
Show file tree

Hide file tree

Showing 37 changed files with 445 additions and 312 deletions.
diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-desc.ftl
@@ -1,4 +1,8 @@
+job-descriiption-iaa = Вы ревизор, присланный центральным командованием для того, чтобы убедиться, что весь персонал работает эффективно и в интересах корпорации.
 job-description-magistrat = Вы само правосудие станции, ваша задача судить всех крупных нарушителей порядка.
 job-description-centcomop = Не одобряйте эвакуацию. Не одобряйте ОБР. Делите зарплату экипажа станций на 0.
+job-description-senior-engineer = Обучайте новых инженеров основам работы двигателей, ремонта, атмосферы и энергоснабжения станции.
+job-description-senior-researcher = Обучайте новых ученых основам печати предметов, исследования артефактов и аномальных объектов.
+job-description-senior-physician = Обучайте новых медиков основам ухода за ранеными, химии, диагностике больных и избавлению от мертвых.
+job-description-senior-officer = Обучите новых кадетов основам обыска, проведения арестов, времени пребывания в тюрьме и правильной стрельбе из огнестрельного оружия.
 job-description-blueshield = Ваша главная задача - защита глав. Помните, вы не офицер службы безопасности.
-job-description-iaa = душнила
diff --git a/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl b/Resources/Locale/ru-RU/_sunrise/job/job-names.ftl
@@ -1,7 +1,18 @@
+job-name-iaa = агент внутренних дел
 job-name-magistrat = магистрат
 job-name-centcomop = оператор Центком
 job-name-blueshield = офицер «Синий Щит»
 job-name-iaa = агент внутренних дел
 
 JobCentCommOfficial = представитель Центком
 JobMagistrat = магистрат
+
+job-name-senior-engineer = ведущий инженер
+job-name-senior-researcher = ведущий учёный
+job-name-senior-physician = ведущий врач
+job-name-senior-officer = инструктор СБ
+
+JobSeniorEngineer = ведущий инженер
+JobSeniorOfficer = инструктор СБ
+JobSeniorPhysician = ведущий врач
+JobSeniorResearcher = ведущий учёный
diff --git a/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_sunrise/preferences/loadout-groups.ftl
@@ -10,3 +10,7 @@ loadout-group-security-trinkets = Безделушки СБ
 loadout-group-corporate-law = Корпоративный Закон
 loadout-group-centcomm-operator-jumpsuit = Униформа ОЦК
 loadout-group-centcomm-operator-head-hat = Головой убор ОЦК
+loadout-group-senior-officer-jumpsuit = Униформа инструктора СБ
+loadout-group-senior-researcher-jumpsuit = Униформа ведущего учёного
+loadout-group-senior-physician-jumpsuit = Униформа ведущего врача
+loadout-group-senior-engineer-jumpsuit = Униформа ведущего инженера
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/back/backpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/back/backpacks.ftl
@@ -4,3 +4,5 @@ ent-ClothingDeathSquadronBackpack = рюкзак эскадрона смерти
     .desc = Вместительный рюкзак использующий технологию БлюСпейс.
 ent-ClothingBackpackCE = рюкзак старшего инженера
     .desc = Технически продвинутый рюкзак.
+ent-ClothingBackpackBlueShield = рюкзак офицера «синий щит»
+    .desc = На стиле.
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -1706,6 +1706,7 @@
     whitelist:
     - Zookeeper
     - Scientist
+    - SeniorResearcher  # Sunrise-Senior
     - ResearchDirector
     - Chef
 

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -637,6 +637,11 @@
     - JobIconSecurityCadet
     - JobIconZookeeper
     - JobIconVisitor
+    - JobIconBrigmedic  # Sunrise-Roles
+    - JobIconSeniorPhysician  # Sunrise-Senior
+    - JobIconSeniorOfficer  # Sunrise-Senior
+    - JobIconSeniorEngineer  # Sunrise-Senior
+    - JobIconSeniorResearcher  # Sunrise-Senior
   - type: ActivatableUI
     key: enum.AgentIDCardUiKey.Key
     inHandsOnly: true
@@ -800,6 +805,8 @@
     layers:
     - state: default
     - state: idseniorengineer
+  - type: PresetIdCard  # Sunrise-Senior
+    job: SeniorEngineer  # Sunrise-Senior
 
 - type: entity
   parent: ResearchIDCard
@@ -810,6 +817,8 @@
     layers:
     - state: default
     - state: idseniorresearcher
+  - type: PresetIdCard  # Sunrise-Senior
+    job: SeniorResearcher  # Sunrise-Senior
 
 - type: entity
   parent: MedicalIDCard
@@ -820,6 +829,8 @@
     layers:
     - state: default
     - state: idseniorphysician
+  - type: PresetIdCard  # Sunrise-Senior
+    job: SeniorPhysician  # Sunrise-Senior
 
 - type: entity
   parent: SecurityIDCard
@@ -830,6 +841,8 @@
     layers:
     - state: default
     - state: idseniorofficer
+  - type: PresetIdCard  # Sunrise-Senior
+    job: SeniorOfficer  # Sunrise-Senior
 
 - type: entity
   parent: IDCardStandard

diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -1,23 +1,3 @@
-# Senior times
-- type: loadoutEffectGroup
-  id: SeniorEngineering
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobAtmosphericTechnician
-      time: 36000 # 10 hrs Sunrise-RoleTime
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:RoleTimeRequirement
-      role: JobStationEngineer
-      time: 36000 # 10 hrs Sunrise-RoleTime
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 108000 # 30 hrs Sunrise-RoleTime
-
 # Head
 - type: loadout
   id: StationEngineerHardhatYellow
@@ -46,18 +26,6 @@
   equipment:
     head: ClothingHeadHatHardhatRed
 
-- type: loadout
-  id: SeniorEngineerBeret
-  equipment: EngineeringBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
-
-- type: startingGear
-  id: EngineeringBeret
-  equipment:
-    head: ClothingHeadHatBeretEngineering
-
 # Jumpsuit
 - type: loadout
   id: StationEngineerJumpsuit
@@ -95,34 +63,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitEngineeringHazard
 
-- type: loadout
-  id: SeniorEngineerJumpsuit
-  equipment: SeniorEngineerJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
-  id: SeniorEngineerJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSeniorEngineer
-
-- type: loadout
-  id: SeniorEngineerJumpskirt
-  equipment: SeniorEngineerJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
-  id: SeniorEngineerJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtSeniorEngineer
-
 # Back
 - type: loadout
   id: StationEngineerBackpack
@@ -188,25 +128,3 @@
   id: EngineeringWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterEngi
-
-# ID
-- type: loadout
-  id: StationEngineerPDA
-  equipment: StationEngineerPDA
-
-- type: startingGear
-  id: StationEngineerPDA
-  equipment:
-    id: EngineerPDA
-
-- type: loadout
-  id: SeniorEngineerPDA
-  equipment: SeniorEngineerPDA
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorEngineering
-
-- type: startingGear
-  id: SeniorEngineerPDA
-  equipment:
-    id: SeniorEngineerPDA
diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -31,17 +31,17 @@
 
 # Head
 
-- type: loadout
-  id: SeniorPhysicianBeret
-  equipment: SeniorPhysicianBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
+# - type: loadout
+#   id: SeniorPhysicianBeret
+#   equipment: SeniorPhysicianBeret
+#   effects:
+#   - !type:GroupLoadoutEffect
+#     proto: SeniorPhysician
 
-- type: startingGear
-  id: SeniorPhysicianBeret
-  equipment:
-    head: ClothingHeadHatBeretSeniorPhysician
+# - type: startingGear
+#   id: SeniorPhysicianBeret
+#   equipment:
+#     head: ClothingHeadHatBeretSeniorPhysician
 
 - type: loadout
   id: MedicalHeadMirror
@@ -218,18 +218,6 @@
   equipment:
     outerClothing: ClothingOuterWinterMed
 
-- type: loadout
-  id: SeniorPhysicianLabCoat
-  equipment: SeniorPhysicianLabCoat
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianLabCoat
-  equipment:
-    outerClothing: ClothingOuterCoatLabSeniorPhysician
-
 # Shoes
 - type: loadout
   id: MedicalWinterBoots
@@ -240,28 +228,6 @@
   equipment:
     shoes: ClothingShoesBootsWinterMed
 
-# ID
-- type: loadout
-  id: MedicalDoctorPDA
-  equipment: MedicalDoctorPDA
-
-- type: startingGear
-  id: MedicalDoctorPDA
-  equipment:
-    id: MedicalPDA
-
-- type: loadout
-  id: SeniorPhysicianPDA
-  equipment: SeniorPhysicianPDA
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorPhysician
-
-- type: startingGear
-  id: SeniorPhysicianPDA
-  equipment:
-    id: SeniorPhysicianPDA
-
 # Gloves
 - type: loadout
   id: NitrileGloves

diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -1,27 +1,5 @@
-# Senior Time
-- type: loadoutEffectGroup
-  id: SeniorResearcher
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:DepartmentTimeRequirement
-      department: Science
-      time: 216000 #60 hrs
-
 # Head
 
-- type: loadout
-  id: ScientificBeret
-  equipment: ScientificBeret
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
-
-- type: startingGear
-  id: ScientificBeret
-  equipment:
-    head: ClothingHeadHatBeretRND
-
 - type: loadout
   id: RoboticistCap
   equipment: RoboticistCap
@@ -100,34 +78,6 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtRoboticist
 
-- type: loadout
-  id: SeniorResearcherJumpsuit
-  equipment: SeniorResearcherJumpsuit
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
-  - !type:GroupLoadoutEffect
-    proto: MaleMoment
-
-- type: startingGear
-  id: SeniorResearcherJumpsuit
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSeniorResearcher
-
-- type: loadout
-  id: SeniorResearcherJumpskirt
-  equipment: SeniorResearcherJumpskirt
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
-  - !type:GroupLoadoutEffect
-    proto: WomanMoment
-
-- type: startingGear
-  id: SeniorResearcherJumpskirt
-  equipment:
-    jumpsuit: ClothingUniformJumpskirtSeniorResearcher
-
 # Back
 - type: loadout
   id: ScientistBackpack
@@ -242,25 +192,3 @@
   id: ScienceWinterBoots
   equipment:
     shoes: ClothingShoesBootsWinterSci
-
-# ID
-- type: loadout
-  id: ScientistPDA
-  equipment: ScientistPDA
-
-- type: startingGear
-  id: ScientistPDA
-  equipment:
-    id: SciencePDA
-
-- type: loadout
-  id: SeniorResearcherPDA
-  equipment: SeniorResearcherPDA
-  effects:
-  - !type:GroupLoadoutEffect
-    proto: SeniorResearcher
-
-- type: startingGear
-  id: SeniorResearcherPDA
-  equipment:
-    id: SeniorResearcherPDA