From afd52833a92d5b0f8034add9f2ca133fe818785b Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Wed, 14 Aug 2024 18:27:24 +0000
Subject: [PATCH 1/6] - add: Better telescope keybind. (#618)

---
 .../Options/UI/Tabs/KeyRebindTab.xaml.cs      |  7 +++
 .../_White/Telescope/TelescopeSystem.cs       | 43 ++++++++++++++++---
 Content.Shared/_White/WhiteCVars.cs           |  6 +++
 .../ru-RU/escape-menu/ui/options-menu.ftl     |  2 +
 Resources/keybinds.yml                        |  5 +--
 5 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 2a077806a2..9c7b3c256d 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/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");
diff --git a/Content.Client/_White/Telescope/TelescopeSystem.cs b/Content.Client/_White/Telescope/TelescopeSystem.cs
index c1f90a7b98..5a1f3a0cf6 100644
--- a/Content.Client/_White/Telescope/TelescopeSystem.cs
+++ b/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 (_inputSystem.CmdStates.GetState(ContentKeyFunctions.LookUp) != BoundKeyState.Down)
+        if (_holdLookUp)
         {
-            RaisePredictiveEvent(new EyeOffsetChangedEvent
+            if (_inputSystem.CmdStates.GetState(ContentKeyFunctions.LookUp) != BoundKeyState.Down)
             {
-                Offset = offset
-            });
-
+                RaiseEvent(offset);
+                return;
+            }
+        }
+        else if (!_toggled)
+        {
+            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
diff --git a/Content.Shared/_White/WhiteCVars.cs b/Content.Shared/_White/WhiteCVars.cs
index c72f957ec6..ec7bb60bd1 100644
--- a/Content.Shared/_White/WhiteCVars.cs
+++ b/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
      */
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index 16a8697fd0..f47019e5ec 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/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 = Умная экипировка на пояс
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index add2d5cd31..ebed0d1f21 100644
--- a/Resources/keybinds.yml
+++ b/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

From fe962862d42860971382eb9e3fdc5e529161f0be Mon Sep 17 00:00:00 2001
From: RedBurningPhoenix <147742474+RedBurningPhoenix@users.noreply.github.com>
Date: Wed, 14 Aug 2024 23:28:05 +0500
Subject: [PATCH 2/6] =?UTF-8?q?=D0=A0=D0=B5=D1=81=D1=83=D1=80=D1=81=D1=8B?=
 =?UTF-8?q?=20=D0=B8=20=D0=BB=D0=BE=D0=B4=D0=B0=D1=83=D1=82=D1=8B=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D1=85=20=D1=80=D0=BE=D0=BB=D0=B5=D0=B9=20(#6?=
 =?UTF-8?q?17)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Triumph, Slang and Vends

* govno

* New bomzh and maid resources

* oops

* fixed

* oops
---
 .../ru-RU/locales-new/autotranslate-1.ftl     |   2 +
 .../ru-RU/locales-new/autotranslate-2.ftl     |   6 +++
 .../Entities/Clothing/Eyes/glasses.yml        |  16 +++++++
 .../Entities/Clothing/Head/hats.yml           |  43 ++++++++++++++++++
 .../Objects/Misc/identification_cards.yml     |   2 +-
 .../Loadouts/Jobs/Civilian/bomzh.yml          |  25 ++++++++++
 .../Prototypes/Loadouts/Jobs/Command/maid.yml |  27 +++++++----
 .../Prototypes/Loadouts/loadout_groups.yml    |  23 ++++++++++
 .../Prototypes/Loadouts/role_loadouts.yml     |   4 +-
 .../Prototypes/Roles/Jobs/Civilian/bomzh.yml  |   2 +-
 .../Glasses/maidglasses.rsi/equipped-EYES.png | Bin 0 -> 213 bytes
 .../Eyes/Glasses/maidglasses.rsi/icon.png     | Bin 0 -> 224 bytes
 .../Glasses/maidglasses.rsi/inhand-left.png   | Bin 0 -> 214 bytes
 .../Glasses/maidglasses.rsi/inhand-right.png  | Bin 0 -> 226 bytes
 .../Eyes/Glasses/maidglasses.rsi/meta.json    |  26 +++++++++++
 .../Head/bomzhcap.rsi/equipped-HELMET.png     | Bin 0 -> 425 bytes
 .../White/Clothing/Head/bomzhcap.rsi/icon.png | Bin 0 -> 412 bytes
 .../Head/bomzhcap.rsi/inhand-left.png         | Bin 0 -> 413 bytes
 .../Head/bomzhcap.rsi/inhand-right.png        | Bin 0 -> 414 bytes
 .../Clothing/Head/bomzhcap.rsi/meta.json      |  26 +++++++++++
 .../Head/bomzhhat.rsi/equipped-HELMET.png     | Bin 0 -> 608 bytes
 .../White/Clothing/Head/bomzhhat.rsi/icon.png | Bin 0 -> 371 bytes
 .../Head/bomzhhat.rsi/inhand-left.png         | Bin 0 -> 341 bytes
 .../Head/bomzhhat.rsi/inhand-right.png        | Bin 0 -> 342 bytes
 .../Clothing/Head/bomzhhat.rsi/meta.json      |  26 +++++++++++
 .../Head/maidhat.rsi/equipped-HELMET.png      | Bin 0 -> 228 bytes
 .../White/Clothing/Head/maidhat.rsi/icon.png  | Bin 0 -> 227 bytes
 .../Clothing/Head/maidhat.rsi/inhand-left.png | Bin 0 -> 347 bytes
 .../Head/maidhat.rsi/inhand-right.png         | Bin 0 -> 343 bytes
 .../White/Clothing/Head/maidhat.rsi/meta.json |  26 +++++++++++
 30 files changed, 242 insertions(+), 12 deletions(-)
 create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png
 create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png
 create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png
 create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png
 create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png
 create mode 100644 Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json
 create mode 100644 Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png
 create mode 100644 Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png
 create mode 100644 Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png
 create mode 100644 Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json

diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl
index 9d38f69184..3fa9443c6d 100644
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl
+++ b/Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl
@@ -40,3 +40,5 @@ ent-ClothingHeadBandBlue = синяя бандана
    .desc = Синяя бандана, чтобы выглядеть круто.
 ent-ClothingHandsGlovesInspector = перчатки инспектора
     .desc = Длинные кожаные перчатки иснпектора со строгим дизайном. Блестяще!
+ent-ClothingEyesGlassesMaid = очки прислуги
+    .desc = Чистые и милые.
diff --git a/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl b/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl
index 12f7b81b61..e5b6ca7d91 100644
--- a/Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl
+++ b/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 = Кепка незваного гостя. Не внушает доверия.
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index d0b671151d..c4241b6af5 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/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
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 4a0580aeeb..6b92f8c94e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/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
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 630caf8aa2..16c9404ef3 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/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
diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml
index 4d25ba2b76..5f14da8cc9 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml
+++ b/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
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml b/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml
index b527726184..cb51269069 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/maid.yml
+++ b/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
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 1608304140..205fec1ded 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -2150,6 +2150,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
@@ -2157,6 +2164,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
@@ -2206,6 +2220,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
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 3004759a28..d492b73e99 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -44,12 +44,13 @@
   groups:
   - MaidGlasses # WD
   - CommonCommandHeadset # WD
+  - MaidHead
   - MaidJumpsuit
   - MaidGloves # WD
   - MaidBackpack
   - MaidShoes
   - MaidPDA # WD
-  - SelfDefenceDevices # WD
+  - MaidSelfDefenceDevices # WD
   - MaidJobTrinkets
   - CommonUnderwearBottom
   - CommonUnderwearBra
@@ -254,6 +255,7 @@
   groups:
   - BomzhJumpsuit
   - BomzhPDA
+  - BomzhHead
   - BomzhOuterclothing
   - BomzhJobTrinkets
   - CommonUnderwearBottom
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml
index eaf82401c4..0d7df61428 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml
@@ -24,7 +24,7 @@
   whitelistedSpecies:
   - Human
   canBeAntag: true
-  accessGroups:
+  access:
   - Maintenance
 
 - type: startingGear
diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/equipped-EYES.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ddbaa3fc21bb9d510380ece0230337229372e1d
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|`aNA7Ln`LH
zy=BOC$U%Vhg65th&%&x%tgWN1gCp6$bt&GiWZB4dq+y1JTg&%^gtCO6hp$O9GITGU
z(iY?u?)CE7->{$A&(^=W7I#D5&-dKU-i{U5Z#&Bi7Fx>RznQ!-DtmJpAJ7^QkoVH$
zP0s!5o-oVw+IHjldPcV2YwzbxwLSmqrZPlD{Zl^e2j=o2h8I781Uy~+T-G@yGywp5
Cr%s~)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8655cec598f5c84b8c83e13c65daa79f59146fd3
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}vpiiKLn2z=
zUf9TcSV4gGg8viI7#VE^{l|qbF6}sPbLK%?hp5j(MGs-6B*hK8J$|l#^kadwtb>co
zm-iv>8#`2N`{q}DjhlP&oK)4>wOji?<wZ{uNe)^2<`l!(<4Tj}6qhp?9P?pVuytN>
z-04%j3<tKo&)~g!$3e5@Lyi3NJ&jS@s@A(a$re7ot0dcWZSAS@y=!DXL<kEC{+%Lz
X!aT6Po!!_A=t>4pS3j3^P6<r_jrUwp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1176e7c0700e78f6a4c9472d77d641f82c1feb0
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|CV09yhE&XX
zdut<avw;XpfOhmB%M%SL?$h;F*f?@o1w}4YNtn=a?{)1jtCM$^vH*23yfK}+$;HK1
z*;?sU$f--#-!B@!u|2<j%D&@nE_b6ns(0&ceR|*NTxCxC|ENR1V$W6DJlyj-SNGu>
zeXwo@h63-s+c;vsGlpkHH$FGeao^6dy*#D+!}KW(3>yxzZ|rrFcf9pl7-W;DtDnm{
Hr-UW|C2LX>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c526fca743379fe2ae56dadcf355006ef59c6a75
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|=6Jd|hE&XX
zd&^L$$v}WL;8^q<%MT3|$ERqnuxMnJ4J*`OVRv+Sw%2U)%>9|4SAz^@m?0z>JNxs8
z*D}Gk=CpUbn06-S8K3eZZSU#b?`!L$g+I;q+E(~%DgUPsHswX$nx?mp-f{O@Dfxaw
z#*fG0)*Fo9v49L=V0iQ5#oWg7wBL;Dd#stS?~+^f>c-qg-@n!A38MdBGcc%sX3*Q{
UB)`HX`y)uTr>mdKI;Vst0P3t)?EnA(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json b/Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json
new file mode 100644
index 0000000000..b32643187f
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a3fe2df9e650c099d2045a6f8e48f74fd3a47fa
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zlRaG=Ln`LH
zy|v$)sZiqh$Nmd73nZ=-bhopyUsQ0@yClTBb?cP?6BD+^#R`H=!7PmyrY*cXcig=4
z?2^D*-6U^k$3+GI515LsxZeL;P3%iu?)MLS-+z9(Q~va4k01Ay)XY`qEU}lVezB$Z
z+po8Og4Iqg-ne5~dfL`~8<(a%4)Q*|dR1uuUr!Omhbn)kSnHqObT4_{bI(bE|1Plp
z;EtO&-)=A8;S~&iS$>nASZ#}%w)D=UrmWD%#w|j<N3Xsw1tRxHueLb9Pycdineoku
z`5)eWOH29>^dk%`?9H`vm}FM|P5J5J=J|79aJMcFzM4Jtz#rkve)g}=RW-M7S~fZ8
z;Pk}6{j1|v|M-~{x%Tzy#vLzv8Um|rR>;4%+IBL`E#`RG=7+pTe9~E*?AMm4z2^V^
z?EaJP)SZ26_uhTGvHy(9oF(;Tbqjx=TkPl6dcgEz#2hnQm;)H>K5$LFnB{)7tN$EG
N%+uA+Wt~$(69CFU#;5=Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c548039e3d8e5bd9f7fa682a5aa7f86feebde35
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$R!KxbR9J=Wls!+vKp21@zyX&_zlgd*)E__~fuS1{ZcdKQZXHdSOc>di`4vuX
zCPWf(A%um%s*%z*of;kL1Q7zEEes~!v$S{bd-uF|*DFXQ5{cx$liFu+u~Z4S#ok_D
zBF%lYk2H6BwlyzbI1i_j@y;S*6;Lcy!otNRzVGkMRW*Y=>?|T3NA5Z{{azO#1VV^q
zY`s1Ec#k@5^c`>=8&xv^==ZuSu|<CpBJaSu&}uZ7PuH<=9eX8by?xLEHWida4l$0v
z^W5dT)o9Xbx46Bt=(JlK#h&Nl%<aS60!=qUMNwD!7P3vNjVcGoM3I-PCVK7!J$J%<
z_R05Gz-TxilTI-j4hVvPZ1y;|91?s3R-=jU`;@CDX048*s3?kx=ebNL<5V0uL_7i^
z1ZJ%c!1L21SJyWHv>xt(_^bX+q(Pc)Z2jja6-y+NKf@2A9fE|eJRs2k0000<MNUMn
GLSTZA9<LPu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..875e62d8f0b85dc3ce7a4415d5f1c46da10ba19d
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#!ObLn`LH
zy|vNnaDWKggZM(b3qc3hajsObn95gs^jvMjyQ9A93!7zmI<g(TW2`hJge>$6WN)!)
z>I%Kz*?Qss>`hPhKYTVPWe2;05)8-(&e@^%bk^*%mlgP>w7ws*Dww!-)%LFwb<fv)
z-WJ)N^HjQ22B_qwP3hy4SAI^*6;aQ#nYrtx&DV2QNA@r=B$!A!y7+9GCnsM}zg#Wy
z_Z)WbybcA?4}ZUAPFuQaS>^7g9EZp!8r^q(EAQC3Uvj@a%w8b9XmZJ##I}D4FZTAm
ze3&7kez0%jcg^lQ)ti0Kvqit<V|egs6*t4VB!@>6fNCDyGYt{lJ3Crk>BPPJAAWs`
z$@bmM`+~o1oleo}9rjaQ`L5=fwl7%q<NU8V{2RD#O{p!F-6a+Emd}M{)$5mnf|1)3
zwyl|(d~NY=`Nb3d?*F>`ZPZ)8xBt|YtSaqQ_SVc|IbCD|3~vTcS3j3^P6<r_+`zXI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9bc89d90370533c58cd3d581136f6b440d5d886
GIT binary patch
literal 414
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zBRpLkLn`LH
zy|vNnaDd3MkBcqhGddS!J85zFEp?7JES6tTU3l5^L;@T0qgzXlEOqAQ<-8-lgYR0z
zmKjTSc82}iujxFiX3o6g>B53Qqe0;Jj(PcY*3P19pYkmJp}`ek{yg#~ue|77_0!JA
zrCIZIy3edX`Dn?-!!hU0C%-(?5}4DM$#O`;Z1T%BLC-GnRn+X5zB@WsJ=VQRL11af
z(rW+cbDy41Eo-<IW%fE$JaWy-$={DN<?v5jJmYU{<utE(OV9E<LM#T7ZzTGT&CTh%
zb<58@s&Ci4{7*Vtr!KwpJ4bv`iRG`W1tw<q9(Zl3i=U~zbjkJdGp9cXXIEQX|9tkr
zuV=+CXX>o6-Cf51BvLCXJJ72$$ZN~BORnNM*H$OJ%q)KM!*0Pl{;JyLKc2gG32wMG
z?f0Dcn0I^gR+TYs+Z-oTw|Ad%?z#OZzP}gQWmCcUAikQJSHJnGVvwvS$ZejkelF{r
G5}E*=aksz#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json b/Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json
new file mode 100644
index 0000000000..8500087d57
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..38f0bf8dc774e3fcb77ffa8619f55813ae6ae03e
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%8c9S!RCt{2+COgMKokb>&(YQ+*)kHeSg=y0REUBTWQ%OGl`Bqwv^`Bkvpu&+
zl_pzc4}gLcQdzPTBc}z4D3N>tr-;Ux1oGz%I7G|$Ym6}Vn;B-ti1z^6ZH~=FKYsqo
z7xNh^)f)8i{Or`~UfYhpC%vH6?&L}-RH`+Y$5y+O_Xk6pHf%M%XaM?yAu83{%5(bt
zG6&%!@ufu5rq%A`dfKgOz+yhb)#XKLOF_q1N+HX#rK3&!Z_-92afF+6x)h`yG;-JT
zrMDBgzq<thD5aLpE#|Z0yo6{8+~3`<>^uP6q*KSH0aBG}4U_Tc*|$F#kF1w~coY2J
zhz20+_MCdq$XA`K2aP=J_DX#ehTWc%#1UN2$7DQ05=WSfM{qqKNgTl@{--^=H>p1u
z;@{ts;)^&u3LOCWbNqXIjUpl<A|fIpA|fIp`ueQ%0y-CHCQA>GLZ|Hi=FOadj{R23
z?mgm*bY`fze^4YTvn&IE(u*a`!UzD*;wNzg0OElVXNQ5O&g+irhM4b_C1`#xUYqfo
z`v=7!NQg$O9yD^Z^Sa|{a$S6;%=!S}u|`0@)`MZz2)vfQe~oAcxSqd}qJ(w4h_zHO
z;d(xhPCtA<@e<I}E={i2+I%+Q>hi)dH)EUSC$0}j;t1wO^cCo*fz2MU^92%C)7PAK
u(oJWR^rpP-Zvi4AA|fIpA|fK9o$&xgmJSMa0>Z2S0000<MNUMnLSTZ~<sKUV

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b5be817f54e54756d58c9672a376091d3a88439
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$ElET{R9J=Wlrc)gKoo|*i1k210!h1Jv#_w0Sa<?0w6WUC6A1P;Vq@<uJb;Y{
z5Cydgq=;y{3mX#11;#>W3A=G;A`t}Vs}guG|3B}48L(I^mj90Plct^BJqZwm5sUeZ
zsw{9lpZ&wBb9Hg{dj^`q073}rx&|Q6Qe4lcDhuA<UX8!I)kQoABjRMVCN6{^8BYL6
z#uEndQ1)uz{PKEDv<($W7mN(t-QGww_EjUR&j7CH8&6@|q$miZrBI%wtu-nFHHEKt
zsoMu518S^l(b~wfbZMg5qeC0P!O^jdlhH<T_#C^6pehR^aU%m=cz(R^+@m$Hn9r!|
zdgJMv2qBoBoEqN)+CugJn`YYkMfCFY;C#3FePHZ#5D%p;hOVc#SS*%5!3Ud<aleOY
R34{Ou002ovPDHLkV1j;+p#J~>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2ea5b1655ee0a07ffbc33d746e202c14f36f8d0
GIT binary patch
literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z`8{16Ln`LH
zy=9oi<S26N<MJhS3)U=n+a=Z*(z&35akh!3O;2p!1m&fh3_RzvT-Lhrmi1WD%?%lB
zCEt35zWvWGOYd4Q(U!SSoe5|%2yjgQ#{O>o|LpXicOuxg-ReAZJa~HQ%oVHttl8hZ
zS?*Y{<h^^Ap;NzJU+&SWGk;lX#4Y(9e%s5ph|da*lYbUvXxs4r#21FBw@;Sry|6|i
ztDf0M{^0kkn+ok`SqM(NTlRUk_^hihzr{=pu3?1O$G}jK+x=X8rmfx12-|)BS0$M)
zXZeJF4l;J?e;-^bcW{l&--_x|rON*LmC*@?{Q<wrEKV`Tth&8@hWm=Yyav@Qr)}$A
i_#D`&^IVYO%4N9)JHzJo6~D{?8Sd%o=d#Wzp$P!ey^);&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cef5cd9ef1a821059c2d53f889a06763abea7a9
GIT binary patch
literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z1w36GLn`LH
zy|p*1#X+R);rR(w4uKcK3|$psyIS`)nq&q&nWlS$+vCu(&<(StXNV*w3STpAyLt8K
z_sl;>e_F`oJo5k=2?7oIm4UmGpL?5`etx^My?^%Fckkrq7`pBLZl3x5q4ML%*1$E_
z&t8knPVKq)+~e8oh3xxRPhWB~w8U{zn*F-tM*Lz4x@_D6ZXf5r)4dz<>}vUe2mTvY
zu2%3gzFxjoW##)Q(^AnGotyTu&!(1$&SZqx$-poz^W4nFJsNi}f9}3+>VJ-1#`yUe
z2Z^Ib$146lTXOcIWjfoZMJ2!Y*3XaK@ayhFPu3a5X%AvvUtkQ5%X_7@;o7SAQE&UF
k->T1lrDYK#&QSA%>2rMaOz)1`c_0fsUHx3vIVCg!0HA7?6aWAK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json b/Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json
new file mode 100644
index 0000000000..8500087d57
--- /dev/null
+++ b/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
+    }
+  ]
+}
diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..de45b2bdf4d9edfd50a0f413cbf6c3ed8a6c1bb0
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|=6Sj}hE&XX
zd&`#Vkby+QL;nvVqPJE~Ikz`J{rw!~8_Xpa4EdTuKDKvl;X1#Wg-KCf<*_v5=DB^z
zewt5T?)v64|JFI%2|=fPZy#N!v97v3amO3;v(Hvv{yXb(;hEG>`<l0#R{j5_4zvga
zKAfpl-*9E`{T$)6?~IofXKm~5*pbOP?ZWrp9Xm=muSZVH5soWm%D$imQGOsg-SI}u
TWUY;RoIwJfu6{1-oD!M<Li=2>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f34110dcc6792f591e1212fb918678a52edb7cc
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn2y}
z6C_v{Cy4Yk1sZU<StY2r7KT1{VFQA;TbGXf@0YVrpD=l9O2fsocRxQ&+j{l6aIPA+
zCf|o*qhI<OYHgu<c84DS{~f+wLMJEJ^OMNM2S*+r{=dKe_m}_A&d&b-^hxOd=%`zV
zH_qAf>i=x>{D1%dy}kTjxSjw1@|Da_o`i0UQcz#-70rG?#<BB{2HYVUj0|DVJ=0Ei
S_H_Uq%HZkh=d#Wzp$PzCT3^=y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6551f256b6d0e3e70afb3bf9c767fe85e5eaf7c
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zMLk^{Ln`LH
zy|vJf*-_xw$M+m;Ec;YrLW@_vGj<TLVdzV$VCLa$QdsSAK~;rAWLMvUUp&)S$u0aL
zy1Pigbb^V>UcOAP|Moj4pYc0(PMr~GJP;gUJ83g}sl=M9|5qM=HkiER_37f<H}9_g
z>)v%R?>GNUmAP}}q60<NefGMvEqw7NowYAYw%*V2n&f%u@`Ji>amgR@|N2adYuArk
z{L9-g;$GJ6JyG|vqPr6F*815)EC7;gE?qr)ca{5!+|#Qs?$SG$%lJC$vG{{Bx#?-@
zZ~rV<m}<n>{o#c24!s4}cV9SO5@jvCfn&W*(`zQT#oK)*@%8)Z9NiFN^~7A0P1`Cq
obaG*s?=kzV`oHE33_tAmF^K3FIS2}_t_9iV>FVdQ&MBb@0QVJ-6aWAK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Head/maidhat.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..56eb68a0785d91bdd363608ace712488deb8a97d
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z1wCCHLn`LH
zy|v!&h=aiKkMW#rEc4=Ctn_Yno2$fef>VUcy@JC>*rnO!D<=nEt5b}_2bs?d*V!X3
zo^qU^{3NJP=K62(eeze|l$58bzb;b+nhyd$+!tjY+{IN_{$IfJ($%L2CO6l<ee=$D
z?&hqtXZ`+%JtpPlulu{bs-9=o%=z=?t`<HXpS*a}mD{hoFPX&NR{Qe%xZS^h#d}Ld
zZC-xcqdBdlIxc*n;kG`rwQ&&Rfuzr=Pm89OZi|XcJ$dWao-GS`GlY3(lsd(-p8w<&
z8F%8$w5rch;RnyIxmt63^Pilwd2(_qg^%lbzCWDad+Jkh&B1)OeNV5Qe2_G8<*c=z
k&K^j4_mPu@fnmmRcK!4D&tK@v<biDRboFyt=akR{0D6d)3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json b/Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json
new file mode 100644
index 0000000000..8500087d57
--- /dev/null
+++ b/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
+    }
+  ]
+}

From edc60b61a49cafb8dec01e517009bce0f2afb635 Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Wed, 14 Aug 2024 18:29:10 +0000
Subject: [PATCH 3/6] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 28 ++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index 4bacaf9ee2..cfd4408d20 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -8151,3 +8151,31 @@
   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

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 4/6] 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%p5RaKRimL6naNE8ro<KT!B60)$c@bvTy3IZ7!Id#{BGatYA
z9%%(~gi3<^g8!oehX4NyRa1(9veP_W977^n-(GX%YETei3DDN|x%{sF)-AKX&MgzA
z4z?Qo=T!RPTV?5!-ynJH_z#N*o!`Hf`2G&af1Y|&+4Ggg6#24K<~L<`Fg=Kv!6d!*
zyNH^@gRhzw|MGAw42YAsYpcS@#KIx)L3hC~{X~Ywy=(~#jS<WnDj5`xbqRdz&)@6P
rf7V%hf+>G4L#EuXY7emD^am_jx89xY`#9ed=t2fhS3j3^P6<r_ZOeRK

literal 0
HcmV?d00001

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 527a02843a59e2b2c0ce6cdd4c04e62bb75e14a4..6d43ab838e30fe81542dae7d3ec24e761602a69c 100644
GIT binary patch
delta 151
zcmZo<-pn{brJk`k$lZxy-8q?;3=9mpo-U3d6?5L++Q`{pAi#RzL0RO%rEBgSIki;A
zQTw3RB!@3d@2|T5xHI*qCZof|%Dd<H8}G?HX?~SQ{&vvsf6I40J8jv%@88<&b1%F*
z=J5j!1OkbGFY6puuBtl_45Y*NEu5?h7B*PKeSEd#dI3p~{A7@Tr>mdKI;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!+S<f2kr|h47v`J8MZL^GF@OYAuMp2(W~40^ejD&&-;(9
z+qUG^<EX~B^}V*oq8jzmmOE_yKKb_R%uvaucbXsKPX<FhqQ;oPIE!Tg!e<x)&pt5j
ZV{qA8q_5MmEEyQ444$rjF6*2UngDoYn@Rux

diff --git a/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/brigmedic.rsi/icon.png
index c2160a1d86a0b45af5d56c4c3a74698301976197..06144ab283ddb01f6df0dd5a65670abe42e5ebed 100644
GIT binary patch
delta 290
zcmV+-0p0$%1ib=~B!2;OQb$4nuFf3k0002@Nkl<ZScUDBy$*sf5Xb*Il9Yj^w}NQm
z$jlQkFt{<9_yoR>Jd95O58%gGLsv<<IMhjkg9hZo82j6r^m@PRwFejshJR<$W-}3K
zn=xF=5=Bw8itP*$=_rb{5JC$fG!f}O&Yd<*9s~gZAdX`=j(>wJ%g~2JBY_7}O00K#
zgkjh<?`Hx^DQq_@D5bt5Fa*CP;JPlBw+oUa0RY&HjVk~EmSw^7JfvxgYgu*{Xgo|7
z^SPe+eziWIPB<KoPw|}d>RU=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<ZScUDDKa12r7{-6&
zI=SXz*lb`yZML!4^l1c(6n+A+)UUDlNvzLK6tA&5Sj0*WVXLjZN{P(v9|8;B5atS#
zAyFZdi?Rs&R+Bejo*&Q5GZ|rwVV`wtuj&T?;I_+0o*WrK0DtC6Uy8p8@P9Y}aHTKt
z<OtvQ>#-4ep7#O}E;01v$lSYs2Y@WgY=1Bq^agQuAf8U`SSdwO6hu)3z-F^C!{Jb@
z*Xzyztqx2k6BAFT_{Yb#_v!o`r4)dLD4h|z-L4Zrs{@a|7MwhIh<W|S_MUqMAMZw@
z6gK1WxRYqTT7Oe;_Vg{hdVzTSq|v{)_;OUa(5KvD`2NrBz6o#w`1bv*@q8LKSFM(W
z8&&Hbc=q8XC&0VUrwwsq_|Z$btkx8SVQAtw#`8SeTPzj;LThcJC_*Vk6h$J-GP<U~
zWe<qua`~Hh^<0T}Qms$!;6OEO9KiruYkLkTrEat-oqvwvFbvUJ8!07PYbcLi-}mh|
zQpyJ4YPE6#aEf6$nb2Azr35h5PbtrHq?9H}5@xd*Ns>U*t^NSD5|!<x^%f*eQ|9wI
zX_|JMu*;>ivb?f82m<?VyWKYCbzK7Izajjz+xLBfAP}Xfr4NEY`~u-rogDZVwf8I8
h0pI{|02tUiz%|rU#18Auje`IH002ovPDHLkV1ihO0j~f6

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 0000000000000000000000000000000000000000..9e4ab9aaa022b4ff6c16f6797601ff8bd4da8b9c
GIT binary patch
literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$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%g1<EMJX)<*
zY<_ifPp{Vlz;#`eQmL&d1Q4}gu~-m>A=hUPVHoDhQ3wEF{x$hYjYgy00ThMUD{8)6
zE&-5Ia>|5mx0`E!p;G{$l+ukx1Arh15JJ%Dbm;f{nNC4!fRr+x<jG{RGQMt_`uOAo
zfNHhMi|^<DC!|6oK~_mArES~RS&m*(nJJ}|`p7U=zFG9?eVfhJR;e(+PqU=9TJBP%
bO6^*oGRm}@lc9EG00000NkvXXu0mjf^$guv

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..752cbbc75f5cd5538ec5b127860945e421226233
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$-bqA3RCt{2+A&BQQ5XmCf1q1H<knz8JTg{`7M!F694ur=sdliF9PS6#RpbT>
zDs<?iluq7oG*qN;4sM+yCPW>>g#$yNE)N{C2=ci!hgAc27jh!`|E713clW;cy?4|1
z03sqHq9K)u`-0<o(rqv7Y-3~cEw;a|#r{seEYlVMcs)B4_AP&WH`q8F*Au0boYc-l
z6$)}NIx3&DS?LCo7R$87aXmSyoynD9h*C<FQgU~5qKcd`$Ms}keiqH3g@)e-0GzHY
zV(Q0F06@J`P30t5rY+rFp9{|MXZ#iNdJX_EF+PUFqe`rk5NY83#h3SfJvwgx_xFJ(
zpj0#-?DB_C?*Sl8M8j`KPQr^QgX)#)f9*6D+DnhQWkP=$KJ?n4zF4N6`oA96bBK|M
zh=_=Yh=_=Yh=_=uN?$d;`{n3?*XIW?Z=x3+*OR&693#FT_T6l5#x6}Kp$Y{-xeQIy
zG60~Il4j7to9W3!^G2!;-({J$<n<i>>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+M80000<MNUMnLSTZ*{QV*T

literal 0
HcmV?d00001

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 9a6ed93c6d67c69307a384d14cc85dbaadf24a4a..46945895ac1b3218d168e3be22d8541441bbab3a 100644
GIT binary patch
delta 522
zcmV+l0`>jy1F!^;F@NewL_t(|obB2<NCQC>2H;<`3y6JCkSr-Zz`{x-V4+~4cobSm
z5G*VLQ9F?o3L;oo31XEk7K0LmwXm~_7>Qbj4FM&f&48AIJPX~$E09@}sQ7=?W|;HM
zq<Rnd=NkMBGA&!&@4@X2takQeV{_TpTz<r32?2oa-X5=QYJYO5KI@y7ElMdlJHHea
ziAcJoMHT`9aW_?K@mNAk%a*hAOSz9mMJXjpDS3M-I<%r@TDA-h^rBF_LEb3=04`?6
z(Y3n=0LW#sHGK*3SVG)e?<-#6q`d=SBM1NpwYTEvIHUa%D(?L8@Tuhfm;DY7cWM@Z
zk>Tj4TOOMp1%Ci95P7Gh6@;crJLWRkci*)<XgOupl#tQp{U~=aRS}OR>h@pP^_%xb
zL_|bHL_|bHL_|bHzrnZb1Kz4vj{d9lQ^|c_`AY2pre#ZC@e0k3<F!4luLFRu^t3J&
zi3n1ucWs5@4FF(uWlK8<6=#Qmmjq<k2;$ZVA~4(PwSPA*F5<y3kh^=-na-EB(^E{m
z9@yp9DvV8!B4o6QPK|<A01D1E@=gh1Bj`mP05CWIvWdHF`N35pvrDj&X%w96s?4YT
zTt|kZ;ua;i+?@PR)C_!=uMK~!)cA`BCn6#uA|fIpA|fIp`gfiIzAMX7IJf2^00000
MNkvXXt^-0~g2c1!fB*mh

delta 457
zcmV;)0XF`y1n>ipF@LH_L_t(|obB2_OF~f`#__Mv3ka@34dE=*<|smwgER=`)*S+u
zpt;G0d<l&~Lk*1$;ouZRV_b&<*Cfb0bf;dxX^3+ZN%EY!hWLCYy?@T{p2y=|&JPw`
z&gZ69>%`d4gTV^`7Z+z<WBCZfrU57v*3)C{_OVy}CD$8Tt$!2KXzUWlLjVrXZ#doG
z1~9V-Aq<<QRNACi+yG#8b<LhKJ|Q>-Fgp2u{|SKi*JpMPk7yt40nJQ9u#*SU`c|W{
z3mzd%eew9@yWQJwuj_QKGYg<rtDEs-)#?^Nx+3oG?w$S)Q?Gz1>anu248X&~W2O_G
zWI|071o`w!6o2)c#+*8UPUkuo1bG9qec}D&E0oU{<A3}xA|fIpA|fIpA|fIpG7o;;
zA27;ykNz*}M^VpfTg<yZU;?i_`rp=%;~|ww8Nj%P;1oa@Hch2cCXR=rjR|S9gzXl|
z(qQnC*0XG{K()F>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!0<i*+Fn<8+Nkl<ZScPL?7zLwX6pVsVFu;J363t6jZu^fe79H+Il9^;V
z0A{hLs|8%_?)}FM3=9kmx9&V8$sr^;0A{h8iZp|=qAXT5cke$Y$q_81Snla+0rx2`
z0CO135ma%&(v{o(tEot%7>q3h2sw@{2f!@H739bk6YFcD9e;rAa~MEQcreRv-FeDz
z{=^xEs*490+VmYrasU&t3b6$*y5)z@onv5})d`Wi^N1*O@upJbRF4h7EQcF5tCQh>
zS~<hrJC7LFZ=OS)Y>3MdFw3#|lvvA&asaX;kO8SB-Y6IaqhJ(_0$cz9>yUM`oF}ap
Q00000NkvXXt^-0~g6JP|h5!Hn

delta 331
zcmV-R0kr<H0`dZoFn<9oNkl<ZScUDBA#1}x6vuztPDG??9cy7`l!}xyGgC8D6;b^l
zgMNjX5?R<sh^QPB6;-pPYGTkq&0J2bP*xKW$kc^&&FCEs%-l~M@7}%tpZD$#91e%W
z@z0zbb2tnK`R~|t`fOEG93vb>qavnMqL;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;+!BFn<AoNkl<Zc%1Fpy-UMD7zXf1aLdwN6iSPuAK=hQq~K7&LGfeI
zNs4<Q#m%9EQ^8pfr)CJ2N)hVd)<FtwsBtVU1*PkOf5GdN&}yr#9QMQK2Z7{B-n)D6
zGQ9^75fKp)5fKsnGc&pa+D=jY`@~fS7t0&ST%Hfrk7cF>0Do3vYeC!5;g<HXYG*q|
zQA$b0^+d(vQV4}4Wf<a5Xb_f}7TYOG#r5PpnG~gzD5az`u{vqXs_hgdu^B_N^@e(*
z4FGsP*~iMwEdZcauKu_aEHf?ss;{?RPzo<$F**kTh=k|y@L1Nq6SM^TJo#KU-}Ak@
z`|EG}+u2TjS%2ld<6Qs<5>aoowI*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<CqNkl<Zc%1FpF=!J}9LMqRYbq`x$W;Qt@j5wMh}1ZmF%C%)
zQb)5WbS#zLV5oD!Nrw*Y;LxEifzBcp(!r@NRWP)egER_JicsV^-Fc~Pnw*FK9{xY$
zCI83&{oX%hcn3-;rIb=iDW#NB{~43iLe^RUGQ}E?r>@!H`F~P#-~8NsKGIsAR}br3
ztvyzEJI21<7+7OWysac2fale1rBVi<{PYE7_X;q45Yc)7-*2<F_VUaS;s!7ltLhZd
z=6%1-x6hwgdHs$;VVY{zT66R6NcFzo24Hsf9``4&o>?D9ViT~q_{3H!<?zJ1-Gjc*
zJ1ZAWv-E>Or+=6!)~IH!JzfjoI1_Zc2Q(TRCYZLUxDzlQtLg-;)?T>zM$R?lT#gQV
zjL&T1x|2h%6RnN9_3^!Je6figSRk<l$L>6!nzgo(bIs9VkKXnUY`yCH&PgZtM?=Aw
zAFCx_3ZExA0m&trFLC+CbpU$XI|D~Oj$nhQg(x0?wSP7|y`(okjB^oyq;v5%m_{0a
zbOX{f0O<y#X#mm<NYenM8<3^}NH-u&1CVY&ng$@<fHVz2x&dh#fOG@WGyv%aq-g-s
z4M<DuZt!35yt-X#?wh}T{~#(g0sOu?U+=p@hc`A;ti`_INzG4S{liy^4;Kio;DdJu
z3We#uH(^pnm6{2dy6~OuC77RI0AOzJQ6lT6CV<u5jsb9P=K)w=eioj(<4g#3rIb=i
zDW%fu7rV{Vb~q>0^Z)<=4rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTaG
CY#zh_

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 cc35f7a123ad84b9c151bebf2566a5fa1a3a0b64..be478b48c75c6061339bb356052528f06c289657 100644
GIT binary patch
delta 461
zcmV;;0W$vZ1@i-tFn<B9Nkl<Zc%1FpJ4nM&6b9hG=vEN-qEHMSeSm|Lh~QAcK~WrZ
zk|H=b1fruu1_voP3*uykpeQ25!Of{)rM6>9DJTWIT+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)&<pOTv!$@c`0Kiau09V(UhLsQj8iPMQK5P1c
z^UK3fCt!Xq)qhas#nlA>@DovVE1#0k3)HIX$z`&k4>U-?yk$rm^iP6{3qv<M>R)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*d1MmfqFn<D&Nkl<Zc%1E;F>KR77)HNqBC$bHLL)^T-HDk>MJ38ch7JKK
zL7<e8jLcDK2C6W0WGh35ddScrSqzyvbSP2~Fu_tG5w#+wX&8)DQC00R6d$%@JH>9f
zH2I$t$+|nA-+j50ZJhyvAP9mW2!bF8f*^<ygP8}Ma{xdjQ-8$5^dvXSE6rVY+*mnN
zXYtZ90O07rfbp{Ow_+v>zE$&<V9c|wAEvjJa(PJ<wpu$_+wL&)`p#?h1W+z7@q9i9
z0LZ;~g`9F7fOim)OcBS86~s%+rvrcY2{=3iKD_ajv`L&}09Jnh(DgP{wJJhzUTe(j
zWL<CL=eMs|-GBUuRB9H51n2Dby&i!RV-MG!J`;oITQ%_auRR6524VdL#p$o>Z2-Xh
z{6jpRy5Z_C;#gdK&hz=4NUYo4w>9jnUSZAbFW0GTc5JOPlMXW=XJ2ku`;TObC?q&{
zx&uHg7Du<c4^6AtI*XbIt=5hhyp~iLk_wIv3`8F^pnoV+zJgxs`#c8k){kExR(C6R
zzI^7|58iX4C>Xo@1ce0WT2f(REx)b%iVPxRnmgPvlXWd;)&^H^-2?!!mWK(iS!25k
zxUJ=3qwj5S*zvs$jv^F*YysI&0I~&SGx7mM`!^YE!n{cWGy^CA3P84iY$yQP0<xh1
zWDCe<pno5P!an4jg^`~D6o702*-!wo1!O}3$QF=I=;r`)FTT>;Wed}j{9nE&7z9EE
zVBd>h|8u;~Bbg%GC_MrIq|@neh8IlWCE)xJA(fgH`|+2FKmp9n-FN*E0XW@ezf1&L
z0<l=U=igS<DgdB9KEd$46W;7U5h#GQ?GA%lwMFfw*2gEro6Cu@7uJg)2!bF8g1BgY
y0}j9<G|wu#FaQ7m4rN$LW=%~1DgXcg2mk;800000(o>TF0000<MNUMnLSTa8*F0qa

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 0000000000000000000000000000000000000000..dab595ca54dcd41150a79b08cd8dd243fd0acc39
GIT binary patch
literal 570
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vn5
zPZ!6KiaBp*Df%CF5IO!oKhjCSn<J}ZZCjZ!Hyh(Y{eurZIQV3k8XqtVuuRHtn5C$(
z@32Zz>?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<wYl3M{oEk^vb^IQNr%4*2^M_6
z92=H#%fuY~5$W()-F(rDk30cP3^~=O|J-=}*Ro)-e{<lPN0QO6y<^H`LTt{@5j>|*
zCR(w74|D&f;*<{Egn}*2TaPt=%(g%BtJXn>amwk1Tg!W<A3l4ghWXh#CPmTnkKY}8
z_x$np>%sF+rigO9d^cYpq3$n#r*4CupZG-Qo*Ui?az=YuHnnk0;8W-&lJH&guOV~B
zJ>v-;491J&)+a9wU|_g2|L2`I3<fW5*<2K=SZW0H*7k=2Ys;k1_Ep+4cdk3SxQcDf
zPO<Y&=N+^{4?LOI7{W5+j&Z_YJB5u5m#f)=eina8Ki}XP+Tg>ro8ybLf~<qoYt|YD
Yp+}S0AAYaD222bLp00i_>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)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Sl1W5CR9J=WmM=&HQ5?rVPiNe?-NG}g%<Mlz%$j8rEC$1dU>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>M<G8ZpNsQ%Xv=
zH(Dj|ya%F2Oqo(rTR*^*5>ra5mgUuqK7egEC@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~0000<MNUMnLSTa0LCiG(

literal 0
HcmV?d00001

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 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~<<<D1c2!md>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<ER6mf8w@;AP5S*FQTE?JQWlRg$_1;tzc;F%$`xSDMVJOsfO8vkUF&*^`lvZz6>
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~<<<D1c2!md>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<ER6mf8w@;AP5S*FQTE?JQWlRg$_1;tzc;F%$`xSDMVJOsfO8vkUF&*^`lvZz6>
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
+        }
+    ]
+}

From 573b68ab3238241d4219e9ec8d03f91c77a871f9 Mon Sep 17 00:00:00 2001
From: keslik <114428094+keslik1313@users.noreply.github.com>
Date: Wed, 14 Aug 2024 22:24:49 +0300
Subject: [PATCH 5/6] Salute rename (#620)

---
 Resources/Prototypes/Voice/speech_emotes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index aeb89ed94e..0680393047 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -160,7 +160,7 @@
 - type: emote
   id: Salute
   category: Hands
-  buttonText: Приветствие
+  buttonText: Салютовать
   chatMessages: [ салютует ]
   chatTriggers:
   - салютует

From 98b26ff951a0386ebfd3760d1b127f3eb539f341 Mon Sep 17 00:00:00 2001
From: RavmorganButOnCocaine <valtos@nextmail.ru>
Date: Wed, 14 Aug 2024 19:25:53 +0000
Subject: [PATCH 6/6] Automatic changelog update

---
 Resources/Changelog/ChangelogWhite.yml | 28 ++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index cfd4408d20..a0ebbb272a 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -8179,3 +8179,31 @@
   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