AdventureTimeSS14 · AnderFan · Aug 13, 2024 · Aug 15, 2024 · Aug 15, 2024 · Aug 15, 2024
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -2526,6 +2526,25 @@ Entries:
           цвета для аркан. Короче - гетерохромия., type: Add}
     time: '2024-08-24T22:38:34Z'
     id: 286
+<<<<<<< HEAD
+  - author: Tamioki&RevengenRat and some AnderFan
+    changes:
+    - { message: "Удалены шлем и броня Бригмедика добавленная к нам с Corvax'а.", type: Remove}
+    - { message: "Изменена большая часть спрайтов экипировки Бригмедика.", type: Tweak}
+    - { message: "Изменены все спрайты основных HUD визоров.", type: Tweak}
+    - { message: "Изменены спрайты очков с HUD'ами.", type: Tweak}
+    - { message: "Изменена экипировка Бригмедика, а так же содержимое его шкафчика.", type: Tweak}
+    - { message: "Изменено время СБ для получения Бригмедика - 10800 Минут, или же 3 часа.", type: Tweak}
+    - { message: "Изменены характеристики скафандра Бригмедика.", type: Tweak}
+    - { message: "Изменена вместимость аварийных наборов.", type: Tweak}
+    - { message: "Ящик бригмедика в консоли заказов заменён на шкаф бригмедика.", type: Tweak}
+    - { message: "Добавлены медицинские солнцезащитные очки.", type: Add}
+    - { message: "Добавлены медипены в аварийные наборы.", type: Add}
+    - { message: "Добавлена новая экипировка для Бригмедика.", type: Add}
+    - { message: "Добавлена фигурка Бригмедика.", type: Add}
+    id: 287
+    time: '2024-08-25T21:41:00Z'
+=======
   - author: PyotrIgn
     changes:
       - {message: Зарплата для бригмедика, type: Add}
@@ -2570,3 +2589,4 @@ Entries:
           невидимости, type: Tweak}
     time: '2024-08-28T08:32:11Z'
     id: 292
+>>>>>>> d81f364b928c84a6fb2c26c343f0e6468deae11c
diff --git a/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_security.ftl b/Resources/Locale/ru-RU/ADT/Catalog/Cargo/cargo_security.ftl
@@ -0,0 +1,2 @@
+ent-CargoLockerBrigmedic = { ent-LockerBrigmedicFilled }
+    .desc = { LockerBrigmedicFilled.desc }
diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl
@@ -29,3 +29,10 @@ loadout-group-patholog-outerclothing = Патологоанатом, верхн
 loadout-group-patholog-shoes = Патологоанатом, обувь
 loadout-group-patholog-backpack = Патологоанатом, рюкзак
 # Wildcards
+
+# Security
+
+loadout-group-brigmedic-head = Бригмедик, голова
+loadout-group-brigmedic-jumpsuit = Бригмедик, комбинезон
+loadout-group-brigmedic-outerclothing = Бригмедик, верхняя одежда
+loadout-group-brigmedic-back = Бригмедик, рюкзак
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/outerclothing/coats.ftl
@@ -6,8 +6,6 @@ ent-ClothingOuterCoatWardenAlt = куртка смотрителя
     .desc = Тёмно-синяя бронированная куртка с синими отметками на плечах и нашивкой "/Смотритель/" на одном из нагрудных карманов.
 ent-ClothingOuterCoatSecurityOvercoat = шинель службы безопасности
     .desc = Легкобронированная кожаная шинель, предназначенная для повседневной носки высокопоставленными офицерами. Имеет логотип компании Nanotrasen Security.
-ent-ClothingOuterCoatLabSecurityMedic = лабораторный халат бригмедика
-    .desc = Костюм, защищающий от небольших разливов химикатов.
 ent-ClothingOuterCoatCaptain = торжественная куртка капитана
     .desc = Капитанская торжественная куртка, инкрустированная золотом.
 ent-ClothingOuterCoatHOP = куртка главы персонала

diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_security.yml
@@ -0,0 +1 @@
+
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -71,8 +71,8 @@
   components:
   - type: StorageFill
     contents:
-      # - id: BoxSurvivalBrigmedic
+#      - id: BoxSurvivalBrigmedic
       - id: Flash
       - id: MagazinePistol
 #      - id: ADTSpaceLaw
-      # - id: SpaceCash500
+#      - id: SpaceCash500
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/duffelbag.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BrigmedicDuffelbagClothing
+  id: ADTBrigmedicDuffelbagClothing
   suffix: Filled
-  parent: ClothingBackpackDuffelSecurity
+  parent: ClothingBackpackDuffelBrigmedic
   name: brimedic duffelbag
   components:
   - type: StorageFill

diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/ADT/Catalog/Fills/Lockers/security.yml
@@ -57,8 +57,6 @@
         prob: 0.15
       - id: ClothingOuterVestSecurityMedic # Corvax-Resprite
         prob: 0.5
-      - id: ClothingOuterCoatLabSecurityMedic # Corvax-Resprite
-        prob: 0.5
       - id: BoxSyringe
       - id: BoxPillCanister
       - id: BoxBodyBag

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml
@@ -79,11 +79,8 @@
   name: brigmedic windbreaker
   description: A brigmedic's trusty windbreaker, for all the space wind.
   components:
