AdventureTimeSS14 · Schrodinger71 · Sep 3, 2024 · Jun 29, 2024 · Jun 29, 2024 · Jun 29, 2024
diff --git a/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs b/Content.Shared/ADT/SwitchableWeapon/SwitchableWeaponComponent.cs
@@ -1,4 +1,3 @@
-
 using Content.Shared.Damage;
 using Content.Shared.Item;
 using Robust.Shared.Audio;

diff --git a/Resources/Locale/ru-RU/ADT/Job/job-description.ftl b/Resources/Locale/ru-RU/ADT/Job/job-description.ftl
@@ -10,6 +10,6 @@ job-description-senior-physician = Обучайте новых врачей ос
 
 job-description-senior-researcher = Обучайте новых учёных основам печати предметов, исследования артефактов и аномальных объектов.
 
-job-description-senior-engineer = Обучайте новых инженеров основам работы силовых установок, ремонту, атмосферике и энергоснабжению станции. 
+job-description-senior-engineer = Обучайте новых инженеров основам работы силовых установок, ремонту, атмосферике и энергоснабжению станции.
 
-job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием.
+job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием.
diff --git a/Resources/Locale/ru-RU/ADT/Job/job-names.ftl b/Resources/Locale/ru-RU/ADT/Job/job-names.ftl
@@ -13,8 +13,8 @@ JobADTSeniorPhysician = Ведущий врач
 job-name-senior-researcher = Доцент
 JobADTSeniorResearcher = Доцент
 
-job-name-senior-engineer = Бригадир 
-JobADTSeniorEngineer = Бригадир 
+job-name-senior-engineer = Бригадир
+JobADTSeniorEngineer = Бригадир
 
 job-name-senior-officer = Офицер-Инструктор
 JobADTSeniorOfficer = Офицер-Инструктор
@@ -27,4 +27,3 @@ job-name-ADTSpaceSecOfficer = офицер SPACE SEC
 job-name-ADTSpaceSecPilot = пилот SPACE SEC
 job-name-ADTSpaceSecCommander = командир SPACE SEC
 job-name-ADTSpaceSecService = сотрудник SPACE SEC
-
diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl
@@ -21,7 +21,9 @@ loadout-group-roboticist-jumpsuit = Робототехник, комбинезо
 loadout-group-roboticist-outerclothing = Робототехник, верхняя одежда
 loadout-group-roboticist-gloves = Робототехник, перчатки
 # Security
-
+loadout-warden-neck-adt = Смотритель, шея
+loadout-security-officer-neck-adt = Офицер СБ, шея
+loadout-security-cadet-neck-adt = Кадет СБ, шея
 # Medical
 loadout-group-patholog-head = Патологоанатом, голова
 loadout-group-patholog-jumpsuit = Патологоанатом, комбинезон

diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl
@@ -12,3 +12,7 @@ ent-ADTClothingBeltMedicalSecurity = охранно-медицинский по
 ent-ADTClothingBeltMedicalSecurityFilled = охранно-медицинский пояс
     .desc = Довольно тонкий и при этом оснащённый всеми нужными креплениями пояс, для хранения охранного и медицинского арсенала.
     .suffix = { "Полный" }
+
+ent-ADTClothingBeltInvestigatorHolsterFill = кобура следователя СБ
+    .desc = Кобура с табельным оружием следователя СБ - пистолетом с магазинами нелетальных и летальных патронов.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl
@@ -17,3 +17,7 @@ ent-ADTClothingHeadHatBeretBlackCivilian = чёрный берет
 ent-ADTClothingHeadCapIlisium = фуражка
     .suffix = Иллизиум
     .desc = Тёмная фуражка офицера Иллизиума.
+
+ent-ADTClothingHeadHatsInvestigatorCap = фуражка следователя Службы Безопасности
+    .desc = Слава NanoTrasen!
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/specific.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/specific.ftl
@@ -0,0 +1,2 @@
+ent-ADTClothingNeckSecBadge = жетон Службы Безопасности
+    .desc = Позолоченный жетон с символикой Службы Безопасности и индивидуальным номером сотрудника. Предмет особой гордости среди офицеров.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl
@@ -16,4 +16,8 @@ ent-ADTClothingOuterCoatBrigmedicWB = ветровка бригмедика
 
 ent-ADTClothingOuterCoatIlisium = плащ Иллизиума
     .suffix = Иллизиум
-    .desc = Тёмный плащ Иллизиума
+    .desc = Тёмный плащ Иллизиума
+
+ent-ADTClothingOuterCoatInvestigator = бушлат следователя Службы Безопасности
+    .desc = Один вид этого бушлата повышает вероятность чистосердечного признания подозреваемого на 50%.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl
@@ -168,7 +168,7 @@ ent-ADTRDJumpsuitWarm = { ent-ClothingUniformJumpsuitResearchDirector }
 
 ent-ADTCapJumpsuitWarm = водолазка капитана
     .desc = Самая главная водолазка на станции.
