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 0000000000..f3e834b247 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png index 527a02843a..6d43ab838e 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png index c2160a1d86..06144ab283 100644 Binary files a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon_alt.png new file mode 100644 index 0000000000..9e4ab9aaa0 Binary files /dev/null and b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon_alt.png differ diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json index 529b60f838..44765be2ef 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by PuroSlavKing (github) for SS14", + "copyright": "Made by 6Mirage6", "size": { "x": 32, "y": 32 @@ -10,9 +10,16 @@ { "name": "icon" }, + { + "name": "icon_alt" + }, { "name": "equipped-EARS", "directions": 4 + }, + { + "name": "alt-equipped-EARS", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..752cbbc75f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png index 9a6ed93c6d..46945895ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png differ 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 e64e214856..81556856b7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png differ 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 b516a3930b..295ec74b89 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png index cc35f7a123..be478b48c7 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json index 11ea5a5b10..5258c784e2 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "6Mirage6", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png new file mode 100644 index 0000000000..dab595ca54 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png differ 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 0000000000..071b9f0b1a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png new file mode 100644 index 0000000000..d8f2d290e4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png differ 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 0000000000..d8f2d290e4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png differ 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 + } + ] +}