-    - type: Sprite
-      sprite: ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi
-    - type: Clothing
-      sprite: ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi
-    - type: Armor
-      modifiers:
-        coefficients:
-          Caustic: 0.75
+  - type: Sprite
+    sprite: ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi
+    state: icon
+  - type: Clothing
+    sprite: ADT/Clothing/OuterClothing/Coats/brigmedicWB.rsi
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/brigmedic.yml
@@ -0,0 +1,63 @@
+# Head
+- type: loadout
+  id: BrigmedicBeretWhite
+  equipment:
+    head: ClothingHeadHatBeretBrigmedic
+
+- type: loadout
+  id: BrigmedicBeretBlack
+  equipment:
+    head: ClothingHeadHatBeretSecurityMedic
+
+- type: loadout
+  id: BrigmedicBeretRed
+  equipment:
+    head: ADTClothingHeadHatBeretBrigmedic
+
+# Jumpsuit
+- type: loadout
+  id: ADTBrigmedicTurtleneck
+  equipment:
+    jumpsuit: ADTClothingUniformBrigmedicTurtleneck
+
+- type: loadout
+  id: ADTBrigmedicTurtleneckSkirt
+  equipment:
+    jumpsuit: ADTClothingUniformSkirtBrigmedicTurtleneck
+
+- type: loadout
+  id: BrigmedicJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+
+- type: loadout
+  id: BrigmedicJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBrigmedic
+
+# OuterClothing
+- type: loadout
+  id: BrigmedicOuterVest
+  equipment:
+    outerClothing: ClothingOuterVestSecurityMedic
+
+- type: loadout
+  id: ADTBrigmedicOuterCoat
+  equipment:
+    outerClothing: ADTClothingOuterCoatBrigmedicWB
+
+# Back
+- type: loadout
+  id: BrigmedicdBackpack
+  equipment:
+    back: ClothingBackpackBrigmedic
+
+- type: loadout
+  id: ADTBrigmedicSatchel
+  equipment:
+    back: ClothingBackpackSatchelBrigmedic
+
+- type: loadout
+  id: ADTBrigmedicDuffel
+  equipment:
+    back: ClothingBackpackDuffelBrigmedic
diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
@@ -134,3 +134,45 @@
   - ADTBlueshieldBackpack
   - ADTBlueshieldSatchel
   - ADTBlueshieldDuffel
+
+#Brigmedic
+
+- type: loadoutGroup
+  id: ADTBrigmedicJumpsuit
+  name: loadout-group-brigmedic-jumpsuit
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - BrigmedicTurtleneck
+  - BrigmedicTurtleneckSkirt
+  - BrigmedicJumpsuit
+  - BrigmedicJumpskirt
+
+- type: loadoutGroup
+  id: ADTBrigmedicdHead
+  name: loadout-group-brigmedic-head
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - BrigmedicBeretWhite
+  - BrigmedicBeretBlack
+  - BrigmedicBeretRed
+
+- type: loadoutGroup
+  id: ADTBrigmedicdBack
+  name: loadout-group-brigmedic-back
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - BrigmedicdBackpack
+  - ADTBrigmedicSatchel
+  - ADTBrigmedicDuffel
+
+- type: loadoutGroup
+  id: ADTBrigmedicOuterClothing
+  name: loadout-group-brigmedic-outerclothing
+  minLimit: 0
+  maxlimit: 1
+  loadouts:
+  - BrigmedicOuterVest
+  - ADTBrigmedicOuterCoat
diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml
@@ -57,3 +57,16 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
+
+- type: roleLoadout
+  id: JobBrigmedic
+  groups:
+  - Inventory # Corvax-Loadouts
+  - GroupTankHarness
+  - ADTBrigmedicdHead
+  - ADTBrigmedicJumpsuit
+  - ADTBrigmedicdBack
+  - ADTBrigmedicOuterClothing 
+  - SurvivalSecurity
+  - Trinkets
+  - GroupSpeciesBreathToolSecurity
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/ADT/Roles/Jobs/Security/brigmedic.yml
@@ -27,13 +27,13 @@
 - type: startingGear
   id: BrigmedicGear
   equipment:
-    jumpsuit: ADTClothingUniformBrigmedicJumpsuitTurtleneck
-    outerClothing: ADTClothingOuterCoatBrigmedicWB
-    back: ClothingBackpackBrigmedicFilled
+#    jumpsuit: ADTClothingUniformBrigmedicTurtleneck
+#    outerClothing: ADTClothingOuterCoatBrigmedicWB
+#    back: ClothingBackpackBrigmedicFilled
     shoes: ClothingShoesBootsJackSec
     gloves: ClothingHandsGlovesLatex
     eyes: ADTClothingEyesGlassesMed
-    head: ADTClothingHeadHatBeretBrigmedic
+#    head: ADTClothingHeadHatBeretBrigmedic
     id: BrigmedicPDA
     ears: ClothingHeadsetBrigmedic
     belt: ClothingBeltMedicalFilled

diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/coats.yml
@@ -70,21 +70,6 @@
           Piercing: 0.6
           Heat: 0.9
 
-- type: entity
-  parent: ClothingOuterStorageBase
-  id: ClothingOuterCoatLabSecurityMedic
-  name: security medic labcoat
-  description: A suit that protects against minor chemical spills.
-  components:
-    - type: Sprite
-      sprite: Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi
-    - type: Clothing
-      sprite: Corvax/Clothing/OuterClothing/Coats/labcoat_security_medic.rsi
-    - type: Armor
-      modifiers:
-        coefficients:
-          Caustic: 0.75
-
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterCoatCaptain