From 4ed5989ba967462c7063dcf284835c027848e1b6 Mon Sep 17 00:00:00 2001 From: Zekins Date: Sat, 9 Nov 2024 17:54:33 +0300 Subject: [PATCH 1/2] Role Brigmedic --- .../preferences/loadout-groups.ftl | 5 ++ .../Catalog/Fills/Lockers/security.yml | 5 ++ .../Entities/Markers/Spawners/jobs.yml | 2 + .../Objects/Misc/identification_cards.yml | 2 + .../Roles/Jobs/Fun/misc_startinggear.yml | 30 +++++----- .../Prototypes/Roles/Jobs/departments.yml | 1 + .../Loadouts/Jobs/Security/brigmedic.yml | 58 +++++++++++++++++++ .../_CorvaxNext/Loadouts/loadout_groups.yml | 32 ++++++++++ .../_CorvaxNext/Loadouts/role_loadouts.yml | 11 ++++ .../Roles/Jobs/Security/brigmedic.yml | 42 ++++++++++++++ .../_CorvaxNext/Roles/play_time_trackers.yml | 2 + 11 files changed, 175 insertions(+), 15 deletions(-) create mode 100644 Resources/Locale/ru-RU/_corvax-next/preferences/loadout-groups.ftl create mode 100644 Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Security/brigmedic.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml create mode 100644 Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml diff --git a/Resources/Locale/ru-RU/_corvax-next/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_corvax-next/preferences/loadout-groups.ftl new file mode 100644 index 00000000000..6c6a70d1736 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvax-next/preferences/loadout-groups.ftl @@ -0,0 +1,5 @@ +# Security +loadout-group-brigmedic-head = Бригмедик, голова +loadout-group-brigmedic-jumpsuit = Бригмедик, комбинезон +loadout-group-brigmedic-backpack = Бригмедик, верхняя одежда +loadout-group-brigmedic-outerclothing = Бригмедик, рюкзак diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 5457782a2d4..7057dd1ceba 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -98,6 +98,11 @@ - id: WeaponDisabler - id: TrackingImplanter amount: 2 + - id: ClothingMaskBreathMedicalSecurity # Corvax-Next-Brigmedic + - id: BoxBodyBag # Corvax-Next-Brigmedic + - id: Defibrillator # Corvax-Next-Brigmedic + - id: PowerCellHigh # Corvax-Next-Brigmedic + amount: 2 # Corvax-Next-Brigmedic - id: ClothingOuterHardsuitBrigmedic - id: BoxSterileMask - id: ClothingHeadHatBeretBrigmedic diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 64c8ee404e9..f74997b2622 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -491,6 +491,8 @@ parent: SpawnPointJobBase name: brigmedic components: + - type: SpawnPoint # Corvax-Next-Brigmedic + job_id: Brigmedic # Corvax-Next-Brigmedic - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 73b2c39d55d..7e013a5e55d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -457,6 +457,8 @@ layers: - state: default - state: idbrigmedic + - type: PresetIdCard # Corvax-Next-Brigmedic + job: Brigmedic # Corvax-Next-Brigmedic - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 0462f61fc19..d3ae89661f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -116,21 +116,21 @@ - WeaponMeleeToolboxRobust #Brigmedic - -- type: startingGear - id: BrigmedicGear - equipment: - jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterCoatAMG - back: ClothingBackpackBrigmedic - shoes: ClothingShoesColorRed - gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical - head: ClothingHeadHatBeretBrigmedic - id: BrigmedicPDA - ears: ClothingHeadsetBrigmedic - mask: ClothingMaskBreathMedicalSecurity - belt: ClothingBeltMedicalFilled +# Corvax-Next-Brigmedic / Fuck this shit +#- type: startingGear +# id: BrigmedicGear +# equipment: +# jumpsuit: ClothingUniformJumpsuitBrigmedic +# outerClothing: ClothingOuterCoatAMG +# back: ClothingBackpackBrigmedic +# shoes: ClothingShoesColorRed +# gloves: ClothingHandsGlovesNitrile +# eyes: ClothingEyesHudMedical +# head: ClothingHeadHatBeretBrigmedic +# id: BrigmedicPDA +# ears: ClothingHeadsetBrigmedic +# mask: ClothingMaskBreathMedicalSecurity +# belt: ClothingBeltMedicalFilled # Aghost - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index aabb0d58300..970acf4ed9f 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -111,6 +111,7 @@ - HeadOfSecurity - SecurityCadet - SecurityOfficer + - Brigmedic # Corvax-Next-Brigmedic - Pilot # Corvax-Pilot - Detective - Warden diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Security/brigmedic.yml new file mode 100644 index 00000000000..ecc3fd4c2d7 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Loadouts/Jobs/Security/brigmedic.yml @@ -0,0 +1,58 @@ +# Jumpsuit +- type: loadout + id: BrigmedicJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedic + +- type: loadout + id: BrigmedicJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtBrigmedic + +# Head +- type: loadout + id: BrigmedicSecurityBeret + equipment: + head: ClothingHeadHatBeretSecurityMedic + +- type: loadout + id: BrigmedicBeret + equipment: + head: ClothingHeadHatBeretBrigmedic + +# Back +- type: loadout + id: BrigmedicBackpack + equipment: + back: ClothingBackpackBrigmedic + +- type: loadout + id: BrigmedicSatchel + equipment: + back: ClothingBackpackSatchelBrigmedic + +- type: loadout + id: BrigmedicDuffel + equipment: + back: ClothingBackpackDuffelBrigmedic + +# Outer clothing +- type: loadout + id: BrigmedicOuterClothingArmor + equipment: + outerClothing: ClothingOuterVestArmorMedSec + +- type: loadout + id: BrigmedicOuterClothingCoat + equipment: + outerClothing: ClothingOuterCoatAMG + +- type: loadout + id: BrigmedicOuterClothingLab + equipment: + outerClothing: ClothingOuterCoatLabSecurityMedic + +- type: loadout + id: BrigmedicOuterClothingVest + equipment: + outerClothing: ClothingOuterVestSecurityMedic diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml new file mode 100644 index 00000000000..763b748ba16 --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Loadouts/loadout_groups.yml @@ -0,0 +1,32 @@ +# Security +- type: loadoutGroup + id: BrigmedicHead + name: loadout-group-brigmedic-head + minLimit: 0 + loadouts: + - BrigmedicSecurityBeret + - BrigmedicBeret + +- type: loadoutGroup + id: BrigmedicJumpsuit + name: loadout-group-brigmedic-jumpsuit + loadouts: + - BrigmedicJumpsuit + - BrigmedicJumpskirt + +- type: loadoutGroup + id: BrigmedicBackpack + name: loadout-group-brigmedic-backpack + loadouts: + - BrigmedicBackpack + - BrigmedicSatchel + - BrigmedicDuffel + +- type: loadoutGroup + id: BrigmedicOuterClothing + name: loadout-group-brigmedic-outerclothing + loadouts: + - BrigmedicOuterClothingArmor + - BrigmedicOuterClothingCoat + - BrigmedicOuterClothingLab + - BrigmedicOuterClothingVest diff --git a/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml new file mode 100644 index 00000000000..0208f18542e --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Loadouts/role_loadouts.yml @@ -0,0 +1,11 @@ +- type: roleLoadout + id: JobBrigmedic + groups: + - Inventory # Corvax-Loadouts + - BrigmedicHead + - BrigmedicJumpsuit + - BrigmedicBackpack + - BrigmedicOuterClothing + - Survival + - Trinkets + - GroupSpeciesBreathTool diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml new file mode 100644 index 00000000000..67a7bc6904e --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/Security/brigmedic.yml @@ -0,0 +1,42 @@ +- type: job + id: Brigmedic + name: job-name-brigmedic + description: job-description-brigmedic + playTimeTracker: JobBrigmedic + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 14400 + - !type:DepartmentTimeRequirement + department: Medical + time: 57600 + startingGear: BrigmedicGear + icon: "JobIconBrigmedic" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Brig + - Detective + - External + - Medical + - Security + - Maintenance + - Service + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: BrigmedicGear + equipment: + shoes: ClothingShoesBootsJackSecFilled + gloves: ClothingHandsGlovesNitrile + eyes: ClothingEyesHudMedSec + id: BrigmedicPDA + ears: ClothingHeadsetBrigmedic + belt: ClothingBeltMedicalFilled + pocket1: WeaponDisabler + storage: + back: + - Flash + - MedkitAdvancedFilled diff --git a/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml b/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..c1f40833b1f --- /dev/null +++ b/Resources/Prototypes/_CorvaxNext/Roles/play_time_trackers.yml @@ -0,0 +1,2 @@ +- type: playTimeTracker + id: JobBrigmedic From 5a5569dd8046c1b150fe33d33da00a03bbb6d11e Mon Sep 17 00:00:00 2001 From: Zekins Date: Sun, 10 Nov 2024 07:34:04 +0300 Subject: [PATCH 2/2] Rename locale to _corvaxnext --- .../{_corvax-next => _corvaxnext}/preferences/loadout-groups.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/{_corvax-next => _corvaxnext}/preferences/loadout-groups.ftl (100%) diff --git a/Resources/Locale/ru-RU/_corvax-next/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl similarity index 100% rename from Resources/Locale/ru-RU/_corvax-next/preferences/loadout-groups.ftl rename to Resources/Locale/ru-RU/_corvaxnext/preferences/loadout-groups.ftl