-    
+
 ent-ClothingUniformJumpsuitBlueshieldTurtleneck = водолазка офицера синего щита
     .desc = Белая удобная водолазка Офицера Синего Щита с пришитыми золотыми погонами и ярким именным бейджиком. К сожалению, если вы её наденете, это не будет значить, что вам дадут отпуск.
 
@@ -190,4 +190,8 @@ ent-ADTClothingUniformSkirtBrigmedicTurtleneck = юбка-водолазка б
 
 ent-ADTClothingUniformIlisium = костюм Иллизиума
     .suffix = Иллизиум
-    .desc = Тёмный костюм Иллизиума.
+    .desc = Тёмный костюм Иллизиума.
+
+ent-ADTClothingUniformInvestigatorSuit = форма следователя Службы Безопасности
+    .desc = Одежда для того, кто намерен докопаться до сути всех тайн.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Device/pda.ftl
@@ -15,3 +15,6 @@ ent-ADTGhostPDA = КПК призрака
 
 ent-ADTBrigMedicPDA = КПК бригмедика
     .desc = КПК бригмедика
+
+ent-ADTInvestigatorPDA = КПК следователя СБ
+    .desc = Пахнет как чернила и дело, закрытое предварительно из-за смерти подозреваемого от несчастного случая на рабочем месте.
diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/belt.yml
@@ -10,3 +10,14 @@
       - id: Stunbaton
       - id: Handcuffs
       - id: Handcuffs
+
+#кобура следователя СБ
+- type: entity
+  id: ADTClothingBeltInvestigatorHolsterFill
+  parent: ClothingBeltHolster
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+        - id: WeaponPistolMk58
+        - id: MagazinePistol
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml
@@ -100,3 +100,17 @@
   - type: Clothing
     sprite: ADT/Clothing/Head/Hats/hurashka.rsi
 
+#Фуражка следователя
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHatsInvestigatorCap
+  name: investigator cap
+  description: Glory to NanoTrasen!
+  components:
+  - type: Tag
+    tags: # ignore "WhitelistChameleon" tag
+      - WhitelistChameleon
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Hats/investigator_cap.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Hats/investigator_cap.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/specific.yml
@@ -0,0 +1,8 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ADTClothingNeckSecBadge
+  name: sec badge
+  description: sec badge
+  components:
+    - type: Sprite
+      sprite: ADT/Clothing/Neck/secbadge.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml
@@ -103,3 +103,30 @@
     modifiers:
       coefficients:
         Caustic: 0.75
+
+#бушлат следователя
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ADTClothingOuterCoatInvestigator
+  name: investigator bushlat
+  description: This pea jacket increases the chance of a suspect's confession by half.
+  components:
+  - type: Storage
+    grid:
+    - 0,0,3,1
+    maxItemSize: Normal
+  - type: Sprite
+    sprite: ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/OuterClothing/Coats/investigator_coat.rsi
+  - type: StorageFill
+    contents:
+    - id: CigarGoldCase
+    - id: Lighter
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.7
+        Heat: 0.8
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml
@@ -585,3 +585,14 @@
   - type: Clothing
     sprite: ADT/Clothing/Uniforms/Jumpsuit/turtleneck_brigmed.rsi
 
+#Комбинезон следователя
+- type: entity
+  parent: ClothingUniformBase
+  id: ADTClothingUniformInvestigatorSuit
+  name: investigator suit
+  description: The costume of the one who will get to the bottom of all the secrets.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/investigator_suit.rsi
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Devices/pda.yml
@@ -105,3 +105,18 @@
   - type: Icon
     state: pda-ghost
   - type: Unremoveable
+
+# КПК Следователя
+- type: entity
+  parent: ADTBasePDA
+  id: ADTInvestigatorPDA
+  name: investigator PDA
+  description: It smells like ink and the case is prematurely closed due to the death of a suspect at work.
+  components:
+  - type: Pda
+    id: DetectiveIDCard
+    state: pda-investigator
+  - type: PdaBorderColor
+    borderColor: "#774705"
+  - type: Icon
+    state: pda-investigator
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml
@@ -66,7 +66,7 @@
     tags:
     - SpaceSecOfficial
     - SpaceSecMaintenance
-    - SpaceSecSecurity 
+    - SpaceSecSecurity
 
 - type: entity
   parent: IDCardStandard
@@ -148,4 +148,4 @@
   - type: Access
     tags:
     - SpaceSecOfficial
