From 3af8d4b8c9bfb1e4fb52fab2dfa7898ccaf126bc Mon Sep 17 00:00:00 2001 From: uaNoName <131008018+uaNoName@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:24:31 +0300 Subject: [PATCH] Brigmedic reanimation (#619) * Brigmedic reanimation * fixes ver. 2 * oops * feature/some-new-sprites --- .../ru-RU/locales-new/autotranslate-18.ftl | 2 +- .../ru-RU/locales-new/autotranslate-26.ftl | 2 +- .../ru-RU/locales-new/autotranslate-3.ftl | 2 +- .../ru-RU/locales-new/autotranslate-44.ftl | 2 - .../ru-RU/locales-new/autotranslate-52.ftl | 2 +- .../ru-RU/locales-new/autotranslate-6.ftl | 2 +- .../objects/specific/medical/hypospray.ftl | 3 + .../storage/closets/lockers/lockers.ftl | 3 + .../Fills/Backpacks/StarterGear/backpack.yml | 10 ++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 3 +- .../Fills/Backpacks/StarterGear/satchel.yml | 3 +- .../Catalog/Fills/Lockers/security.yml | 16 +-- .../VendingMachines/Inventories/medidrobe.yml | 1 - .../Objects/Misc/identification_cards.yml | 2 + .../Loadouts/Jobs/Security/brigmedic.yml | 110 ++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 53 ++++++++- .../Prototypes/Loadouts/role_loadouts.yml | 17 +++ Resources/Prototypes/Maps/DryDock.yml | 1 + Resources/Prototypes/Maps/WhiteMoose.yml | 1 + Resources/Prototypes/Maps/Whitebox.yml | 1 + Resources/Prototypes/Maps/WonderBox.yml | 1 + .../Roles/Jobs/Fun/misc_startinggear.yml | 17 --- .../Roles/Jobs/Security/brigmedic.yml | 37 ++++++ .../Prototypes/Roles/Jobs/departments.yml | 1 + Resources/Prototypes/StatusEffects/job.yml | 7 ++ .../Specific/Medical/brigmedic_hypo.yml | 25 ++++ .../brigmedic.rsi/alt-equipped-EARS.png | Bin 0 -> 316 bytes .../Headsets/brigmedic.rsi/equipped-EARS.png | Bin 385 -> 179 bytes .../Ears/Headsets/brigmedic.rsi/icon.png | Bin 568 -> 317 bytes .../Ears/Headsets/brigmedic.rsi/icon_alt.png | Bin 0 -> 485 bytes .../Ears/Headsets/brigmedic.rsi/meta.json | 9 +- .../equipped-HELMET-hamster.png | Bin 0 -> 548 bytes .../beret_brigmedic.rsi/equipped-HELMET.png | Bin 496 -> 560 bytes .../Head/Hats/beret_brigmedic.rsi/icon.png | Bin 370 -> 305 bytes .../Hats/beret_brigmedic.rsi/inhand-left.png | Bin 653 -> 455 bytes .../Hats/beret_brigmedic.rsi/inhand-right.png | Bin 752 -> 499 bytes .../Head/Hats/beret_brigmedic.rsi/meta.json | 6 +- .../brigmedichypo.rsi/equipped-BELT.png | Bin 0 -> 570 bytes .../Medical/brigmedichypo.rsi/hypo.png | Bin 0 -> 480 bytes .../Medical/brigmedichypo.rsi/inhand-left.png | Bin 0 -> 513 bytes .../brigmedichypo.rsi/inhand-right.png | Bin 0 -> 513 bytes .../Medical/brigmedichypo.rsi/meta.json | 26 +++++ 42 files changed, 325 insertions(+), 40 deletions(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Security/brigmedic.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml create mode 100644 Resources/Prototypes/_White/Entities/Objects/Specific/Medical/brigmedic_hypo.yml create mode 100644 Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/alt-equipped-EARS.png create mode 100644 Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon_alt.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png create mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl index 18df623929..4432bcf832 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-18.ftl @@ -22,7 +22,7 @@ ent-HoloprojectorSecurity = голобарьерный проектор .desc = Создает прочный, но хрупкий голографический барьер. ent-ParamedicPDA = ПДА парамедика .desc = Блестящие и стерильные. Имеет встроенный экспресс-анализатор здоровья. -ent-BrigmedicPDA = ПДА парамедика +ent-BrigmedicPDA = ПДА бригмедика .desc = Интересно, чей пульс на экране? Надеюсь, он не остановится... В ПДА встроен анализатор здоровья. ent-SeniorEngineerPDA = ПДА бригадира .desc = Кажется, его несколько раз разбирали и собирали обратно. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-26.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-26.ftl index 3806416227..8095acba71 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-26.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-26.ftl @@ -6,7 +6,7 @@ ent-BookJourney = Путешествие музыки, гор и самопоз .desc = Книга в отличном состоянии, с четкими страницами и глянцевой обложкой. На обложке яркое изображение горного хребта с силуэтом альпиниста с гитарой на спине на переднем плане. Название смелое и привлекающее внимание, с подзаголовком «Путешествие музыки, гор и самопознания». ent-BookInspiration = В поисках вдохновения - путешествие писателя по лесу .desc = Книга в новом состоянии, с обложкой, изображающей безмятежный лесной пейзаж с водопадом и красочными полевыми цветами. Название книги «В поисках вдохновения: путешествие писателя по лесу» и имя автора на видном месте внизу. -ent-BedsheetBrigmedic = простыня бригмедика +ent-BedsheetBrigmedic = одеяло бригмедика .desc = Не хуже хлопка. ent-BookSpaceEncyclopedia = Космическая энциклопедия .desc = Энциклопедия, содержащая все знания. Автор этой энциклопедии неизвестен. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-3.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-3.ftl index 7357c36755..cc75b8009b 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-3.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-3.ftl @@ -34,7 +34,7 @@ ent-ClothingHeadHelmetERTJanitor = шлем уборщика ОБР .desc = Шлем для работы в атмосфере, который носят уборщики из группы экстренного реагирования Nanotrasen. Имеет темно-фиолетовые отблески. ent-ClothingHeadHatHoodMoth = маска моли .desc = Маска в виде головы мотылька обычно изготавливается из легких материалов. Он имитирует форму головы мотылька с большими глазами и длинными усиками. -ent-ClothingMaskBreathMedicalSecurity = медицинская маска военного стиля +ent-ClothingMaskBreathMedicalSecurity = медицинская маска военного образца .desc = Медицинская маска с небольшим слоем защиты от повреждений и вирусов, подобная той, что использовалась в медицинских подразделениях первой корпоративной войны. ent-ClothingMaskClownBase = клоунский парик и маска .desc = Лицевой наряд настоящего шутника. Клоун неполноценен без своего парика и маски. diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-44.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-44.ftl index d682ac2111..7c637865ee 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-44.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-44.ftl @@ -20,8 +20,6 @@ ent-LockerFreezerBase = морозилка .desc = { ent-LockerBase.desc } ent-LockerParamedic = шкаф парамедика .desc = { ent-LockerBase.desc } -ent-LockerBrigmedic = шкаф бригмедика - .desc = { ent-LockerBase.desc } ent-GunSafe = оружейный сейф .desc = { ent-LockerBase.desc } ent-LockerBluespaceStation = блюспейс шкаф diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-52.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-52.ftl index 51c269e051..87f44b4d40 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-52.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-52.ftl @@ -1,7 +1,7 @@ ent-ClothingHeadHelmetHardsuitBasic = базовый шлем скафандра .desc = Стандартный жесткий шлем, обеспечивающий незначительную защиту от большинства источников повреждений. ent-ClothingHeadHelmetHardsuitBrigmedic = шлем скафандра бригмедика - .desc = Легкий шлем бригмедика. Защищает от вирусов и клоунов. + .desc = Легкий шлем скафандра. Защищает от вирусов и клоунов. ent-EffectEmpPulse = "" .desc = "" ent-EffectEmpDisabled = "" diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl index f39cbe2217..162d3abbf1 100644 --- a/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl +++ b/Resources/Locale/ru-RU/locales-new/autotranslate-6.ftl @@ -13,7 +13,7 @@ ent-ClothingOuterCoatLabSeniorPhysician = лабораторный халат м ent-ClothingOuterHardsuitBasic = базовый скафандр .desc = Базовый универсальный защитный костюм, который защищает владельца от ужасов жизни в космосе. По крайней мере, лучше, чем отсутствие жесткого костюма. ent-ClothingOuterHardsuitBrigmedic = скафандр бригмедика - .desc = Специальный защитный костюм бригмедика. Это медицинская версия защитного комбинезона. + .desc = Специальный скафандр службы безопасности, что представляет из себя смесь охранного обычного, и медицинского скафандров. ent-ClothingOuterHardsuitPirateEVA = скафандр ЕВА для открытого космоса .desc = Тяжелый космический скафандр, который обеспечивает некоторую базовую защиту от холодных суровых реалий глубокого космоса. ent-ClothingOuterHardsuitPirateCap = скафандр пиратского капитана diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl index 9bf5e71f93..f071bac205 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/hypospray.ftl @@ -1,6 +1,9 @@ ent-Hypospray = гипоспрей .desc = Стерильный инъектор для быстрого введения лекарств пациентам. .suffix = { "" } +ent-BrigmedicHypospray = гипоспрей бригмедика + .desc = Автоматический инъектор различных реагентов и препаратов, что есть у бригмедика. + .suffix = { "" } ent-SyndiHypo = горлакс гипоспрей .desc = С помощью реверс-инжиниринга технологии NT, Cybersun выпускает их в ограниченном количестве для оперативников Мародеров Горлакса. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl index b66bd34f3e..db861c3ebf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl @@ -61,6 +61,9 @@ ent-LockerWarden = шкаф смотрителя ent-LockerSecurity = шкаф офицера службы безопасности .desc = { ent-LockerBaseSecure.desc } .suffix = { "" } +ent-LockerBrigmedic = шкаф бригмедика + .desc = { ent-LockerBaseSecure.desc } + .suffix = { "" } ent-LockerDetective = шкаф детектива .desc = Обычно пустой и холодный... как твоё сердце. .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index c53fff8212..9ea2be60f4 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -26,6 +26,16 @@ - id: BoxSurvivalSecurity - id: Flash +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelBrigmedic + id: ClothingBackpackBrigmedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - type: entity noSpawn: true parent: ClothingBackpackSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 9bc07949b0..5c98a260ca 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -45,7 +45,8 @@ components: - type: StorageFill contents: - - id: Flash + - id: BoxSurvivalSecurity + - id: Flash - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 82640bc76b..f63d28582e 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -73,7 +73,8 @@ components: - type: StorageFill contents: - - id: Flash + - id: BoxSurvivalSecurity + - id: Flash - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index f511287eba..1541958ab5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -85,20 +85,17 @@ contents: - id: WeaponDisabler - id: TrackingImplanter - amount: 2 - - id: ClothingOuterHardsuitBrigmedic - - id: BoxSterileMask + - id: BrigmedicHypospray - id: ClothingHeadHatBeretBrigmedic + - id: ClothingMaskSterile - id: ClothingOuterCoatAMG - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic - id: ClothingUniformJumpskirtOfLife - prob: 0.1 + - id: ClothingEyesHudMedSec + - id: ClothingHandsGlovesNitrile + - id: ClothingBeltMedicalRig - id: MedkitFilled - - id: MedkitCombatFilled - prob: 0.6 - - id: MedkitAdvancedFilled - prob: 0.4 - id: MedkitOxygenFilled prob: 0.3 - id: MedkitBruteFilled @@ -107,9 +104,8 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 - - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse + - id: ClothingNeckCloakMoth #bзззз, молепокалипсис prob: 0.15 - - id: WeaponDisabler - type: entity id: LockerDetectiveFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index 307ab594ab..291ac2f7d5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -6,7 +6,6 @@ ClothingBackpackSatchelMedical: 4 ClothingHeadHelmetVoidParamed: 1 ClothingOuterHardsuitVoidParamed: 1 - ClothingHeadHatBeretBrigmedic: 4 ClothingHeadNurseHat: 4 ClothingHeadHatParamedicsoft: 4 ClothingHeadsetMedical: 4 diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 16c9404ef3..b04a05a04f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -535,6 +535,8 @@ layers: - state: default - state: idbrigmedic + - type: PresetIdCard + job: Brigmedic - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Loadouts/Jobs/Security/brigmedic.yml new file mode 100644 index 0000000000..5edbda4ef8 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Security/brigmedic.yml @@ -0,0 +1,110 @@ +# Head +- type: itemLoadout # WD + id: BrigmedicWhiteBeret + equipment: BrigmedicWhiteBeret +- type: startingGear + id: BrigmedicWhiteBeret + equipment: + head: ClothingHeadHatBeretBrigmedic + +- type: itemLoadout # WD + id: BrigmedicSurgcapBlue + equipment: BrigmedicSurgcapBlue +- type: startingGear + id: BrigmedicSurgcapBlue + equipment: + head: ClothingHeadHatSurgcapBlue + +# Ears +- type: itemLoadout # WD + id: HeadsetBrigmedic + equipment: HeadsetBrigmedic +- type: startingGear + id: HeadsetBrigmedic + equipment: + ears: ClothingHeadsetBrigmedic + +# Uniform +- type: itemLoadout # WD + id: BrigmedicWhiteJumpsuit + equipment: BrigmedicWhiteJumpsuit +- type: startingGear + id: BrigmedicWhiteJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedic + +- type: itemLoadout # WD + id: BrigmedicWhiteJumpskirt + equipment: BrigmedicWhiteJumpskirt +- type: startingGear + id: BrigmedicWhiteJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtBrigmedic + +# Back +- type: itemLoadout # WD + id: BackpackBrigmedic + equipment: BackpackBrigmedic +- type: startingGear + id: BackpackBrigmedic + equipment: + back: ClothingBackpackBrigmedicFilled + +- type: itemLoadout # WD + id: SatchelBrigmedic + equipment: SatchelBrigmedic +- type: startingGear + id: SatchelBrigmedic + equipment: + back: ClothingBackpackSatchelBrigmedicFilled + +- type: itemLoadout # WD + id: DuffelBrigmedic + equipment: DuffelBrigmedic +- type: startingGear + id: DuffelBrigmedic + equipment: + back: ClothingBackpackDuffelBrigmedicFilled + +# Outerclothing +- type: itemLoadout # WD + id: ArmorCoatBrigmedic + equipment: ArmorCoatBrigmedic +- type: startingGear + id: ArmorCoatBrigmedic + equipment: + outerClothing: ClothingOuterCoatAMG + +- type: itemLoadout # WD + id: LabcoatBasic + equipment: LabcoatBasic +- type: startingGear + id: LabcoatBasic + equipment: + outerClothing: ClothingOuterCoatLab + +# Shoes +- type: itemLoadout # WD + id: JackBootsBrigmedic + equipment: JackBootsBrigmedic +- type: startingGear + id: JackBootsBrigmedic + equipment: + shoes: ClothingShoesBootsJack + +- type: itemLoadout # WD + id: RedShoesBrigmedic + equipment: RedShoesBrigmedic +- type: startingGear + id: RedShoesBrigmedic + equipment: + shoes: ClothingShoesColorRed + +# PDA +- type: itemLoadout + id: BrigmedicPDA + equipment: BrigmedicPDA +- type: startingGear + id: BrigmedicPDA + equipment: + id: BrigmedicPDA diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 205fec1ded..8fe0fa5e90 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1,4 +1,4 @@ -# Miscellaneous + - type: loadoutGroup id: Trinkets name: loadout-group-trinkets @@ -1485,6 +1485,57 @@ loadouts: - SecurityPDA +- type: loadoutGroup # WD + id: BrigmedicHead + name: loadout-group-head + minLimit: 0 + loadouts: + - BrigmedicWhiteBeret + - BrigmedicSurgcapBlue + +- type: loadoutGroup # WD + id: BrigmedicHeadset + name: loadout-group-ears + loadouts: + - HeadsetBrigmedic + +- type: loadoutGroup # WD + id: BrigmedicUniform + name: loadout-group-jumpsuit + loadouts: + - BrigmedicWhiteJumpsuit + - BrigmedicWhiteJumpskirt + +- type: loadoutGroup # WD + id: BrigmedicBackpack + name: loadout-group-backpack + loadouts: + - BackpackBrigmedic + - SatchelBrigmedic + - DuffelBrigmedic + - CommonSatchelLeatherSecurity + +- type: loadoutGroup # WD + id: BrigmedicOuterClothing + name: loadout-group-outerclothing + minLimit: 0 + loadouts: + - ArmorCoatBrigmedic + - LabcoatBasic + +- type: loadoutGroup # WD + id: BrigmedicShoes + name: loadout-group-shoes + loadouts: + - JackBootsBrigmedic + - RedShoesBrigmedic + +- type: loadoutGroup # WD + id: BrigmedicPDA + name: loadout-group-pda + loadouts: + - BrigmedicPDA + - type: loadoutGroup id: DetectiveHead name: loadout-group-head diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index d492b73e99..48a7055a24 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -532,6 +532,23 @@ - CommonUnderwearBra - CommonUnderwearSocks +- type: roleLoadout + id: JobBrigmedic + groups: + - BrigmedicHead + - BrigmedicHeadset + - BrigmedicUniform + - BrigmedicBackpack + - BrigmedicOuterClothing + - CommonMedicalGloves + - BrigmedicShoes + - CommonMedicalMask + - BrigmedicPDA + - Trinkets + - CommonUnderwearBottom + - CommonUnderwearBra + - CommonUnderwearSocks + - type: roleLoadout id: JobSecurityOfficer groups: diff --git a/Resources/Prototypes/Maps/DryDock.yml b/Resources/Prototypes/Maps/DryDock.yml index db8d3ba206..7980ed17cd 100644 --- a/Resources/Prototypes/Maps/DryDock.yml +++ b/Resources/Prototypes/Maps/DryDock.yml @@ -33,6 +33,7 @@ SecurityCadet: [ 4, 4 ] Detective: [ 1, 1 ] Lawyer: [ 2, 2 ] + Brigmedic: [ 1, 1 ] #Medical SeniorPhysician: [ 1, 1 ] Chemist: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/WhiteMoose.yml b/Resources/Prototypes/Maps/WhiteMoose.yml index f338a317d8..6c74265e94 100644 --- a/Resources/Prototypes/Maps/WhiteMoose.yml +++ b/Resources/Prototypes/Maps/WhiteMoose.yml @@ -34,6 +34,7 @@ SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] Lawyer: [ 1, 1 ] + Brigmedic: [ 1, 1 ] #Medical SeniorPhysician: [ 1, 1 ] Chemist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/Whitebox.yml b/Resources/Prototypes/Maps/Whitebox.yml index 437b96a65f..0170e3ceb9 100644 --- a/Resources/Prototypes/Maps/Whitebox.yml +++ b/Resources/Prototypes/Maps/Whitebox.yml @@ -57,3 +57,4 @@ SeniorPhysician: [ 1, 1 ] SeniorEngineer: [ 1, 1 ] Borg: [ 2, 2 ] + Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/WonderBox.yml b/Resources/Prototypes/Maps/WonderBox.yml index 72907787a2..908138feb2 100644 --- a/Resources/Prototypes/Maps/WonderBox.yml +++ b/Resources/Prototypes/Maps/WonderBox.yml @@ -22,6 +22,7 @@ Passenger: [ -1, -1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] + Brigmedic: [ 1, 1 ] Chef: [ 2, 2 ] Clown: [ 1, 1 ] Janitor: [ 4, 4 ] diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 6d531175b7..6cc016e231 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -246,23 +246,6 @@ inhand: - 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 - # Aghost - type: startingGear id: MobAghostGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml new file mode 100644 index 0000000000..2c60e6a243 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -0,0 +1,37 @@ +- type: job + id: Brigmedic + name: job-name-brigmedic + description: job-description-brigmedic + playTimeTracker: JobBrigmedic + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 7200 #15 часов + - !type:DepartmentTimeRequirement + department: Medical + time: 18000 #20 часов + - !type:SpeciesRequirement + species: + - Human + icon: "JobIconBrigmedic" + supervisors: job-supervisors-hos + whitelistedSpecies: + - Human + canBeAntag: false + access: + - Security + - Brig + - Medical + - External + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + +- type: startingGear + id: BrigmedicGear + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedic + back: ClothingBackpackBrigmedicFilled + shoes: ClothingShoesBootsCombat + id: BrigmedicPDA + ears: ClothingHeadsetBrigmedic diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index becf6c87eb..952c326045 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -30,6 +30,7 @@ - SeniorOfficer - SecurityOfficer - Detective + - Brigmedic - SecurityCadet buttonStyle: ButtonColorSecurityDepartment diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 6f893f555c..786e5d3a72 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -89,6 +89,13 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: SecurityOfficer +- type: statusIcon + parent: JobIcon + id: JobIconBrigmedic + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Brigmedic + - type: statusIcon parent: JobIcon id: JobIconNoId diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/brigmedic_hypo.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/brigmedic_hypo.yml new file mode 100644 index 0000000000..d9089fa4ab --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/brigmedic_hypo.yml @@ -0,0 +1,25 @@ +- type: entity + parent: BaseItem + id: BrigmedicHypospray + name: brigmedic hypospray + description: An injector (most often) of medicines in liquid form, it has a small inscription on it "PROPERTY OF A BRIGMEDIC, HANDS OFF!" + components: + - type: Sprite + sprite: Objects/Specific/Medical/brigmedichypo.rsi + state: hypo + - type: Item + sprite: Objects/Specific/Medical/brigmedichypo.rsi + - type: SolutionContainerManager + solutions: + hypospray: + maxVol: 5 + - type: RefillableSolution + solution: hypospray + - type: ExaminableSolution + solution: hypospray + - type: Hypospray + onlyAffectsMobs: false + - type: UseDelay + delay: 2.5 + - type: StaticPrice + price: 550 diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/alt-equipped-EARS.png new file mode 100644 index 0000000000000000000000000000000000000000..f3e834b24783f35474600231dda87a99c030f521 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`m<9NRxW>lD zMnpse1_mZ2CHeaL=H%p5RaKRimL6naNE8roG4L#EuXY7emD^am_jx89xY`#9ed=t2fhS3j3^P6mdKI;Vst07|q$ AkN^Mx literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TS6 zr;B4q#hkaZ&iWp9kYK&vZn2Yb-E6HF?LitUu}fBnIP}@*v8>yzJ-hIO^hxvEvt%p( zD(Bz4HnDOMYlcvR*aA<6sD@`d%a5-L%G|hQQ=YWe+2ZfNzqo%lyvwL^^7?z>{Z~#T z)*tJ?&+s?+LC)(%wS9l4Uvf>>H`}(`Z0_1?v!b(auULQJ?)q|{ZSDC@zxOk-z2yI} z?fb^_fqU;Wh4u?4Jo)|X!+SJd95O58%gGLsv<wJ%g~2JBY_7}O00K# zgkjhRU=F`yW(~Vf5<%bIx^Lq6w{9U^9k1&)@cbkjm@4s<3V4 oy-IXR{_%AU{u|&727_TN?y;aw#Uo$w=Kufz07*qoM6N<$f|Fr^bN~PV delta 543 zcmV+)0^t3<0=NW_B!3BTNLh0L01FcU01FcV0GgZ_0005%Nkl#-4ep7#O}E;01v$lSYs2Y@WgY=1Bq^agQuAf8U`SSdwO6hu)3z-F^C!{Jb@ z*Xzyztqx2k6BAFT_{Yb#_v!o`r4)dLD4h|z-L4Zrs{@a|7MwhIhU*t^NSD5|!ivb?f82mPx$pGibPR9J=Wl|f3wKoo|*7NIIkT+Zk|EkY<=NI?)nv+xY<#w&Q8;stsK7fP-m zuC$O%EUk271JQQTabrT%)+9}-oBW%Q%$xUrdGAdErAn3hXI1iUsGFt+*ss;%XAh5$ zx$|rU(6lU_y#JWb*{{{&>n0$XH`Gm2M`lmY&y{sR(b`r4BBON%P0P~BYUF`P4ZL(5 z9lpQwI-P#&JAChb1Oem%sHO$n-rZFW4-S5r8$xjDIB^SJr&DG@z$^&jLCvC#r?+WY z+7JSOq37YcZoFpOHii(HDzPyDz{UBw9(o?_b{hcS_ZbWZF~oR0PR*a%g1A=hUPVHoDhQ3wEF{x$hYjYgy00ThMUD{8)6 zE&-5Ia>|5mx0`E!p;G{$l+ukx1Arh15JJ%Dbm;f{nNC4!fRr+xPx$-bqA3RCt{2+A&BQQ5XmCf1q1H zDs>g#$yNE)N{C2=ci!hgAc27jh!`|E713clW;cy?4|1 z03sqHq9K)u`-0>N#Xr$HM;3?k?(=*GXcC<;(FgmV#FJtZ7=t zaXoQdPm&}*b^@CI1sZ-Ec|C{bzd$zDzX3?+e!y0zlaalHC;9b4rJ^C-tUq>PVJMV} m#_%qlh=_=Yh=_>jIlBcn^~<}V5x+M80000jy1F!^;F@NewL_t(|obB22H;<`3y6JCkSr-Zz`{x-V4+~4cobSm z5G*VLQ9F?o3L;oo31XEk7K0LmwXm~_7>Qbj4FM&f&48AIJPX~$E09@}sQ7=?W|;HM zqTj4TOOMp1%Ci95P7Gh6@;crJLWRkci*)h@pP^_%xb zL_|bHL_|bHL_|bHzrnZb1Kz4vj{d9lQ^|c_`AY2pre#ZC@e0k3ipF@LH_L_t(|obB2_OF~f`#__Mv3ka@34dE=*<|smwgER=`)*S+u zpt;G0d%`d4gTV^`7Z+z-Fgp2u{|SKi*JpMPk7yt40nJQ9u#*SU`c|W{ z3mzd%eew9@yWQJwuj_QKGYganu248X&~W2O_G zWI|071o`w!6o2)c#+*8UPUkuo1bG9qec}D&E0oU{5agYD6r2J`k~jMOCyK?5i4QRgmqM3UB+1*KjODysYqh$uO$nB5 zmYBz_X|D$!@6?#biHnGch=_=Yh=_=Yh%B5BInb|%sDwS~00000NkvXXu0mjffmGX? diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png index e64e21485670bfdbe62066e5076d0c23539ff461..81556856b75aea1558f8dc1893119077588db97f 100644 GIT binary patch delta 266 zcmV+l0rmd!0q3h2sw@{2f!@H739bk6YFcD9e;rAa~MEQcreRv-FeDz z{=^xEs*490+VmYrasU&t3b6$*y5)z@onv5})d`Wi^N1*O@upJbRF4h7EQcF5tCQh> zS~3MdFw3#|lvvA&asaX;kO8SB-Y6IaqhJ(_0$cz9>yUM`oF}ap Q00000NkvXXt^-0~g6JP|h5!Hn delta 331 zcmV-R0krqavnMqL;ai5i7S^csP8Z)qiT^c^+w+?&K(yFdjc) zYU0dBJc>q0*#n^2yZ}H5fe?Z$%K-5G22%Ez&ljv#ACHIX8jYYl>+Lq(+t*#tV^}WV zP0E@X2*W{MZaKhalU51?#PNjn`l}uTTD(lRdtE6W#}i%_Z?tdjxIM?%#Oa{~-A<*F zy$h$&;{N3oU_>qs1|yiwUI_wOn5Ysj)A{}cYJ7(J0`~j&MJxzp@zkoY`HYMb>-g~; d4u`|>7eCM;d@k76y;A@H002ovPDHLkV1nrgo2>u< diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png index b516a3930bf4a85ef33e1ee39ff96958fdddfa2e..295ec74b89bf91821cb633acc3b4d62f5cb138a8 100644 GIT binary patch delta 417 zcmV;S0bc%%1;+!BFn0Do3vYeC!5;gaoowI*R!N03^%+I9caMEmLUokXGw!9%~~j+|wthx*sY zEj|$u5fKp)5fKp)5fM$h@vpge=v5-mW%IwTMNSkIj|XQ3{Hx-6QgJ=$RaG9;#AGgI z7;;d0>T2`PApnD&Kj=kEdHgTP=^31C0nNtisE0yCL>fdyGz~rg<4UP2Z02k~00000 LNkvXXu0mjfa-PFz delta 616 zcmV-u0+;>A1C0fcFn@!H`F~P#-~8NsKGIsAR}br3 ztvyzEJI21<7+7OWysac2fale1rBVi<{PYE7_X;q45Yc)7-*2?D9ViT~q_{3H!Or+=6!)~IH!JzfjoI1_Zc2Q(TRCYZLUxDzlQtLg-;)?T>zM$R?lT#gQV zjL&T1x|2h%6RnN9_3^!Je6figSRk6!nzgo(bIs9VkKXnUY`yCH&PgZtM?=Aw zAFCx_3ZExA0m&trFLC+CbpU$XI|D~Oj$nhQg(x0?wSP7|y`(okjB^oyq;v5%m_{0a zbOX{f0O0^Z)<=4rN$LW=%~1DgXcg2mk;800000(o>TF00009DJTWIT+mUF<4_W-ZO|5l)c)U;+`R5N z=Vm$=AR;0nA|fIp>N1h91D5TGcbq&(V|Qc<>HVFC`@+o7O@9G^v59eiY-M@&`xq?S z5v7#e-sMG2Ps>GrzidUL;=QmF7`iEz?a1w2UY=7aQA&wYO6m(+&(DfwJCdB4K&kwQ zqFVs~+^;QR^ymZtkjrF4zY+}H6tC)&@DovVE1#0k3)HIX$z`&k4>U-?yk$rm^iP6{3qvR)fw ze~*udh=_=Yh=_=Yh=_>3({>LqsNMXdK75F@HCfAcWU^d9pX>T#Z+m+H(6j{|X1%RG zVCbeKv>2YW7^3R~{&>&!HeNIhx$5h$PVld_oPd)1fJUNQK|+h6RDS%pu(4U&SW(Re zKO90WC&1(FBJp^A_fFee(AH#|?ZoJ`z=?>6h`Qc8>gcGeS@lsX00000NkvXXu0mjf DV8`K9 delta 716 zcmV;-0yF*d1MmfqFnKR77)HNqBC$bHLL)^T-HDk>MJ38ch7JKK zL79f zH2I$t$+|nA-+j50ZJhyvAP9mW2!bF8f*^zE$&Z2-Xh z{6jpRy5Z_C;#gdK&hz=4NUYo4w>9jnUSZAbFW0GTc5JOPlMXW=XJ2ku`;TObC?q&{ zx&uHg7DuXo@1ce0WT2f(REx)b%iVPxRnmgPvlXWd;)&^H^-2?!!mWK(iS!25k zxUJ=3qwj5S*zvs$jv^F*YysI&0I~&SGx7mM`!^YE!n{cWGy^CA3P84iY$yQP0;Wed}j{9nE&7z9EE zVBd>h|8u;~Bbg%GC_MrIq|@neh8IlWCE)xJA(fgH`|+2FKmp9n-FN*E0XW@ezf1&L z0TF0000?T9kc1PYxmPh28M9d;?&MMmz^ZxIhNy~oT*DtRv-|l{fXZA@?_6csR9#G;~ z730s3@-8fC=L9cmob>k9TDw2Z;nKm`ZC||;oEVIw)l-rVZ1b&mnBKq@z<7yqNg#+g zdA{z+?5MThwjTdlJO5Ju=l^GHnb|Z7H%7QzEe$M|* zCR(w74|D&f;*<{Egn}*2TaPt=%(g%BtJXn>amwk1Tg!W%sF+rigO9d^cYpq3$n#r*4CupZG-Qo*Ui?az=YuHnnk0;8W-&lJH&guOV~B zJ>v-;491J&)+a9wU|_g2|L2`I3ro8ybLf~zopr0H$f|XaE2J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png new file mode 100644 index 0000000000000000000000000000000000000000..071b9f0b1a53efac843c7382b1a25e576192bfa1 GIT binary patch literal 480 zcmV<60U!Q}P)fMk zFqlNpU^JLSY-$$NW*WFAh})PZFSw0eoa0%Xdj5gCchec}+aCAc@Avur<%Cj-ZmOrN z-UEOD;6DI_++GwykWZu(!0hGew|CC627s8z6*~`*Po&g%d>C_Yi_ys`$G1wQ3_yHg z9zf+chnUC}MMnW1DwQt|KdNe3>@FVxuyIimD(B9waJval#%2H%K&o88l+xk6R)2Ct z?AEU947^GJ><^5PDi_{7e0J_duBRY*eeO8hb^}vNY`dZB8}Lv9A>Mra5mgUuqK7egEC@m%dD5bZlT9&UecrHPxw@-z`5o)U| z3?3c>{-!`1pgo4|3_Q1*f71h>WlBjn9MOL7bq_f7Q}kZsD+9LOAVY+;-k7!xZGijY z9nI_}(?&ml(uMHd19RymUl2M|0H88B8*kd^7gzO1c3MxsFO1=Dsq4RF0YCr{0K5Rr W|D_k8)hwp~00007XSaVsysxHmXN5m468E-J<=rBY#^s**!Z`jC?!)PYfpnKpL(+1WX z5e(ZHW}jqlSoN=h@xZcGC85(^?Y(X$oNKH&``G2QMfa*>r!LJ~<<zuL+ zZ$CA-1}40-W!O=D&w=UAoobyfrrS>$m&^XzzV}xc1H+nAL5vH|vM5J0W*Gnc#QrP1 zf%`3|mH9UFKl#7D*)5i9Qd(3R+n@A(%erjQi5b^dFjUT4{Mw4g(vVs3;=0!po>zV` z3}pPa*_7cyg^k^p^v7?u&tJQ6eSYBaBmejc-k;a!ul<~Er|h!Z?_c|bTJAeHA3xlH z;UQ`612}#CY!So4kDqma+O6`heditS@aM-*FQ&!6w)`=Zd#`L#x6kx?-05SF|EC%V z?e Q0T`zYp00i_>zopr0QTM3E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d8f2d290e4a47ca8129d30383ba3c57f0480417d GIT binary patch literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vn` zPZ!6KiaBp*9n3xCAmI9c8PgW0Y5Z-ITa}i)JjiuJc1hnB7w&yUi`p(QxR)F5Y|#k1 zc2Y{ruJ5_0Os>7XSaVsysxHmXN5m468E-J<=rBY#^s**!Z`jC?!)PYfpnKpL(+1WX z5e(ZHW}jqlSoN=h@xZcGC85(^?Y(X$oNKH&``G2QMfa*>r!LJ~<<zuL+ zZ$CA-1}40-W!O=D&w=UAoobyfrrS>$m&^XzzV}xc1H+nAL5vH|vM5J0W*Gnc#QrP1 zf%`3|mH9UFKl#7D*)5i9Qd(3R+n@A(%erjQi5b^dFjUT4{Mw4g(vVs3;=0!po>zV` z3}pPa*_7cyg^k^p^v7?u&tJQ6eSYBaBmejc-k;a!ul<~Er|h!Z?_c|bTJAeHA3xlH z;UQ`612}#CY!So4kDqma+O6`heditS@aM-*FQ&!6w)`=Zd#`L#x6kx?-05SF|EC%V z?e Q0T`zYp00i_>zopr0QTM3E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json new file mode 100644 index 0000000000..f9f17b8295 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from syndicate station from PR https://github.com/space-syndicate/space-station-14/pull/422, sprite modified by PuroSlavKing (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hypo" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +}