Merge remote-tracking branch 'upstream/master' into ups

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -98,6 +98,12 @@ namespace Content.Client.Options.UI.Tabs
             _deferCommands.Add(_inputManager.SaveToUserData);
         }
 
+        private void HandleHoldLookUp(BaseButton.ButtonToggledEventArgs args) // WD EDIT
+        {
+            _cfg.SetCVar(WhiteCVars.HoldLookUp, args.Pressed);
+            _cfg.SaveToFile();
+        }
+
         private void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args) // WD EDIT
         {
             _cfg.SetCVar(WhiteCVars.AutoGetUp, args.Pressed);
@@ -194,6 +200,7 @@ namespace Content.Client.Options.UI.Tabs
             AddButton(ContentKeyFunctions.OfferItem); // WD EDIT
             AddButton(ContentKeyFunctions.LieDown); // WD EDIT
             AddButton(ContentKeyFunctions.LookUp); // WD EDIT
+            AddCheckBox("ui-options-function-hold-look-up", _cfg.GetCVar(WhiteCVars.HoldLookUp), HandleHoldLookUp); // WD EDIT
             AddCheckBox("ui-options-function-auto-get-up", _cfg.GetCVar(WhiteCVars.AutoGetUp), HandleToggleAutoGetUp); // WD EDIT
 
             AddHeader("ui-options-header-interaction-adv");

Content.Client/_White/Telescope/TelescopeSystem.cs

@@ -1,14 +1,16 @@
 using System.Numerics;
 using Content.Client.Viewport;
+using Content.Shared._White;
 using Content.Shared._White.Telescope;
-using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
+using Robust.Shared.Configuration;
 using Robust.Shared.Input;
+using Robust.Shared.Input.Binding;
 using Robust.Shared.Timing;
 
 namespace Content.Client._White.Telescope;
@@ -21,9 +23,26 @@ public sealed class TelescopeSystem : SharedTelescopeSystem
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     private ScalingViewport? _viewport;
+    private bool _holdLookUp;
+    private bool _toggled;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _cfg.OnValueChanged(WhiteCVars.HoldLookUp,
+            val =>
+            {
+                var input = val ? null : InputCmdHandler.FromDelegate(_ => _toggled = !_toggled);
+                _input.SetInputCommand(ContentKeyFunctions.LookUp, input);
+                _holdLookUp = val;
+                _toggled = false;
+            },
+            true);
+    }
 
     public override void FrameUpdate(float frameTime)
     {
@@ -37,7 +56,10 @@ public sealed class TelescopeSystem : SharedTelescopeSystem
         var entity = GetRightEntity(player);
 
         if (entity == EntityUid.Invalid)
+        {
+            _toggled = false;
             return;
+        }
 
         var telescope = Comp<TelescopeComponent>(entity);
 
@@ -46,13 +68,17 @@ public sealed class TelescopeSystem : SharedTelescopeSystem
 
         var offset = Vector2.Zero;
 
+        if (_holdLookUp)
+        {
             if (_inputSystem.CmdStates.GetState(ContentKeyFunctions.LookUp) != BoundKeyState.Down)
             {
-            RaisePredictiveEvent(new EyeOffsetChangedEvent
+                RaiseEvent(offset);
+                return;
+            }
+        }
+        else if (!_toggled)
         {
-                Offset = offset
-            });
-
+            RaiseEvent(offset);
             return;
         }
 
@@ -89,6 +115,11 @@ public sealed class TelescopeSystem : SharedTelescopeSystem
             offset = new Angle(-eye.Rotation.Theta).RotateVec(offset);
         }
 
+        RaiseEvent(offset);
+    }
+
+    private void RaiseEvent(Vector2 offset)
+    {
         RaisePredictiveEvent(new EyeOffsetChangedEvent
         {
             Offset = offset

Content.Shared/_White/WhiteCVars.cs

@@ -320,6 +320,12 @@ public sealed class WhiteCVars
     public static readonly CVarDef<bool> AutoGetUp =
         CVarDef.Create("white.auto_get_up", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);
 
+    /// <summary>
+    ///     Determines whether telescope functions by holing a button or via toggle
+    /// </summary>
+    public static readonly CVarDef<bool> HoldLookUp =
+        CVarDef.Create("white.hold_look_up", false, CVar.CLIENT | CVar.ARCHIVE);
+
     /*
      * Aspects
      */

Resources/Changelog/ChangelogWhite.yml

@@ -8151,3 +8151,59 @@
   id: 487
   time: '2024-08-12T22:34:10.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/616
+- author: Warete
+  changes:
+  - message: "\u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0438\
+      \ \u043D\u0435\u0431\u043E\u043B\u044C\u0448\u043E\u0439 \u0444\u0438\u043A\u0441\
+      \ \u043B\u043E\u0434\u0430\u0443\u0442\u043E\u0432 \u043D\u043E\u0432\u044B\u0445\
+      \ \u0440\u043E\u043B\u0435\u0439."
+    type: Add
+  id: 488
+  time: '2024-08-14T18:28:06.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/617
+- author: Aviu
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u043D\u0430\u0441\u0442\
+      \u0440\u043E\u0439\u043A\u0430\u0445 \u0435\u0441\u0442\u044C \u043E\u043F\u0446\
+      \u0438\u044F \u0443\u0434\u0435\u0440\u0436\u0438\u0430\u0432\u043D\u0438\u044F\
+      \ \u0438\u043B\u0438 \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0435\u043D\
+      \u0438\u044F \u043A\u043D\u043E\u043F\u043A\u0438 \u0434\u043B\u044F \u043F\u0440\
+      \u0438\u0446\u0435\u043B\u0438\u0432\u0430\u043D\u0438\u044F, \u043F\u043E \u0443\
+      \u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u0441\u0442\u043E\u0438\u0442\
+      \ \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435."
+    type: Add
+  - message: "\u041A\u043D\u043E\u043F\u043A\u0430 \u043F\u0440\u0438\u0446\u0435\u043B\
+      \u0438\u0432\u0430\u043D\u0438\u044F \u043F\u043E \u0443\u043C\u043E\u043B\u0447\
+      \u0430\u043D\u0438\u044E: \u041F\u0440\u043E\u0431\u0435\u043B."
+    type: Tweak
+  id: 489
+  time: '2024-08-14T18:27:24.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/618
+- author: keslik
+  changes:
+  - message: "\"\u041F\u0440\u0438\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435\
+      \" \u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u043E\
+      \ \u0432 \"\u0421\u0430\u043B\u044E\u0442\u043E\u0432\u0430\u0442\u044C\""
+    type: Tweak
+  id: 490
+  time: '2024-08-14T19:24:49.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/620
+- author: ua_No_Name48237
+  changes:
+  - message: "\u0420\u043E\u043B\u044C \u0431\u0440\u0438\u0433\u043C\u0435\u0434\u0438\
+      \u043A\u0430, \u0432\u043C\u0435\u0441\u0442\u0435 \u0441\u043E \u0432\u0441\
+      \u0435\u043C\u0438 \u0448\u043C\u043E\u0442\u043A\u0430\u043C\u0438."
+    type: Add
+  - message: "\u0411\u0440\u0438\u0433\u043C\u0435\u0434\u0438\u043A \u0434\u043E\u0431\
+      \u0430\u0432\u043B\u0435\u043D \u043D\u0430 \u0432\u0430\u0439\u0442\u0431\u043E\
+      \u043A\u0441, \u0432\u0430\u0439\u0442\u043C\u0443\u0441\u0441, \u0432\u0430\
+      \u043D\u0434\u0435\u0440\u0431\u043E\u043A\u0441 \u0438 \u0434\u0440\u0430\u0439\
+      (\u043A)\u0434\u043E\u043A"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043E \u043D\u0430\u043F\u043E\
+      \u043B\u043D\u0435\u043D\u0438\u0435 \u0448\u043A\u0430\u0444\u0430 \u0431\u0440\
+      \u0438\u0433\u043C\u0435\u0434\u0438\u043A\u0430."
+    type: Tweak
+  id: 491
+  time: '2024-08-14T19:24:31.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/619

Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl

@@ -144,6 +144,8 @@ ui-options-function-auto-get-up = Автоматически вставать п
 ui-options-function-save-item-location = Сохранить позицию предмета
 ui-options-static-storage-ui = Закрепить интерфейс хранилища на хотбаре
 ui-options-function-offer-item = Передать что-то
+ui-options-function-look-up = Присмотреться/Прицелиться
+ui-options-function-hold-look-up = Удерживать клавишу для прицеливания
 
 ui-options-function-smart-equip-backpack = Умная экипировка в рюкзак
 ui-options-function-smart-equip-belt = Умная экипировка на пояс

Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl

@@ -40,3 +40,5 @@ ent-ClothingHeadBandBlue = синяя бандана
    .desc = Синяя бандана, чтобы выглядеть круто.
 ent-ClothingHandsGlovesInspector = перчатки инспектора
     .desc = Длинные кожаные перчатки иснпектора со строгим дизайном. Блестяще!
+ent-ClothingEyesGlassesMaid = очки прислуги
+    .desc = Чистые и милые.

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 = Кажется, его несколько раз разбирали и собирали обратно.

Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl

@@ -34,3 +34,9 @@ ent-ClothingHeadHatBeretBrigmedic = медицинский берет
    .desc = Белый берет выглядит как кремовый пирог на голове.
 ent-ClothingHeadHatBeretMerc =  берет наемника
    .desc = Оливковый берет, на значке изображен шакал на скале.
+ent-ClothingHeadHatMobCap = шапочка горничной
+   .desc = Чепец горничной - Идеальный головной убор для знающей свое дело прислуги. Вы же не хотите, чтобы ваши волосы мешались вам при работе?
+ent-ClothingHeadHatBomzhHat = грязная шапка
+   .desc = Шапка ушедшего века. Она износилась и выглядит потрёпанной.
+ent-ClothingHeadHatBomzhCap = помойная кепка
+   .desc = Кепка незваного гостя. Не внушает доверия.

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 = Энциклопедия, содержащая все знания. Автор этой энциклопедии неизвестен.

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 = Лицевой наряд настоящего шутника. Клоун неполноценен без своего парика и маски.

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 = блюспейс шкаф

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 = ""

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 = скафандр пиратского капитана

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 = { "" }

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 = { "" }

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

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml

@@ -45,6 +45,7 @@
   components:
   - type: StorageFill
     contents:
+    - id: BoxSurvivalSecurity
     - id: Flash
 
 - type: entity

Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml

@@ -73,6 +73,7 @@
   components:
   - type: StorageFill
     contents:
+    - id: BoxSurvivalSecurity
     - id: Flash
 
 - type: entity

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

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

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -301,3 +301,19 @@
         - HamsterWearable
         - WhitelistChameleon
     - type: ShowSecurityIcons
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesMaid
+  name: maid's sunglasses
+  description: Maid's sunglasses. Clean and cute.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi
+  - type: Clothing
+    sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi
+  - type: FlashImmunity
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: ShowSecurityIcons

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -1124,3 +1124,46 @@
   - type: AddAccentClothing
     accent: GnomeAccent
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBomzhHat
+  name: bomzh hat
+  description: An old century hat. It's worn out and looks unkempt.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Head/bomzhhat.rsi
+  - type: Clothing
+    sprite: White/Clothing/Head/bomzhhat.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBomzhCap
+  name: bomzh cap
+  description: Uninvited guest cap. Doesn't inspire confidence.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Head/bomzhcap.rsi
+  - type: Clothing
+    sprite: White/Clothing/Head/bomzhcap.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatMobCap
+  name: maid's mob cap
+  description: The headdress of a true servant.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Head/maidhat.rsi
+  - type: Clothing
+    sprite: White/Clothing/Head/maidhat.rsi

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -440,7 +440,7 @@
     - state: silver
     - state: idbomzh
   - type: PresetIdCard
-    job: Passenger
+    job: Bomzh
 
 - type: entity
   parent: IDCardStandard
@@ -535,6 +535,8 @@
     layers:
     - state: default
     - state: idbrigmedic
+  - type: PresetIdCard
+    job: Brigmedic
 
 - type: entity
   parent: IDCardStandard

Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml

@@ -7,6 +7,31 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitWhiteBomzh
 
+# HEAD
+- type: itemLoadout # WD
+  id: BomzhHeadCap
+  equipment: BomzhHeadCap
+- type: startingGear
+  id: BomzhHeadCap
+  equipment:
+   head: ClothingHeadHatBomzhCap
+
+- type: itemLoadout # WD
+  id: BomzhHeadHat
+  equipment: BomzhHeadHat
+- type: startingGear
+  id: BomzhHeadHat
+  equipment:
+    head: ClothingHeadHatBomzhHat
+
+- type: itemLoadout # WD
+  id: BomzhHeadHatMelon
+  equipment: BomzhHeadHatMelon
+- type: startingGear
+  id: BomzhHeadHatMelon
+  equipment:
+    head: ClothingHeadHatWatermelon
+
 # PDA
 - type: itemLoadout # WD
   id: BomzhPDA

Resources/Prototypes/Loadouts/Jobs/Command/maid.yml

@@ -15,6 +15,24 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtMaidMini
 
+# Head
+- type: itemLoadout # WD
+  id: MaidHeadMobCap
+  equipment: MaidHeadMobCap
+- type: startingGear
+  id: MaidHeadMobCap
+  equipment:
+    head: ClothingHeadHatMobCap
+
+# Eyes
+- type: itemLoadout # WD
+  id: MaidGlasses
+  equipment: MaidGlasses
+- type: startingGear
+  id: MaidGlasses
+  equipment:
+    eyes: ClothingEyesGlassesMaid
+
 # Back
 - type: itemLoadout # WD
   id: MaidSatchel
@@ -60,15 +78,6 @@
   equipment:
     shoes: ClothingShoesMaid
 
-# Glasses
-- type: itemLoadout # WD
-  id: MaidGlasses
-  equipment: MaidGlasses
-- type: startingGear
-  id: MaidGlasses
-  equipment:
-    eyes: ClothingEyesGlassesSecurity
-
 # Job Trinkets
 - type: itemLoadout # WD
   id: MaidSpray

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

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1,28 +1,4 @@
-#Bottom
-- type: loadoutGroup # WD!?
-  id: CommonBottom
-  name: loadout-group-bottom
-  loadouts:
-  - BottomPantiesWhite
-  - BottomBoxersWhite
-  - BottomBeeShorts
-  - BottomBoxersHeart
-  - BottomBoxersStriped
-  - BottomBriefs
-  - BottomFishnetLower
-  - BottomJockstrap
-  - BottomMankini
-  - BottomPantiesBeeKini
-  - BottomPantiesKinky
-  - BottomPantiesNeko
-  - BottomPantiesSlim
-  - BottomPantiesSwimming
-  - BottomPantiesThin
-  - BottomPantiesStripped
-  - BottomPantiesThong
-  - BottomWebLower
 
-# Miscellaneous
 - type: loadoutGroup
   id: Trinkets
   name: loadout-group-trinkets
@@ -1509,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
@@ -2174,6 +2201,13 @@
   - InspectorBriefcaseInhand
 
 # Maid
+- type: loadoutGroup # WD
+  id: MaidSelfDefenceDevices
+  name: loadout-group-self-defence-devices
+  minLimit: 0
+  loadouts:
+  - Flash
+
 - type: loadoutGroup # WD
   id: MaidGlasses
   name: loadout-group-eyes
@@ -2181,6 +2215,13 @@
   loadouts:
   - MaidGlasses
 
+- type: loadoutGroup # WD
+  id: MaidHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - MaidHeadMobCap
+
 - type: loadoutGroup # WD
   id: MaidJumpsuit
   name: loadout-group-jumpsuit
@@ -2230,6 +2271,15 @@
   loadouts:
   - BomzhJumpsuit
 
+- type: loadoutGroup # WD
+  id: BomzhHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - BomzhHeadHat
+  - BomzhHeadCap
+  - BomzhHeadHatMelon
+
 - type: loadoutGroup # WD
   id: BomzhPDA
   name: loadout-group-pda

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -45,12 +45,13 @@
   groups:
   - MaidGlasses # WD
   - CommonCommandHeadset # WD
+  - MaidHead
   - MaidJumpsuit
   - MaidGloves # WD
   - MaidBackpack
   - MaidShoes
   - MaidPDA # WD
-  - SelfDefenceDevices # WD
+  - MaidSelfDefenceDevices # WD
   - MaidJobTrinkets
   - CommonUnderwearBottom
   - CommonUnderwearBra
@@ -266,6 +267,7 @@
   groups:
   - BomzhJumpsuit
   - BomzhPDA
+  - BomzhHead
   - BomzhOuterclothing
   - BomzhJobTrinkets
   - CommonUnderwearBottom
@@ -557,6 +559,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:

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 ]

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 ]

Resources/Prototypes/Maps/Whitebox.yml

@@ -57,3 +57,4 @@
             SeniorPhysician: [ 1, 1 ]
             SeniorEngineer: [ 1, 1 ]
             Borg: [ 2, 2 ]
+            Brigmedic: [ 1, 1 ]

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 ]

Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml

@@ -24,7 +24,7 @@
   whitelistedSpecies:
   - Human
   canBeAntag: true
-  accessGroups:
+  access:
   - Maintenance
 
 - type: startingGear

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -249,23 +249,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

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

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -30,6 +30,7 @@
   - SeniorOfficer
   - SecurityOfficer
   - Detective
+  - Brigmedic
   - SecurityCadet
   buttonStyle: ButtonColorSecurityDepartment
 

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

Resources/Prototypes/Voice/speech_emotes.yml

@@ -160,7 +160,7 @@
 - type: emote
   id: Salute
   category: Hands
-  buttonText: Приветствие
+  buttonText: Салютовать
   chatMessages: [ салютует ]
   chatTriggers:
   - салютует

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

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
     }
   ]
 }

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

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
+        }
+    ]
+}

Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Maid by omsoyk Discord",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/keybinds.yml

@@ -1,4 +1,4 @@
-version: 1 # Not used right now, whatever.
+version: 1 # Not used right now, whatever.
 binds:
 - function: UIClick
   type: State
@@ -545,5 +545,4 @@ binds:
   key: U
 - function: LookUp
   type: State
-  key: MouseRight
-  mod1: Space
+  key: Space