-    - SpaceSecMaintenance
+    - SpaceSecMaintenance
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/detective.yml
@@ -0,0 +1,36 @@
+# Для разблокировки одёжки следака
+- type: loadoutEffectGroup
+  id: MasterDetective
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobDetective
+      time: 72000 #20 hrs
+
+# Head
+- type: loadout
+  id: DetectiveInvestigatorCap
+  equipment:
+    head: ADTClothingHeadHatsInvestigatorCap
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterDetective
+
+# Jumpsuit
+- type: loadout
+  id: DetectiveInvestigatorSuit
+  equipment:
+    head: ADTClothingUniformInvestigatorSuit
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterDetective
+
+# OuterClothing
+- type: loadout
+  id: DetectiveCoatInvestigator
+  equipment:
+    head: ADTClothingOuterCoatInvestigator
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterDetective
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/head_of_security.yml
@@ -0,0 +1,7 @@
+- type: loadout
+  id: HeadofSecurityMantleShoulder
+  equipment:
+    neck: ClothingNeckMantleHOSShoulder
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: MasterHoS
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_cadet.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_cadet.yml
@@ -0,0 +1,5 @@
+# Neck Cadet Security Officer ADT
+- type: loadout
+  id: ADTSecurityCadetNeck
+  equipment:
+    neck: ADTClothingNeckSecBadge
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/security_officer.yml
@@ -0,0 +1,5 @@
+# Neck Security Officer ADT
+- type: loadout
+  id: ADTSecurityOfficerNeck
+  equipment:
+    neck: ADTClothingNeckSecBadge
diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/warden.yml
@@ -0,0 +1,6 @@
+# Neck Warden ADT
+- type: loadout
+  id: ADTWardenNeck
+  equipment:
+    neck: ADTClothingNeckSecBadge
+
diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml
@@ -172,12 +172,36 @@
   - ADTSeniorOfficerBackpack
   - ADTSeniorOfficerSatchel
   - ADTSeniorOfficerDuffel
-  
+
 - type: loadoutGroup
   id: ADTSeniorSecurityOuterClothing
   name: loadout-group-security-outerclothing
   loadouts:
   - ArmorVest
   - ArmorVestSlim
   - SecurityOfficerWintercoat
-  - ADTSeniorOfficerArmor
+  - ADTSeniorOfficerArmor
+
+# Warden
+- type: loadoutGroup
+  id: WardenNeckADT
+  name: loadout-warden-neck-adt
+  minLimit: 0
+  loadouts:
+  - ADTWardenNeck
+
+# Security Oficer
+- type: loadoutGroup
+  id: SecurityOfficerNeckADT
+  name: loadout-security-officer-neck-adt
+  minLimit: 0
+  loadouts:
+  - ADTSecurityOfficerNeck
+
+# Cadet Security Oficer
+- type: loadoutGroup
+  id: SecurityCadetNeckADT
+  name: loadout-security-cadet-neck-adt
+  minLimit: 0
+  loadouts:
+  - ADTSecurityCadetNeck
diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Security/fill.txt b/Resources/Prototypes/ADT/Roles/Jobs/Security/fill.txt
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -48,7 +48,7 @@
     whitelist:
       tags:
         - Grenade
-    capacity: 3
+    capacity: 1 # ADT-Tweak DeBugg
     proto: GrenadeFrag
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -934,6 +934,7 @@
   loadouts:
   - HeadofSecurityCloak
   - HeadofSecurityMantle
+  - HeadofSecurityMantleShoulder #ADT-Loadout
 
 - type: loadoutGroup
   id: HeadofSecurityOuterClothing
@@ -1030,6 +1031,7 @@
   loadouts:
   - DetectiveFedora
   - DetectiveFedoraGrey
+  - DetectiveInvestigatorCap # ADT-Loadout
 
 - type: loadoutGroup
   id: DetectiveNeck
@@ -1046,6 +1048,7 @@
   - DetectiveJumpskirt
   - NoirJumpsuit
   - NoirJumpskirt
+  - DetectiveInvestigatorSuit # ADT-Loadout
 
 - type: loadoutGroup
   id: DetectiveOuterClothing
@@ -1054,6 +1057,7 @@
   loadouts:
   - DetectiveArmorVest
   - DetectiveCoat
+  - DetectiveCoatInvestigator # ADT-Loadout
 
 - type: loadoutGroup
   id: SecurityCadetJumpsuit

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -376,6 +376,7 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
+  - WardenNeckADT # ADT-Loadouts
 
 - type: roleLoadout
   id: JobSecurityOfficer
@@ -391,6 +392,7 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
+  - SecurityOfficerNeckADT # ADT-Loadouts
 
 - type: roleLoadout
   id: JobDetective
@@ -416,6 +418,7 @@
   - SurvivalSecurity
   - Trinkets
   - GroupSpeciesBreathToolSecurity
+  - SecurityCadetNeckADT # ADT-Loadouts
 
 # Medical
 - type: roleLoadout

diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/icon.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-left.png
diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/investigator_cap.rsi/inhand-right.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-ADTClothingNeckSecBadge = жетон Службы Безопасности
		.desc = Позолоченный жетон с символикой Службы Безопасности и индивидуальным номером сотрудника. Предмет особой гордости среди офицеров.