diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Misc/pamphlets.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Misc/pamphlets.yml index aba998f2ae..41d60acbd4 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Misc/pamphlets.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Misc/pamphlets.yml @@ -76,7 +76,7 @@ state: pamphlet_jtac - type: SkillPamphlet addSkills: - RMCSkillJtac: 1 + RMCSkillJtac: 2 # Sich. 1 в оригіналі # gives spotter skill / bypasses limit - type: entity @@ -91,7 +91,7 @@ addComps: - type: SpotterWhitelist addSkills: - RMCSkillJtac: 2 # 1 в RMC. Змінено білдом Січі (багфікс) + RMCSkillJtac: 2 # Sich. 1 в оригіналі giveJobTitle: rmc-job-name-spotter givePrefix: rmc-job-prefix-spotter isAppendPrefix: false @@ -206,10 +206,10 @@ - type: SkillPamphlet addSkills: RMCSkillEngineer: 1 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі skillCap: RMCSkillEngineer: 1 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі giveJobTitle: rmc-job-name-mortar-operator givePrefix: rmc-job-prefix-mortar-operator isAppendPrefix: false diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/HMGs/weapon_mounts.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/HMGs/weapon_mounts.yml index 14d39e9b5d..459b4e25b4 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/HMGs/weapon_mounts.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Weapons/Guns/HMGs/weapon_mounts.yml @@ -274,8 +274,8 @@ mountOnDeploy: true mountExclusionAreaSize: 0 barricadeExclusionAreaSize: 2 - assembleDelay: 10 # Sich. 0.5 в оригіналі - disassembleDelay: 3 # Sich. 1.5 в оригіналі + assembleDelay: 5 # Sich. 0.5 в оригіналі + disassembleDelay: 2.5 # Sich. 1.5 в оригіналі undeploySound: null acidableWhileUndeployed: true - type: Tag diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Lathe/medilathe.yml b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Lathe/medilathe.yml index 96d31d82a2..a15ab68e76 100644 --- a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Lathe/medilathe.yml +++ b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Lathe/medilathe.yml @@ -10,7 +10,7 @@ needsPower: false - type: RequiresSkill skills: - RMCSkillMedical: 3 + RMCSkillMedical: 2 # Sich. 3 в оригіналі - type: Sprite sprite: _RMC14/Structures/Machines/medilathe.rsi layers: diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/rifleman.yml b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/rifleman.yml index 6ced5c424d..4decff434c 100644 --- a/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/rifleman.yml +++ b/Resources/Prototypes/_RMC14/Entities/Structures/Machines/Vending/Squad/rifleman.yml @@ -240,6 +240,8 @@ points: 15 - id: CMPamphletEngineer points: 15 + - id: SichCMPamphletFireman # Sich + points: 5 - name: Ключі Шифрування entries: - id: CMEncryptionKeyEngineer diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/auxiliary_support_officer.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/auxiliary_support_officer.yml index 41619b9309..b5c85a4126 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/auxiliary_support_officer.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/auxiliary_support_officer.yml @@ -37,7 +37,7 @@ marineAuthorityLevel: 12 supervisors: rmc-job-supervisors-commander accessGroups: - - MarineMain + - MarineMain # Sich. ASO в оригіналі. Більше доступів roleWeight: 0.25 special: - !type:AddComponentSpecial @@ -50,7 +50,7 @@ RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillIntel: 2 - RMCSkillJtac: 3 + RMCSkillJtac: 4 # Sich. 3 в оригіналі RMCSkillLeadership: 3 RMCSkillMedical: 2 RMCSkillNavigations: 1 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_crew_chief.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_crew_chief.yml index 0f26f91d9c..5884122f2f 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_crew_chief.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_crew_chief.yml @@ -42,10 +42,10 @@ RMCSkillEngineer: 2 RMCSkillFirearms: 1 RMCSkillFireman: 1 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі RMCSkillLeadership: 1 RMCSkillMedical: 2 - RMCSkillPilot: 2 # 1 в оригіналі. Змінено білдом Січі + RMCSkillPilot: 2 # Sich. 1 в оригіналі RMCSkillPowerLoader: 2 RMCSkillSurgery: 1 - type: MarineOrders diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_pilot.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_pilot.yml index ba0b7cf3d0..621b92a893 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_pilot.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/dropship_pilot.yml @@ -32,11 +32,11 @@ - type: Skills skills: RMCSkillEndurance: 1 - RMCSkillEngineer: 2 # Додано білдом Січі (як в помічника) + RMCSkillEngineer: 2 # Sich. 0 в оригіналі RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillIntel: 1 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі RMCSkillLeadership: 1 RMCSkillMedical: 2 RMCSkillOverwatch: 1 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/gunship_pilot.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/gunship_pilot.yml index 043492d4f5..230b9c6505 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/gunship_pilot.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/gunship_pilot.yml @@ -32,11 +32,11 @@ - type: Skills skills: RMCSkillEndurance: 1 - RMCSkillEngineer: 2 # Додано білдом Січі (як в помічника) + RMCSkillEngineer: 2 # Sich. 0 в оригіналі RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillIntel: 1 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі RMCSkillLeadership: 1 RMCSkillMedical: 2 RMCSkillOverwatch: 1 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/intel_officer.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/intel_officer.yml index dd2be04120..272291bd8e 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/intel_officer.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/AuxiliarySupport/intel_officer.yml @@ -32,12 +32,13 @@ skills: RMCSkillCqc: 1 RMCSkillEndurance: 1 - RMCSkillConstruction: 1 # Додано білдом Січі + RMCSkillConstruction: 1 # Sich. 0 в оригіналі RMCSkillEngineer: 2 RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillIntel: 2 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі + RMCSkillMedical: 1 # Sich. 0 в оригіналі RMCSkillLeadership: 1 RMCSkillMeleeWeapons: 1 RMCSkillOverwatch: 1 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Command/staff_officer.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Command/staff_officer.yml index c46d708b24..9e3a1c948d 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Command/staff_officer.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Command/staff_officer.yml @@ -26,7 +26,7 @@ marineAuthorityLevel: 13 supervisors: rmc-job-supervisors-commander accessGroups: - - MarineMain # SO в оригіналі. Змінено білдом Січі (даємо доступи в постачання) + - MarineMain # Sich. SO в оригіналі. Більше доступів roleWeight: 0.25 special: - !type:AddComponentSpecial @@ -39,12 +39,12 @@ RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillIntel: 1 - RMCSkillJtac: 3 + RMCSkillJtac: 4 # Sich. 3 в оригіналі RMCSkillLeadership: 2 RMCSkillMedical: 2 RMCSkillOverwatch: 1 RMCSkillPolice: 1 - RMCSkillPowerLoader: 2 # 1 в оригіналі. Змінено білдом Січі + RMCSkillPowerLoader: 2 # Sich. 1 в оригіналі RMCSkillSurgery: 1 RMCSkillVehicles: 2 - type: MarineOrders diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Engineering/chief_engineer.yml index 9f21b1ae9e..140acad3c6 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Engineering/chief_engineer.yml @@ -37,6 +37,7 @@ RMCSkillIntel: 1 RMCSkillJtac: 4 RMCSkillLeadership: 3 + RMCSkillMedical: 1 # Sich. 0 в оригіналі RMCSkillNavigations: 1 RMCSkillOverwatch: 1 RMCSkillPolice: 1 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/combat_tech.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/combat_tech.yml index 5089a5b94e..1d891eccc8 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/combat_tech.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/combat_tech.yml @@ -42,6 +42,7 @@ RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillJtac: 1 + RMCSkillMedical: 1 # Sich RMCSkillVehicles: 1 - type: CMVendorUser id: CMCombatTech diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/fireteam_leader.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/fireteam_leader.yml index e8e199185e..2dd04ecb54 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/fireteam_leader.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/fireteam_leader.yml @@ -41,6 +41,7 @@ RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillJtac: 3 + RMCSkillMedical: 1 # Sich. 0 в оригіналі - type: CMVendorUser id: CMFireteamLeader points: 45 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/rifleman.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/rifleman.yml index 19455d4105..0812b9d5eb 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/rifleman.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/rifleman.yml @@ -33,6 +33,8 @@ skills: RMCSkillEndurance: 1 RMCSkillFirearms: 1 + RMCSkillJtac: 1 # Sich. 0 в оригіналі + RMCSkillMedical: 1 # Sich. 0 в оригіналі - type: CMVendorUser id: CMRifleman points: 45 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/smart_gun_operator.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/smart_gun_operator.yml index 6d8b3aa5de..c623d07c76 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/smart_gun_operator.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/smart_gun_operator.yml @@ -39,7 +39,8 @@ RMCSkillEndurance: 1 RMCSkillFirearms: 1 RMCSkillFireman: 1 - RMCSkillJtac: 1 + RMCSkillJtac: 2 # Sich. 1 в оригіналі + RMCSkillMedical: 1 # Sich. 0 в оригіналі RMCSkillSmartGun: 1 - type: CMVendorUser id: CMSmartGunOperator diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/squad_leader.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/squad_leader.yml index 09635756f7..99512d5812 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/squad_leader.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/squad_leader.yml @@ -52,7 +52,7 @@ RMCSkillFirearms: 1 RMCSkillFireman: 1 RMCSkillIntel: 1 - RMCSkillJtac: 2 + RMCSkillJtac: 3 # Sich. 2 в оригіналі RMCSkillLeadership: 1 RMCSkillMedical: 1 RMCSkillVehicles: 1 diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/weapons_specialist.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/weapons_specialist.yml index 31aa2e2c13..2d7ecdce6b 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/weapons_specialist.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Marines/weapons_specialist.yml @@ -42,7 +42,8 @@ RMCSkillEngineer: 1 RMCSkillFirearms: 1 RMCSkillFireman: 1 - RMCSkillJtac: 1 + RMCSkillJtac: 2 # Sich. 1 в оригіналі + RMCSkillMedical: 1 # Sich. 0 в оригіналі RMCSkillMeleeWeapons: 1 RMCSkillSpecialistWeapons: 1 - type: CMVendorUser diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Medical/nurse.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Medical/nurse.yml index 7231897060..4de8132d87 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Medical/nurse.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Medical/nurse.yml @@ -30,7 +30,7 @@ RMCSkillEndurance: 1 RMCSkillFirearms: 0 RMCSkillMedical: 3 - RMCSkillSurgery: 2 # 1 в оригіналі. Змінено білдом Січі + RMCSkillSurgery: 2 # Sich. 1 в оригіналі RMCSkillFireman: 1 - type: RMCUserBulkyArmorIncapable - type: JobPrefix diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/MilitaryPolice/military_police.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/MilitaryPolice/military_police.yml index b820767ff6..457567d898 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/MilitaryPolice/military_police.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/MilitaryPolice/military_police.yml @@ -37,6 +37,7 @@ RMCSkillEndurance: 2 RMCSkillFirearms: 1 RMCSkillFireman: 2 + RMCSkillMedical: 1 # Sich. 0 в оригіналі RMCSkillPolice: 2 - type: JobPrefix prefix: cm-job-prefix-militarypolice diff --git a/Resources/Prototypes/_RMC14/Roles/Jobs/Requisitions/quartermaster.yml b/Resources/Prototypes/_RMC14/Roles/Jobs/Requisitions/quartermaster.yml index ce5ab28ccc..a08d12527a 100644 --- a/Resources/Prototypes/_RMC14/Roles/Jobs/Requisitions/quartermaster.yml +++ b/Resources/Prototypes/_RMC14/Roles/Jobs/Requisitions/quartermaster.yml @@ -36,6 +36,7 @@ RMCSkillIntel: 1 RMCSkillJtac: 3 RMCSkillLeadership: 2 + RMCSkillMedical: 1 # Sich. 0 в оригіналі RMCSkillOverwatch: 1 RMCSkillPolice: 1 RMCSkillPowerLoader: 2 diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml b/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml index dc40eab99d..e11b2a4277 100644 --- a/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml +++ b/Resources/Prototypes/_Sich/Entities/Objects/Misc/pamphlets.yml @@ -25,3 +25,20 @@ jobWhitelists: - popup: rmc-pamphlets-rifleman-warning jobProto: CMRifleman + +# Я тільки зараз зрозумів, як воно схоже на шерпу, тому це фактично буде те саме, але на мінімалках. . . +- type: entity + parent: CMPamphlet + id: SichCMPamphletFireman + name: довідник перенесення на плечах + description: Він навчить вас переносити людей на собі. + components: + - type: Sprite + sprite: _Sich/Objects/Misc/pamphlets.rsi + state: pamphlet_sherpa + - type: SkillPamphlet + addSkills: + RMCSkillFireman: 1 + jobWhitelists: + - popup: rmc-pamphlets-rifleman-warning + jobProto: CMRifleman