ОБР аплинк дополнения (#3456)

2025-12-20 22:43:37 +00:00 · 2025-12-20 22:43:37 +00:00 · 45f1e14090
commit 45f1e14090
parent 54ca53861a
359 changed files with 2527 additions and 645 deletions
--- a/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/aussec.ogg
+++ b/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/aussec.ogg
--- a/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg
+++ b/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg
--- a/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_reload.ogg
+++ b/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_reload.ogg
--- a/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_shot.ogg
+++ b/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_shot.ogg
--- a/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm28/skm28_shot.ogg
+++ b/Resources/Audio/_Sunrise/Weapons/Guns/Rifles/skm28/skm28_shot.ogg
--- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl
@ -24,10 +24,10 @@ ent-ClothingBackpackDuffelWeaponShotgun4034Filled = Bundle L4034
    .desc = L4034 with 3 Box ammo.
 ent-ClothingBackpackDuffelWeaponShotgun12Filled = Bundle law12
    .desc = Law-12 with 1 Box ammo.
-ent-ClothingBackpackDuffelWeaponRifleAR18Filled = Bundle ar18
-    .desc = AR19 with 2 raspy magazines.
-ent-ClothingBackpackDuffelWeaponRifleM28Filled = Bundle m28
-    .desc = M28 with 2 raspy magazines.
+ent-ClothingBackpackDuffelWeaponRifleSKM24Filled = Bundle SKM-24
+    .desc = SKM-24 with 6 raspy magazines.
+ent-ClothingBackpackDuffelWeaponRifleSKM28Filled = Bundle SKM-28
+    .desc = SKM-28 with 6 raspy magazines.
 ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Bundle br64
    .desc = BR64 with 2 raspy magazines.
 ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Bundle Hristov
--- a/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
@ -52,9 +52,6 @@ ent-GunSafeRifleAKMU = safe
 ent-GunSafeRifleLecterMk2 = safe lecter Mk2
    .suffix = Lecter Mk2
    .desc = { ent-GunSafeBaseSecure.desc }
-ent-GunSafeRifleAR18 = safe
-    .suffix = AR-18
-    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeRifleFamas = safe
    .suffix = Famas
    .desc = { ent-GunSafeBaseSecure.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/backpacks.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/back/backpacks.ftl
@ -3,7 +3,7 @@ ent-ClothingBackpackSyndie = syndie backpack
 ent-ClothingMilitaryBackpack = army backpack
    .desc = A spacious backpack with lots of pockets, worn by military structures.
 ent-ClothingDeathSquadronBackpack = death squadron backpack
-    .desc = A spacious backpack using bluespace technology.
+    .desc = Holds the kit of CentComm's most feared agents.
 ent-ClothingBackpackCE = chief engineer backpack
    .desc = Technicially progressive backpack.
 ent-ClothingBackpackBlueShield = blue shield's backpack
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
@ -9,6 +9,8 @@ ent-ClothingBeltHoS = head of security's belt
    .desc = A security belt, but made of quality material.
 ent-ClothingBeltMedicalCMO = CMO's medical belt
    .desc = A sterile belt with many pockets for pills and other medications, emphasizing that you should treat with style.
+ent-ClothingBeltMedicalElite = medical belt
+    .desc = A sterile belt with many pockets for pills and other medications.
 ent-ClothingBeltReaperWebbing = chest rig
    .desc = A set of tactical webbing worn by Syndicate boarding parties.
 ent-ClothingBeltSheathSyndicate = rapier sheath
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
@ -1,2 +1,4 @@
 ent-BaseMagazinePistolCaselessRifleExtended = { ent-BaseMagazinePistolCaselessRifle }
    .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
+ent-MagazineCannonBallMini = cannonball suitcase
+    .desc = A suitcase for neatly storing cannonballs for the pirate’s belt-fed cannon.
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
@ -6,3 +6,5 @@ ent-WeaponMachineGunMG42 = MG-42
    .desc = { ent-BaseWeaponLightMachineGun.desc }
 ent-WeaponDL6902 = DL6902 machine gun
    .desc = Cybersun heavy machine gun.
+ent-WeaponLightMachineGunPirateCannon = pirate machine cannon
+    .desc = Handheld pirate cannon with belt-fed cannonballs. Straight out of the wildest adventures of Treasure Island. A mix of pirate magic and ingenuity. Do not, under any circumstances, try to figure out how it actually works…
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
@ -10,10 +10,6 @@ ent-WeaponRifleFamas = Famas
    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleG36 = G-36
    .desc = { ent-BaseWeaponRifle.desc }
-ent-WeaponRifleM28 = M-28
-    .desc = { ent-BaseWeaponRifle.desc }
-ent-WeaponRifleAR18 = AR-18
-    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleM16A4 = M16A4
    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleScarH = scar-h
--- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/light_rifle_heavy.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/light_rifle_heavy.ftl
@ -1,17 +1,17 @@
 ent-RifleHeavyBase = { ent-BaseItem }
    .desc = { ent-BaseItem.desc }
-ent-RifleHeavyMagazineEmpty = Коробка с магазином (.308 любой)
+ent-RifleHeavyMagazineEmpty = Пулемётный короб (.308 любой)
    .suffix = пустой
    .desc = { ent-RifleHeavyBase.desc }
-ent-RifleHeavyMagazineSP = Коробка с магазином (.308 SP)
+ent-RifleHeavyMagazineSP = Пулемётный короб (.308 SP)
    .desc = { ent-RifleHeavyBase.desc }
-ent-RifleHeavyMagazineHP = Коробка с магазином (.308 HP)
+ent-RifleHeavyMagazineHP = Пулемётный короб (.308 HP)
    .desc = { ent-RifleHeavyBase.desc }
-ent-RifleHeavyMagazineFMJ = Коробка с магазином (.308 FMJ)
+ent-RifleHeavyMagazineFMJ = Пулемётный короб (.308 FMJ)
    .desc = { ent-RifleHeavyBase.desc }
-ent-RifleHeavyMagazineIncendiary = Коробка с магазином (.308 зажигательный)
+ent-RifleHeavyMagazineIncendiary = Пулемётный короб (.308 зажигательный)
    .desc = { ent-RifleHeavyBase.desc }
-ent-RifleHeavyMagazineUranium = Коробка с магазином (.308 урановый)
+ent-RifleHeavyMagazineUranium = Пулемётный короб (.308 урановый)
+    .desc = { ent-RifleHeavyBase.desc }
+ent-RifleHeavyMagazineAP = Пулемётный короб (.308 AP)
    .desc = { ent-RifleHeavyBase.desc }
-ent-RifleHeavyMagazineAP = Коробка с магазином (.308 AP)
-    .desc = { ent-RifleHeavyBase.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/backpacks/duffelbag.ftl
@ -11,11 +11,11 @@ ent-ClothingBackpackDuffelWeaponSubMachineGunDrozdMk2 = набор с дрозд
 ent-ClothingBackpackDuffelWeaponRifleLecterFilled = Набор Lecter
    .desc = Lecter c 3мя магазинами.
 ent-ClothingBackpackDuffelWeaponSubMachineGunP90Filled = Набор P-90
-    .desc = P-90 c 2мя магазинами.
+    .desc = P-90 c 4мя магазинами.
 ent-ClothingBackpackDuffelWeaponAMS42Filled = Набор AMS-42
    .desc = AMS-42 c 3мя магазинами.
 ent-ClothingBackpackDuffelWeaponRifleG36Filled = Набор G36
-    .desc = G36 c 2мя магазинами.
+    .desc = G36 c 4мя SP магазинами.
 ent-ClothingBackpackDuffelWeaponRifleM52Filled = Набор М-52
    .desc = Премиумная штурмовая винтовка вместе с 3мя FMJ магазинами, 2мя SP и одним HP магазином
 ent-ClothingBackpackDuffelWeaponShotgunCycler = Набор Штурмовой дробовик
@ -24,12 +24,20 @@ ent-ClothingBackpackDuffelWeaponShotgun4034Filled = Набор L4034
    .desc = L4034 c пачкой патронов дроби.
 ent-ClothingBackpackDuffelWeaponShotgun12Filled = Набор LAW-12
    .desc = LAW-12 c пачкой патронов дроби.
-ent-ClothingBackpackDuffelWeaponRifleAR18Filled = Набор AR18
-    .desc = AR18 c 2мя магазинами.
-ent-ClothingBackpackDuffelWeaponRifleM28Filled = Набор M28
-    .desc = M28 c 2мя магазинами.
+ent-ClothingBackpackDuffelWeaponRifleSKM24Filled = Набор SKM-24
+    .desc = SKM-24 c 6мя различными магазинами.
+ent-ClothingBackpackDuffelWeaponRifleSKM24FilledCBURN = Набор SKM-24 "Факел"
+    .desc = SKM-24 c 6мя зажигательными магазинами.
+ent-ClothingBackpackDuffelWeaponRifleSKM28Filled = Набор SKM-28
+    .desc = SKM-28 c 6мя различными магазинами.
+ent-ClothingBackpackDuffelWeaponRifleSKM28FilledCBURN = Набор SKM-28 "Огнесмерч"
+    .desc = SKM-28 c 6мя зажигательными магазинами.
 ent-ClothingBackpackDuffelWeaponRifleBR64Filled = Набор BR-64
    .desc = BR-64 c 2мя магазинами.
+ent-ClothingBackpackDuffelWeaponLightMachineGunM492 = Набор М492 смарт-ган
+    .desc = Набор М492 с 2мя пулемётными коробами.
+ent-ClothingBackpackDuffelWeaponLightMachineGunM492CBURN = Набор М492 "Выжигатель"
+    .desc = Набор М492 с 3мя пулемётными коробами зажигательных специально для подразделений РХБЗЗ.
 ent-ClothingBackpackDuffelWeaponSniperHristovFilled = Набор Христов
    .desc = Христов с 4мя коробками на 10 антиматериальных патрон.
 ent-ClothingBackpackDuffelNanotrasenMedicalBundleFilled = набор медикаментов NanoTrasen
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/boxes/nanotrasen.ftl
@ -20,7 +20,20 @@ ent-BoxErtLeaderKit = Аварийный набор ЛОБР
    .desc = Набор снаряжения ЛОБР, имеет все, что необходимо лидеру Отряда "Быстрого" Реагирования.
 ent-BoxErtBaseKit = Аварийный набор ОБР
    .desc = Набор снаряжения ОБР, имеет все, что необходимо члену ОБР.
-ent-BoxMagazineRifleNanotrasen = коробка с магазинами 7.62 NT
-    .desc = коробка с магазинами 7.62х51 NT для винтовки.
-ent-BoxMagazineRifleM52 = коробка с магазинами М-52
-    .desc = коробка с магазинами 5,56мм для М-52.
+
+ent-BoxMagazineRifleNanotrasen = набор магазинов .308
+    .desc = коробка с магазинами .308 каждого стандартного типа.
+ent-BoxMagazineRifleNanotrasenIncendiary = набор зажигательных магазинов .308
+    .desc = коробка с зажигательными магазинами .308.
+ent-BoxMagazineRifleM52 = набор магазинов М-52
+    .desc = коробка с магазинами 5,56мм для М-52 каждого стандартного типа.
+ent-BoxMagazineRifleKit = набор 5,56 магазинов
+    .desc = коробка с стандартными магазинами 5,56мм каждого стандартного типа.
+ent-BoxMagazineRifleIncendiary = набор зажигательх 5,56 магазинов
+    .desc = коробка с стандартными зажигательми магазинами 5,56мм.
+ent-BoxMagazineSMGTopMounted = набор магазинов WT550
+    .desc = коробка с магазинами для WT550 каждого стандартного типа.
+ent-BoxMagazineSMGTopMountedIncendiary = набор зажигательх магазинов WT550
+    .desc = коробка с зажигательми магазинами для WT550.
+ent-BoxMagazineLightRifleIncendiary = набор зажигательх 7,62 магазинов
+    .desc = коробка с зажигательми магазинами 7,62мм.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/lockers/security.ftl
@ -46,15 +46,12 @@ ent-GunSafeSubMachineGunSP91RC = сейф СП91РК
 ent-GunSafeRifleM16A4 = сейф M16A4
    .suffix = Санрайз
    .desc = { ent-GunSafeBaseSecure.desc }
-ent-GunSafeRifleAKMU = сейф АКМУ
-    .suffix = АКМУ
+ent-GunSafeRifleAKMU = сейф СКМ-24
+    .suffix = СКМ-24
    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeRifleLecterMk2 = сейф лектер Mk2
    .suffix = Лектер Mk2
    .desc = { ent-GunSafeBaseSecure.desc }
-ent-GunSafeRifleAR18 = сейф АР-18
-    .suffix = АР-18
-    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeRifleFamas = сейф Фамас
    .suffix = Фамас
    .desc = { ent-GunSafeBaseSecure.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/back/backpacks.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/back/backpacks.ftl
@ -3,7 +3,7 @@ ent-ClothingBackpackSyndie = рюкзак диверсанта
 ent-ClothingMilitaryBackpack = армейский рюкзак
    .desc = Вместительный рюкзак с множеством карманов, носимый военными структурами.
 ent-ClothingDeathSquadronBackpack = рюкзак эскадрона смерти
-    .desc = Вместительный рюкзак, использующий технологию синхропространства.
+    .desc = Содержит снаряжение самых страшных агентов Центкома.
 ent-ClothingBackpackCE = рюкзак главного инженера
    .desc = Технически продвинутый рюкзак.
 ent-ClothingBackpackBlueShield = рюкзак «Синего щита»
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
@ -9,6 +9,8 @@ ent-ClothingBeltHoS = пояс службы безопасности
    .desc = Пояс службы безопасности, но из качественного материала.
 ent-ClothingBeltMedicalCMO = медицинский пояс главного врача
    .desc = Стерильный пояс со множеством карманов под таблетки и другие лекарства, подчёркивающий, что лечить нужно со стилем.
+ent-ClothingBeltMedicalElite = медицинский пояс
+    .desc = Стерильный пояс со множеством карманов под таблетки и другие лекарства.
 ent-ClothingBeltReaperWebbing = разгрузочный жилет
    .desc = Тактическая разгрузка, которую носят десантники Синдиката.
 ent-ClothingBeltSheathSyndicate = ножны для рапиры
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
@ -1,2 +1,4 @@
 ent-BaseMagazinePistolCaselessRifleExtended = расширенный пистолетный магазин (.20 безгильзовый)
    .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
+ent-MagazineCannonBallMini = чемодан с ядрами
+    .desc = Чемодан для аккуратного хранения ядер от пиратской пушки с ленточной подачей.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl
@ -1,5 +1,13 @@
-ent-MagazineP90 = магазин ПП P-90
-    .desc = Использует патроны калибра .35 авто.
+ent-MagazineP90 = магазин P-90 (SP)
+    .desc = 50-ти зарядный магазин. Использует патроны калибра .35 авто SP.
+ent-MagazineP90HP = магазин P-90 (HP)
+    .desc = 50-ти зарядный магазин. Использует патроны калибра .35 авто HP.
+ent-MagazineP90FMJ = магазин P-90 (FMJ)
+    .desc = 50-ти зарядный магазин. Использует патроны калибра .35 авто FMJ.
+ent-MagazineP90Incendiary = магазин P-90 (зажигательные)
+    .desc = 50-ти зарядный магазин. Использует патроны калибра .35 авто зажигательные.
+ent-MagazineP90AP = магазин P-90 (бронебойные)
+    .desc = 50-ти зарядный магазин. Использует патроны калибра .35 авто бронебойные.
 ent-MagazineMP7 = магазин ПП MP7
    .desc = Использует патроны калибра .35 авто.
 ent-MagazineMP5 = магазин ПП MP5
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/hmgs/hmgs.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/hmgs/hmgs.ftl
@ -1,6 +1,8 @@
 ent-WeaponMinigunMG100 = MG-100 Vindicator Миниган
    .desc = Шестизарядный ротационный пулемёт, последнее слово в портативной огневой мощи, способный стрелять достаточно долго чтобы пробить пару стен, он, несомненно, произведёт впечатление. Если вы не убьёте всех своих друзей им, вы можете использовать систему стабилизации Powerpack для точной стрельбы, но вы будете двигаться невероятно медленно.
-ent-PowerpackMinigunMG100 = силовой агрегат (5,56мм)
+ent-PowerpackMinigunMG100 = силовой агрегат (5,56мм SP)
+    .desc = { ent-BaseItem.desc }
+ent-PowerpackMinigunMG100Incendiary = силовой агрегат (5,56мм зажигательные)
    .desc = { ent-BaseItem.desc }
 ent-BasePowerpackMG100 = { ent-BaseItem }
    .desc = { ent-BaseItem.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/lmgs/lmgs.ftl
@ -6,3 +6,5 @@ ent-WeaponMachineGunMG42 = MG-342
    .desc = Скорострельный пулемёт ОПЗ, адаптированный под современные боеприпасы. Использует ленточное питание патронами 7.62×51 NT. Подходит для подавления целей и удержания позиций. Не предназначен для точной или длительной стрельбы.
 ent-WeaponDL6902 = Пулемёт DL6902
    .desc = Тяжёлый пулемёт Cybersun. Лучшая версия легендарного пулемета L6 SAW ведь использует патрон калибра 7,62x39мм
+ent-WeaponLightMachineGunPirateCannon = пиратский ядромёт
+    .desc = Ручная пиратская пушка с ленточной подачей..ядер. Со страниц самых безумных приключений Острова Сокровищ. Сочетание пиратской магии и смекалки. Настоятельно не пытайтесь понять, как это работает…
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
@ -11,10 +11,6 @@ ent-WeaponRifleFamas = фамас
    .desc = Компактная винтовка с булл-пап компоновкой, использующая патроны 5.56×45мм. Отличается высокой скорострельностью и возможностью стрельбы быстрыми очередями.
 ent-WeaponRifleG36 = G-36
    .desc = Бывшая штурмовая винтовка армий Земного правительства. Оснащена встроенным оптическим прицелом, обеспечивающим повышенную точность на средней дистанции. Всё ещё находит применение в вооружённых силах колоний и у частных охранных структур. Использует стандартные патроны калибра 5,56×45мм.
-ent-WeaponRifleM28 = M-28
-    .desc = Полноразмерный автомат армий Земного Правительства на базе G3. Использует патроны 7.62×51мм NT. Тяжёлая, мощная и надёжная — предназначена для фронтового боя и ведения огня на дальние дистанции.
-ent-WeaponRifleAR18 = Карабин AR-18
-    .desc = Укороченный вариант M-28 с телескопическим прикладом. Стреляет теми же патронами 7.62×51мм NT. Легче и компактнее, подходит для разведки и боёв в ограниченном пространстве.
 ent-WeaponRifleM16A4 = M16A4
    .desc = Легкая, универсальная штурмовая винтовка. До сих пор сохраняет актуальность среди наемников и ополченцев. Заряжается патронами калибра 5,56х45мм.
 ent-WeaponRifleScarH = scar-h
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
@ -28,7 +28,8 @@ ent-MagazineLightRifleBoxIncendiary = короб патронов L6 SAW (5,56
    .desc = { ent-BaseMagazineLightRifle.desc }
 ent-MagazineLightRifleBoxUranium = короб патронов L6 SAW (5,56 урановые)
    .desc = { ent-BaseMagazineLightRifle.desc }
-
+ent-MagazineRifleM52Empty = магазин М-52 (5,56 любые)
+    .desc = { ent-BaseMagazineRifle.desc }
 ent-MagazineRifleM52SP = магазин М-52 (5,56 SP)
    .desc = { ent-BaseMagazineRifle.desc }
 ent-MagazineRifleM52HP = магазин М-52 (5,56 HP)
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_amber.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_amber.ftl
@ -0,0 +1,3 @@
+names-military-trooperred-first-dataset-1 = Капрал
+names-military-trooperred-first-dataset-2 = Старший капрал
+names-military-trooperred-first-dataset-3 = Младший сержант
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_gamma.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_gamma.ftl
@ -0,0 +1,3 @@
+names-military-trooperamber-first-dataset-1 = Рядовой
+names-military-trooperamber-first-dataset-2 = Ефрейтор
+names-military-trooperamber-first-dataset-3 = Капрал
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_leader_amber.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_leader_amber.ftl
@ -0,0 +1,3 @@
+names-military-leaderamber-first-dataset-1 = Сержант
+names-military-leaderamber-first-dataset-2 = Младший Сержант
+names-military-leaderamber-first-dataset-3 = Мастер-Сержант
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_leader_gamma.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_leader_gamma.ftl
@ -0,0 +1,3 @@
+names-military-leadergamma-first-dataset-1 = Лейтенант
+names-military-leadergamma-first-dataset-2 = Старший лейтенант
+names-military-leadergamma-first-dataset-3 = Капитан
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_leader_red.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_leader_red.ftl
@ -0,0 +1,3 @@
+names-military-leaderred-first-dataset-1 = Мастер-сержант
+names-military-leaderred-first-dataset-2 = Старший сержант
+names-military-leaderred-first-dataset-3 = Младший лейтенант
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_red.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_red.ftl
@ -0,0 +1,3 @@
+names-military-troopergamma-first-dataset-1 = Старший капрал
+names-military-troopergamma-first-dataset-2 = Младший сержант
+names-military-troopergamma-first-dataset-3 = Сержант
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_specialist_amber.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_specialist_amber.ftl
@ -0,0 +1,3 @@
+names-military-specialistamber-first-dataset-1 = Младший капрал
+names-military-specialistamber-first-dataset-2 = Капрал
+names-military-specialistamber-first-dataset-3 = Старший капрал
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_specialist_gamma.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_specialist_gamma.ftl
@ -0,0 +1,3 @@
+names-military-specialistgamma-first-dataset-1 = Младший специалист
+names-military-specialistgamma-first-dataset-2 = Специалист
+names-military-specialistgamma-first-dataset-3 = Старший специалист
--- a/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_specialist_red.ftl
+++ b/Resources/Locale/ru-RU/datasets/_sunrise/names/military_first_specialist_red.ftl
@ -0,0 +1,3 @@
+names-military-specialistred-first-dataset-1 = Старший капрал
+names-military-specialistred-first-dataset-2 = Младший специалист
+names-military-specialistred-first-dataset-3 = Специалист
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@ -148,6 +148,6 @@
        shader: unshaded
    equipSound: /Audio/Mecha/mechmove03.ogg #starlight
    unequipSound: /Audio/Mecha/mechmove03.ogg #starlight
-    equipDelay: 3 #starlight
-    unequipDelay: 3 #starlight
+    equipDelay: 2 #starlight
+    unequipDelay: 2 #starlight
 # Sunrise-end
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@ -77,6 +77,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  randomizeName: false
  components:
    - type: GhostRole
@ -90,14 +91,17 @@
      job: DeathSquad
    - type: Loadout
      prototypes: [ DeathSquadGear ]
-      roleLoadout: [ RoleSurvivalEVA ]
+      # roleLoadout: [ RoleSurvivalEVA ] # sunrise-edit
    - type: RandomMetadata
      nameSegments:
        - NamesMilitaryFirstLeader
        - NamesMilitaryLast
      nameFormat: name-format-ert
-
-
+    - type: FootstepModifier
+      footstepSoundCollection:
+        collection: FootstepThud
+        params:
+          volume: -6
 ## ERT Leader

 - type: entity
@ -134,6 +138,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  randomizeName: false
  components:
    - type: GhostRole
@ -181,6 +186,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTLeader
  components:
    - type: GhostRole
@ -220,6 +226,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  components:
    - type: GhostRole
      name: ghost-role-information-ert-leader-name
@ -268,6 +275,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTLeader
  components:
    - type: BibleUser
@ -316,6 +324,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTChaplain
  components:
    - type: GhostRole
@ -366,6 +375,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTLeader
  components:
    - type: GhostRole
@ -413,6 +423,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTJanitor
  components:
    - type: GhostRole
@ -462,6 +473,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTLeader
  components:
    - type: GhostRole
@ -509,6 +521,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTEngineer
  components:
    - type: GhostRole
@ -558,6 +571,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTLeader
  components:
    - type: GhostRole
@ -605,6 +619,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTSecurity
  components:
    - type: GhostRole
@ -643,6 +658,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTSecurityEVA
  components:
    - type: GhostRole
@ -692,6 +708,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTLeader
  components:
    - type: GhostRole
@ -739,6 +756,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: ERTMedical
  components:
    - type: GhostRole
@ -783,6 +801,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  components:
    - type: Loadout
      prototypes: [CBURNGear]
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@ -9,7 +9,7 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_pulse
  - type: Gun
-    fireRate: 1.8
+    fireRate: 1.75
    selectedMode: FullAuto
    availableModes:
      - FullAuto
@ -17,7 +17,7 @@
      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
  - type: HitscanBatteryAmmoProvider
    proto: Pulse # Sunrise-Edit
-    fireCost: 65
+    fireCost: 80
  - type: Appearance
  - type: AmmoCounter

@ -32,15 +32,15 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_immolator
  - type: Gun
-    fireRate: 0.8
-    selectedMode: SemiAuto
+    fireRate: 2
+    selectedMode: FullAuto
    availableModes:
-      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
  - type: HitscanBatteryAmmoProvider
-    proto: RedHeavyLaser # Sunrise-Edit
-    fireCost: 50
+    proto: IgnitionRedLaser # Sunrise-Edit
+    fireCost: 35
  - type: Appearance
  - type: AmmoCounter

@ -63,7 +63,7 @@
      path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg
  - type: ProjectileBatteryAmmoProvider
    proto: CartridgeAntiMateriel
-    fireCost: 120
+    fireCost: 125
  - type: Appearance
  - type: AmmoCounter

@ -78,17 +78,23 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_solaris
  - type: Gun
-    fireRate: 1.75
-    selectedMode: SemiAuto
+    fireRate: 1.5
+    selectedMode: FullAuto
    availableModes:
-      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
  - type: HitscanBatteryAmmoProvider
-    proto: RedMediumLaser # Sunrise-Edit
-    fireCost: 35
+    proto: RedHeavyLaser # Sunrise-Edit
+    fireCost: 28
  - type: Appearance
  - type: AmmoCounter
+  - type: Tag
+    tags:
+    - PaddyMech
+  - type: Battery
+    maxCharge: 240
+    startingCharge: 240

 - type: entity
  id: WeaponMechCombatFiredartLaser
@ -101,17 +107,20 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_firedart
  - type: Gun
-    fireRate: 2.5
-    selectedMode: SemiAuto
+    fireRate: 2
+    selectedMode: FullAuto
    availableModes:
-      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
  - type: HitscanBatteryAmmoProvider
    proto: RedLaser
-    fireCost: 20
+    fireCost: 14
  - type: Appearance
  - type: AmmoCounter
+  - type: Tag
+    tags:
+    - PaddyMech

 - type: entity
  id: WeaponMechCombatTeslaCannon
@ -124,19 +133,19 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_wholegen
  - type: Gun
-    projectileSpeed: 10
-    projectileSpeedModified: 10
-    fireRate: 1
-    selectedMode: SemiAuto
+    projectileSpeed: 6
+    projectileSpeedModified: 8
+    fireRate: 0.8
+    selectedMode: FullAuto
    availableModes:
-      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Effects/Lightning/lightningshock.ogg
      params:
        variation: 0.2
  - type: ProjectileBatteryAmmoProvider
    proto: TeslaGunBullet
-    fireCost: 55
+    fireCost: 100
  - type: Appearance
  - type: AmmoCounter

@ -151,17 +160,20 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_disabler
  - type: Gun
-    fireRate: 2
-    selectedMode: SemiAuto
+    fireRate: 1.75
+    selectedMode: FullAuto
    availableModes:
-      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
  - type: ProjectileBatteryAmmoProvider
    proto: BulletDisablerSmgSpread
-    fireCost: 45
+    fireCost: 30
  - type: Appearance
  - type: AmmoCounter
+  - type: Tag
+    tags:
+    - PaddyMech

 - type: entity
  id: WeaponMechCombatTaser
@ -185,6 +197,9 @@
    fireCost: 40
  - type: Appearance
  - type: AmmoCounter
+  - type: Tag
+    tags:
+    - PaddyMech

 - type: entity
  id: WeaponMechCombatShotgun
@ -197,15 +212,15 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_scatter
  - type: Gun
-    fireRate: 1.45
+    fireRate: 1.3
    selectedMode: FullAuto
    availableModes:
      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
  - type: ProjectileBatteryAmmoProvider
-    proto: ShellShotgun
-    fireCost: 50
+    proto: ShellShotgunMech
+    fireCost: 75
  - type: Appearance
  - type: AmmoCounter

@ -220,14 +235,14 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_carbine
  - type: Gun
-    fireRate: 1.45
+    fireRate: 1.3
    selectedMode: FullAuto
    availableModes:
      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
  - type: ProjectileBatteryAmmoProvider
-    proto: ShellShotgunIncendiary
+    proto: ShellShotgunMechIncendiary
    fireCost: 75
  - type: Appearance
  - type: AmmoCounter
@ -247,14 +262,14 @@
    maxAngle: 10
    fireRate: 5
    shotsPerBurst: 3
-    burstCooldown: 0.6
+    burstCooldown: 0.75
    selectedMode: Burst
    availableModes:
      - Burst
    soundGunshot:
      path: /Audio/_Sunrise/Weapons/Guns/Snipers/garand/garand.ogg
  - type: ProjectileBatteryAmmoProvider
-    proto: CartridgeHeavyRifleRFMJ #CartridgeLightRifleSP
+    proto: CartridgeHeavyRifleRFMJMech #CartridgeLightRifleSP
    fireCost: 10
  - type: Appearance
  - type: AmmoCounter
@ -303,7 +318,7 @@
    maxAngle: 10
    fireRate: 5
    shotsPerBurst: 3
-    burstCooldown: 0.6
+    burstCooldown: 0.75
    selectedMode: Burst
    availableModes:
      - Burst
@ -316,6 +331,9 @@
    fireCost: 20
  - type: Appearance
  - type: AmmoCounter
+  - type: Tag
+    tags:
+    - PaddyMech

 - type: entity
  id: WeaponMechCombatXray
@ -328,17 +346,20 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_xray
  - type: Gun
-    fireRate: 1.25
-    selectedMode: SemiAuto
+    fireRate: 2
+    selectedMode: FullAuto
    availableModes:
-      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
  - type: ProjectileBatteryAmmoProvider
    proto: CartridgeXrayBeam
-    fireCost: 60
+    fireCost: 50
  - type: Appearance
  - type: AmmoCounter
+  - type: Battery
+    maxCharge: 400
+    startingCharge: 400

 - type: entity
  id: WeaponMechCombatMissileRack8
@ -446,3 +467,6 @@
    fireCost: 60
  - type: Appearance
  - type: AmmoCounter
+  - type: Tag
+    tags:
+    - PaddyMech
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@ -8,10 +8,13 @@
    equipmentWhitelist:
      tags:
      - CombatMech
+      - PaddyMech
  - type: Speech
    speechSounds: Borg
  - type: TTS
    voice: Crysis2AICostume
+  - type: Prying
+    pryPowered: true

 - type: entity
  id: IndustrialMech
@ -208,6 +211,7 @@
  - type: ExplosionResistance # Sunrise-Edit
    damageCoefficient: 0.8 # Sunrise-Edit
  - type: ProtectedFromStepTriggers # Sunrise-added
+  - type: ComplexInteraction # Sunrise-added

 # Ripley MK-I
 - type: entity
@ -449,13 +453,14 @@
  - type: Mech
    equipmentWhitelist:
      tags:
-      - CombatMech
+      - PaddyMech
      - IndustrialMech
    baseState: paddy
    openState: paddy-open
    brokenState: paddy-broken
    mechToPilotDamageMultiplier: 0.60
    airtight: true
+    maxEquipmentAmount: 4
    #siren: true # Todo: port siren system from starlight
    pilotWhitelist:
      components:
@ -476,7 +481,7 @@
      types:
        Blunt: 30 #intentionally shit so people realize that going into combat with the ripley is usually a bad idea.
        Structural: 10
-    bluntStaminaDamageFactor: 1
+    bluntStaminaDamageFactor: 1.5
  - type: MovementSpeedModifier
    baseWalkSpeed: 2.5
    baseSprintSpeed: 4
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@ -9,7 +9,7 @@
      - CartridgeRifle
  - type: Sprite
    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/5.56x45.rsi # Sunrise-Edit
-    scale: 0.60, 0.60 # Sunrise-Added
+    scale: 0.55, 0.5 # Sunrise-Added
    layers:
    - state: base
      map: ["enum.AmmoVisualLayers.Base"]
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@ -306,6 +306,13 @@
  - type: Gun
    fireRate: 2
  - type: BallisticAmmoProvider
+    # sunrise-start
+    proto: CannonBallGrapeshotMini
+    whitelist:
+      tags:
+      - ShellShotgun
+      - CannonBallMini
+   # sunrise-end
    capacity: 1
  - type: StaticPrice
    price: 0
--- a/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
@ -37,8 +37,8 @@
    belt: ClothingBeltBandolier
  storage:
    back:
-    - WeaponShotgunDoubleBarreled
-    - BoxShotgunIncendiary
+    # - WeaponShotgunDoubleBarreled #Sunrise-Edit
+    # - BoxShotgunIncendiary #Sunrise-Edit
    - GrenadeFlashBang
    - PillAmbuzolPlus
    - PillAmbuzol
@ -61,7 +61,6 @@
    mask: ClothingMaskGasERT
    eyes: ClothingEyesGlassesSecurity
    ears: ClothingHeadsetAltCentCom
-    # gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterSoftsuitCBURN
    shoes: ClothingShoesBootsCombatFilled
    id: CBURNPDA
@ -71,12 +70,17 @@
    head: ClothingHeadSoftsuitCBURN
  storage:
    back:
-    - WeaponGunLaserCarbineAutomatic
-    - MagazineBatteryLr60
-    - MagazineBatteryLr60
-    - MagazineBatteryLr30
+    - GrenadeFlashBang
+    - GrenadeFlashBang
    - GrenadeFlashBang
    - PillAmbuzolPlus
    - PillAmbuzol
+    - PillAmbuzol
+    - PillAmbuzol
+    - SyringeAmbuzol
    - ClothingHandsPowerGlovesUplinkNTERTCBURN
+    - FireExtinguisherMini
+    - MedkitCombatFilled
+    - MedkitBurnFilled
+    - MedkitToxinFilled
 # Sunrise-end
--- a/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
+++ b/Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
@ -5,7 +5,7 @@
  playTimeTracker: JobDeathSquad
  setPreference: false
  startingGear: DeathSquadGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconDeathsquad" # Sunrise-edit
  overrideConsoleVisibility: false # Sunrise added
  supervisors: job-supervisors-centcom
  canBeAntag: false
@ -21,17 +21,17 @@
  id: DeathSquadGear
  equipment:
    jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDeathSquad
+    back: ClothingDeathSquadronBackpack # Sunrise-edit
    mask: ClothingMaskGasDeathSquad
    eyes: ClothingEyesHudSecurity
    ears: ClothingHeadsetAltCentCom
-    gloves: ClothingHandsGlovesCombat
+    # gloves: ClothingHandsGlovesCombat # Sunrise-edit
    outerClothing: ClothingOuterHardsuitDeathsquad
    shoes: ClothingShoesBootsMagAdv
    id: DeathsquadPDA
-    pocket1: EnergySword
-    pocket2: EnergyShield
-    belt: ClothingBeltMilitaryWebbingMedFilled
+    pocket1: PouchAmmo # Sunrise-edit
+    pocket2: DoubleEmergencyOxygenTankFilled # Sunrise-edit
+    belt: ClothingBeltMedicalElite # Sunrise-edit
  storage:
    back:
    - WeaponPulsePistol
@ -41,12 +41,18 @@
    - BoxFlashbang
    - ToolDebug # spanish army knife
    - WelderExperimental
-    - Hypospray
+    # - Hypospray # Sunrise-edit
    - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits
    - FreedomImplanter
-    - ClothingHandsPowerGlovesUplinkNTERTEpsilon # Sunrise-added
+    # Sunrise-start
+    - EnergySword
+    - EnergyShield
+    - SpeedLoaderMagnumAP
+    - SpeedLoaderMagnumAP
+    - BoxErtBaseKit
+    # Sunrise-end
  inhand:
-  - WeaponPulseRifle
+  - ClothingHandsPowerGlovesUplinkNTERTEpsilon # Sunrise-edit

 - type: chameleonOutfit
  id: DeathSquadChameleonOutfit
--- a/Resources/Prototypes/StatusIcon/job.yml
+++ b/Resources/Prototypes/StatusIcon/job.yml
@ -429,6 +429,16 @@
    state: Nanotrasen
  jobName: job-name-centcomoff

+# sunrise-start
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconDeathsquad
+  icon:
+    sprite: *icon-rsi
+    state: DeathSquad
+  allowSelection: false
+# sunrise-end
+
 - type: jobIcon
  parent: JobIcon
  id: JobIconAdmin
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml
@ -0,0 +1,19 @@
+- type: entity
+  id: MechCartridge
+  abstract: true
+  components:
+    - type: CartridgeAmmo
+      deleteOnSpawn: true
+
+- type: entity
+  id: ShellShotgunMechIncendiary
+  parent: [ShellShotgunIncendiary, MechCartridge]
+
+- type: entity
+  id: ShellShotgunMech
+  parent: [ShellShotgun, MechCartridge]
+
+
+- type: entity
+  id: CartridgeHeavyRifleRFMJMech
+  parent: [CartridgeHeavyRifleRFMJ, MechCartridge]
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle_heavy.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle_heavy.yml
@ -7,28 +7,135 @@
    tags:
      - MagazineMachineGunHeavyRifle
  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHeavySP
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgeHeavyRifle
    capacity: 100
  - type: Item
    size: Normal
    shape:
-    - 0,0,2,1
+    - 0,0,1,2
  - type: Sprite
-    sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/mg42_large.rsi
    layers:
    - state: base
      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
+    - state: mag-4
      map: ["enum.GunVisualLayers.Mag"]
  - type: MagazineVisuals
    magState: mag
-    steps: 8
+    steps: 5
    zeroVisible: false
  - type: Appearance

+- type: entity
+  id: RifleHeavyMagazineSP
+  name: "belt box (.308 SP)"
+  parent: RifleHeavyBase
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleHeavySP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-4
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#575EF5"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#575EF5"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#575EF5"
+
+- type: entity
+  id: RifleHeavyMagazineHP
+  name: "belt box (.308 HP)"
+  parent: RifleHeavyBase
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleHeavyHP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-4
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#F5514C"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#F5514C"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#F5514C"
+
+- type: entity
+  id: RifleHeavyMagazineFMJ
+  name: "belt box (.308 FMJ)"
+  parent: RifleHeavyBase
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleHeavyFMJ
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-4
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#080706"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#080706"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#080706"
+
+- type: entity
+  id: RifleHeavyMagazineAP
+  name: "belt box (.308 AP)"
+  parent: RifleHeavyBase
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleHeavyAP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-4
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#540000"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#540000"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#540000"
+
 - type: entity
  id: RifleHeavyMagazineEmpty
-  name: "Magazine Box (.308 any)"
+  name: "belt box (.308 any)"
  suffix: empty
  parent: RifleHeavyBase
  components:
@ -38,75 +145,16 @@
    layers:
    - state: base
      map: ["enum.GunVisualLayers.Base"]
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
-
- type: entity
-  id: RifleHeavyMagazineSP
-  name: "Magazine Box (.308 SP)"
-  parent: RifleHeavyBase
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHeavySP
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: sp
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
-
- type: entity
-  id: RifleHeavyMagazineHP
-  name: "Magazine Box (.308 HP)"
-  parent: RifleHeavyBase
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHeavyHP
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: hp
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
-
- type: entity
-  id: RifleHeavyMagazineFMJ
-  name: "Magazine Box (.308 FMJ)"
-  parent: RifleHeavyBase
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHeavyFMJ
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: fmj
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag

 - type: entity
  id: RifleHeavyMagazineIncendiary
-  name: "Magazine Box (.308 incendiary)"
+  name: "belt box (.308 incendiary)"
  parent: RifleHeavyBase
  components:
  - type: BallisticAmmoProvider
@ -115,18 +163,24 @@
    layers:
    - state: base
      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
+    - state: mag-4
      map: ["enum.GunVisualLayers.Mag"]
-    - state: incendiary
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
+    - state: stripe
+      color: "#ff6e52"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ff6e52"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ff6e52"

 - type: entity
  id: RifleHeavyMagazineUranium
-  name: "Magazine Box (.308 uranium)"
+  name: "belt box (.308 uranium)"
  parent: RifleHeavyBase
  components:
  - type: BallisticAmmoProvider
@ -135,31 +189,17 @@
    layers:
    - state: base
      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
+    - state: mag-4
      map: ["enum.GunVisualLayers.Mag"]
-    - state: uranium
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
-
- type: entity
-  id: RifleHeavyMagazineAP
-  name: "Magazine Box (.308 AP)"
-  parent: RifleHeavyBase
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleHeavyAP
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: ap
-  - type: MagazineVisuals
-    magState: mag
-    steps: 8
-    zeroVisible: false
-  - type: Appearance
+    - state: stripe
+      color: "#40F57A"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#40F57A"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#40F57A"
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@ -56,6 +56,37 @@
    - NanoTrasen
  - type: FactionClothingBlocker

+- type: entity
+  name: M492 "Incinerator"
+  id: WeaponLightMachineGunM492Cburn
+  parent: [WeaponLightMachineGunM492, BaseCentcommContraband ]
+  description: A modification of the smart machine gun, created specifically for CBURN squads. Uses .30 rounds.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-3
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi
+  - type: ItemSlots
+    slots:
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeLightRifleIncendiary
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeLightRifle
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifleBeltBoxIncendiary
+        whitelist:
+          tags:
+            - LightRifleHeavy
+
 - type: entity
  name: DP-28 LMG
  id: WeaponLightMachineGunDP28
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@ -753,8 +753,10 @@
    types:
      Piercing: 2
      Slash: 2
+      Structural: 3
  pierceChance: 0.01
  ricochetChance: 0.05
+  staminaDamage: 3
  count: 18
  spread: 45
  bullet:
@ -762,6 +764,24 @@
      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
      state: shard

+- type: hitscan
+  id: PelletShotgunImprovisedSpreadTraceLarge
+  parent: BulletTrace
+  damage:
+    types:
+      Piercing: 2
+      Slash: 2
+      Structural: 3
+  pierceChance: 0.01
+  ricochetChance: 0.5
+  staminaDamage: 3
+  count: 36
+  spread: 45
+  bullet:
+    sprite:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+      state: shard
+
 - type: hitscan
  id: PelletShotgunUraniumSpreadTrace
  parent: BulletTrace
@ -1144,7 +1164,7 @@
    types:
      Piercing: 26
      Structural: 10
-  armorPenetration: -0.25
+  armorPenetration: -0.1
  pierceChance: 0.40
  ricochetChance: 0.30
  staminaDamage: 5
@ -1175,7 +1195,7 @@
      Structural: 5
  armorPenetration: 0.35
  pierceChance: 0.8
-  ricochetChance: 0.40
+  ricochetChance: 0.80
  staminaDamage: 3
  pierceLevel: Metal
  bullet:
@ -1190,9 +1210,9 @@
    types:
      Piercing: 20 #- 30%
      Structural: 2
-  armorPenetration: 0.80
-  pierceChance: 0.85
-  ricochetChance: 0.30
+  armorPenetration: 0.5
+  pierceChance: 0.9
+  ricochetChance: 0.50
  staminaDamage: 1
  pierceLevel: HardenedMetal
  bullet:
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@ -39,17 +39,17 @@
    containers:
      gun_magazine: !type:ContainerSlot
  - type: GunWieldBonus
-    minAngle: -3
-    maxAngle: -4
+    minAngle: -8
+    maxAngle: -14
  - type: Gun
-    minAngle: 4
-    maxAngle: 16
+    minAngle: 10
+    maxAngle: 25
    angleIncrease: 1.75
    angleDecay: 6
-    fireRate: 4
+    fireRate: 2
    shotsPerBurst: 3
-    burstFireRate: 7
-    burstCooldown: 0.75
+    burstFireRate: 5
+    burstCooldown: 1
    selectedMode: Burst
    availableModes:
      - SemiAuto
@ -190,6 +190,8 @@
    fireRate: 8
    soundGunshot:
      path: /Audio/_Starlight/Weapons/Guns/Gunshots/aussec.ogg
+      params:
+        volume: -3
  - type: MagazineVisuals
    magState: mag
    steps: 3
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
@ -134,13 +134,15 @@
  id: ClothingBackpackDuffelWeaponSubMachineGunP90Filled
  parent: ClothingBackpackDuffelMilitary
  name: Bundle p90
-  description: P-90 with 3 raspy magazines.
+  description: P-90 with 4 raspy magazines.
  components:
    - type: StorageFill
      contents:
        - id: WeaponSubMachineGunP90
        - id: MagazineP90
-          amount: 3
+          amount: 2
+        - id: MagazineP90HP
+        - id: MagazineP90FMJ

 - type: entity
  id: ClothingBackpackDuffelWeaponAMS42Filled
@ -207,28 +209,62 @@
        - id: BoxShotgunSlug

 - type: entity
-  id: ClothingBackpackDuffelWeaponRifleAR18Filled
+  id: ClothingBackpackDuffelWeaponRifleSKM24Filled
  parent: ClothingBackpackDuffelMilitary
-  name: Bundle AR18
-  description: AR18 with 2 raspy magazines.
+  name: Bundle SKM-24
+  description: SKM-24 with 6 raspy various magazines.
  components:
    - type: StorageFill
      contents:
-        - id: WeaponRifleAR18
-        - id: MagazineRifleHeavySP
+        - id: WeaponRifleSKM24Nano
+        - id: MagazineLightRifleSP
+          amount: 3
+        - id: MagazineLightRifleFMJ
+          amount: 1
+        - id: MagazineLightRifleHP
          amount: 2

 - type: entity
-  id: ClothingBackpackDuffelWeaponRifleM28Filled
-  parent: ClothingBackpackDuffelMilitary
-  name: Bundle M28
-  description: M28 with 3 raspy magazines.
+  id: ClothingBackpackDuffelWeaponRifleSKM24FilledCBURN
+  parent: ClothingBackpackDuffelCBURN
+  name: Bundle SKM-24
+  description: AR18 with 6 raspy Incendiary magazines.
  components:
    - type: StorageFill
      contents:
-        - id: WeaponRifleM28
+        - id: WeaponRifleSKM24
+        - id: MagazineLightRifleIncendiary
+          amount: 6
+        - id: FireExtinguisher
+
+- type: entity
+  id: ClothingBackpackDuffelWeaponRifleSKM28Filled
+  parent: ClothingBackpackDuffelMilitary
+  name: Bundle SKM-28
+  description: SKM-28 with 6 raspy various magazines.
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleSKM28Nano
+        - id: MagazineRifleHeavyFMJ
+          amount: 1
        - id: MagazineRifleHeavySP
          amount: 3
+        - id: MagazineRifleHeavyHP
+          amount: 2
+
+- type: entity
+  id: ClothingBackpackDuffelWeaponRifleSKM28FilledCBURN
+  parent: ClothingBackpackDuffelCBURN
+  name: Bundle SKM-28
+  description: SKM-28 with 6 raspy Incendiary magazines.
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleSKM28
+        - id: MagazineRifleHeavyIncendiary
+          amount: 6
+        - id: FireExtinguisher

 - type: entity
  id: ClothingBackpackDuffelWeaponRifleBR64Filled
@ -242,17 +278,30 @@
        - id: MagazineRifleHeavyFMJ
          amount: 2

-#- type: entity
-#  id: ClothingBackpackDuffelWeaponLightMachineGunMG42
-#  parent: ClothingBackpackDuffelMilitary
-#  name: Bundle mg342
-#  description: MG-342 with 2 raspy magazines.
-#  components:
-#    - type: StorageFill
-#      contents:
-#        - id: WeaponMachineGunMG42
-#        - id: MagazineMachineGunMG42
-#          amount: 2
+- type: entity
+  id: ClothingBackpackDuffelWeaponLightMachineGunM492
+  parent: ClothingBackpackDuffelMilitary
+  name: Bundle smart gun M492
+  description: M492 with 2 raspy SP and FMJ belt-box.
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponLightMachineGunM492
+        - id: MagazineLightRifleBeltBox
+        - id: MagazineLightRifleBeltBoxFMJ
+
+- type: entity
+  id: ClothingBackpackDuffelWeaponLightMachineGunM492CBURN
+  parent: ClothingBackpackDuffelCBURN
+  name: Bundle M492 "Incinerator"
+  description: M492 with 3 raspy Incendiary belt-box.
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponLightMachineGunM492Cburn
+        - id: MagazineLightRifleBeltBoxIncendiary
+          amount: 3
+        - id: FireExtinguisher

 - type: entity
  id: ClothingBackpackDuffelWeaponSniperHristovFilled
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
@ -194,7 +194,7 @@

 #ammo kits
 - type: entity
-  name: box of .308 SP magazines
+  name: .308 magazines kit
  parent: BoxMagazine
  id: BoxMagazineRifleNanotrasen
  description: A box full of 7,62x51 magazines.
@ -207,7 +207,18 @@
      - id: MagazineRifleHeavyHP

 - type: entity
-  name: box of M-52 magazines
+  name: .308 incendiary magazines kit
+  parent: BoxMagazine
+  id: BoxMagazineRifleNanotrasenIncendiary
+  description: A box full of 7,62x51 magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineRifleHeavyIncendiary
+        amount: 4
+
+- type: entity
+  name: M-52 magazines kit
  parent: BoxMagazine
  id: BoxMagazineRifleM52
  description: A box full of 5,56x45 magazines.
@ -218,3 +229,62 @@
        amount: 2
      - id: MagazineRifleM52FMJ
      - id: MagazineRifleM52HP
+
+- type: entity
+  name: 5,56 magazines kit
+  parent: BoxMagazine
+  id: BoxMagazineRifleKit
+  description: A box full of 5,56x45 magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineRifleSP
+        amount: 2
+      - id: MagazineRifleFMJ
+      - id: MagazineRifleHP
+
+- type: entity
+  name: 5,56 incendiary magazines kit
+  parent: BoxMagazine
+  id: BoxMagazineRifleIncendiary
+  description: A box full of 5,56x45 magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineRifleIncendiary
+        amount: 4
+
+- type: entity
+  name: WT550 magazines kit
+  parent: BoxMagazine
+  id: BoxMagazineSMGTopMounted
+  description: A box full of WT550 magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGunTopMountedSP
+        amount: 2
+      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolSubMachineGunTopMountedHP
+
+- type: entity
+  name: WT550 incendiary magazines kit
+  parent: BoxMagazine
+  id: BoxMagazineSMGTopMountedIncendiary
+  description: A box full of WT550 magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGunTopMountedIncendiary
+        amount: 4
+
+- type: entity
+  name: 7,62 incendiary magazines kit
+  parent: BoxMagazine
+  id: BoxMagazineLightRifleIncendiary
+  description: A box full of 7,62 magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGunTopMountedIncendiary
+        amount: 4
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
@ -156,25 +156,19 @@
    - state: box_of_doom
    - state: smg_base

-# - type: entity
-#   parent: BaseSyndicateAmmoKit
-#   id: SMGIncendiaryAmmoKit
-#   name: C20r Incendiary ammo kit
-#   components:
-#   - type: StorageFill
-#     contents:
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#     - id: MagazinePistolSubMachineGunIncendiary
-#   - type: Sprite
-#     layers:
-#     - state: box_of_doom_big
-#     - state: smg_red
+- type: entity
+  parent: BaseSyndicateAmmoKit
+  id: SMGIncendiaryAmmoKit
+  name: C20r Incendiary ammo kit
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazinePistolSubMachineGunIncendiary
+      amount: 8
+  - type: Sprite
+    layers:
+    - state: box_of_doom_big
+    - state: smg_red

 # - type: entity
 #   parent: BaseSyndicateAmmoKit
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/security.yml
@ -205,19 +205,6 @@
    - id: MagazineRifleSP
      amount: 4

- type: entity
-  parent: GunSafeBaseSecure
-  id: GunSafeRifleAKMU
-  name: safe
-  suffix: AKMU
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponRifleAKMU
-      amount: 2
-    - id: MagazineLightRifleSP
-      amount: 4
-
 - type: entity
  parent: GunSafeBaseSecure
  id: GunSafeRifleLecterMk2
@ -236,22 +223,6 @@
    - id: MagazineRifleFMJ
      amount: 2

- type: entity
-  parent: GunSafeBaseSecure
-  id: GunSafeRifleAR18
-  name: safe
-  suffix: AR-18
-  components:
-  - type: StorageFill
-    contents:
-    - id: WeaponRifleAR18
-      amount: 2
-    - id: WeaponRifleM28
-    - id: MagazineRifleHeavySP
-      amount: 6
-    - id: MagazineRifleHeavyHP
-      amount: 4
-
 - type: entity
  parent: GunSafeBaseSecure
  id: GunSafeRifleFamas
@ -263,7 +234,6 @@
    - id: WeaponRifleFamas
      amount: 2
    - id: WeaponRifleG36
-      amount: 2
    - id: MagazineRifleSP
      amount: 4
    - id: MagazineRifleHP
@ -271,6 +241,84 @@
    - id: MagazineRifleFMJ
      amount: 2

+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeRifleAKMU
+  name: safe
+  suffix: SKM-24
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRifleSKM24
+      orGroup: SKM
+    - id: WeaponRifleSKM24White
+      orGroup: SKM
+    - id: WeaponRifleSKM24Green
+      orGroup: SKM
+    - id: WeaponRifleSKM24Scrap
+      prob: 0.2
+      amount: 3
+      orGroup: SKM
+    - id: WeaponRifleSKM24Syndi
+      prob: 0.1
+      orGroup: SKM
+    - id: WeaponRifleSKM24Nano
+      prob: 0.6
+      orGroup: SKM
+    - id: WeaponRifleSKM24
+      orGroup: SKM2
+    - id: WeaponRifleSKM24White
+      orGroup: SKM2
+    - id: WeaponRifleSKM24Green
+      orGroup: SKM2
+    - id: WeaponRifleSKM24Scrap
+      prob: 0.2
+      amount: 3
+      orGroup: SKM2
+    - id: WeaponRifleSKM24Syndi
+      prob: 0.1
+      orGroup: SKM2
+    - id: WeaponRifleSKM24Nano
+      prob: 0.6
+      orGroup: SKM2
+    - id: WeaponRifleSKM24
+      orGroup: SKM3
+    - id: WeaponRifleSKM24White
+      orGroup: SKM3
+    - id: WeaponRifleSKM24Green
+      orGroup: SKM3
+    - id: WeaponRifleSKM24Scrap
+      prob: 0.2
+      amount: 3
+      orGroup: SKM3
+    - id: WeaponRifleSKM24Syndi
+      prob: 0.1
+      orGroup: SKM3
+    - id: WeaponRifleSKM24Nano
+      prob: 0.6
+      orGroup: SKM3
+    - id: WeaponRifleSKM24
+      orGroup: SKM4
+    - id: WeaponRifleSKM24White
+      orGroup: SKM4
+    - id: WeaponRifleSKM24Green
+      orGroup: SKM4
+    - id: WeaponRifleSKM24Scrap
+      prob: 0.2
+      amount: 3
+      orGroup: SKM4
+    - id: WeaponRifleSKM24Syndi
+      prob: 0.1
+      orGroup: SKM4
+    - id: WeaponRifleSKM24Nano
+      prob: 0.6
+      orGroup: SKM4
+    - id: MagazineLightRifleSP
+      amount: 4
+    - id: MagazineLightRifleFMJ
+      amount: 4
+
 # region Shotguns safes
 - type: entity
  parent: GunSafeBaseSecure
@ -472,16 +520,12 @@
      children:
      - id: GunSafeRifleLecter
      - id: GunSafeRifleM16A4
+      - id: GunSafeRifleAKMU
    - !type:GroupSelector
-      weight: 15
+      weight: 20
      children:
      - id: GunSafeRifleFamas
      - id: GunSafeRifleLecterMk2
-    - !type:GroupSelector
-      weight: 5
-      children:
-      - id: GunSafeRifleAR18
-      - id: GunSafeRifleAKMU

 # SMG Spawner
 - type: entity
--- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
@ -37,8 +37,8 @@
    WeaponRifleAK514: 3
    WeaponRifleFamas: 3
    WeaponRifleG36: 3
-    WeaponRifleM28: 3
-    WeaponRifleAR18: 3
+    WeaponRifleSKM28: 3
+    WeaponRifleSKM24: 3
    WeaponRifleScarH: 3
    WeaponRifleLecterMk2: 3
    WeaponRifleFoam: 3
@ -120,6 +120,9 @@
    WeaponLightMachineGunRPD: 3
    WeaponMachineGunMG42: 3
    PowerpackMinigunMG100: 3
+    PowerpackMinigunMG100Incendiary: 3
+    WeaponLightMachineGunM492Cburn: 3
+    WeaponLightMachineGunM492: 3
    PowerpackDL6902: 3
    WeaponDL6902: 3
    WeaponMinigun: 3
--- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
@ -1,10 +1,10 @@
-# Автоматы:
+# region Огнестрел:
 - type: listing
  id: ERTUplinkWeaponSubMachineGunDrozdMk2
  productEntity: ClothingBackpackDuffelWeaponSubMachineGunDrozdMk2
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: drozd }
  cost:
-    Bluecrystal: 9
+    Bluecrystal: 10
  categories:
    - NTAutoGun
  conditions:
@ -16,7 +16,7 @@
  productEntity: ClothingBackpackDuffelWeaponRifleLecterFilled
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: lecter }
  cost:
-    Bluecrystal: 9
+    Bluecrystal: 10
  categories:
    - NTAutoGun
  conditions:
@ -29,7 +29,7 @@
  productEntity: ClothingBackpackDuffelWeaponSubMachineGunWt550
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: wt550 }
  cost:
-    Bluecrystal: 9
+    Bluecrystal: 10
  categories:
    - NTAutoGun
  conditions:
@ -54,24 +54,27 @@
      - ERTGamma
      - ERTEpsilon

- type: listing
-  id: ERTUplinkWeaponAMS42Filled
-  name: ntuplink-gun-bundleams42-name
-  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ams42 }
-  productEntity: ClothingBackpackDuffelWeaponAMS42Filled
-  cost:
-    Bluecrystal: 12
-  categories:
-  - NTAutoGun
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 4
-
 - type: listing
  id: ERTUplinkWeaponRifleG36Filled
  name: ntuplink-gun-bundleg36-name
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: g36 }
  productEntity: ClothingBackpackDuffelWeaponRifleG36Filled
+  cost:
+    Bluecrystal: 13
+  categories:
+  - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 4
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTRed
+
+- type: listing
+  id: ERTUplinkWeaponRifleSKM24Filled
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skm24nano }
+  productEntity: ClothingBackpackDuffelWeaponRifleSKM24Filled
  cost:
    Bluecrystal: 12
  categories:
@ -79,11 +82,148 @@
  conditions:
  - !type:ListingLimitedStockCondition
    stock: 4
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - CBURN
+
+- type: listing
+  id: ERTUplinkWeaponRifleSKM24FilledCBURN
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skm24 }
+  productEntity: ClothingBackpackDuffelWeaponRifleSKM24FilledCBURN
+  cost:
+    Bluecrystal: 13
+  categories:
+  - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 4
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
+- type: listing
+  id: ERTUplinkWeaponAMS42Filled
+  name: ntuplink-gun-bundleams42-name
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ams42 }
+  productEntity: ClothingBackpackDuffelWeaponAMS42Filled
+  cost:
+    Bluecrystal: 15
+  categories:
+  - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 4
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
+- type: listing
+  id: ERTUplinkWeaponRifleSKM28Filled
+  productEntity: ClothingBackpackDuffelWeaponRifleSKM28Filled
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skm28nano }
+  cost:
+    Bluecrystal: 15
+  categories:
+  - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 3
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - CBURN
+
+- type: listing
+  id: ERTUplinkWeaponRifleSKM28FilledCBURN
+  productEntity: ClothingBackpackDuffelWeaponRifleSKM28FilledCBURN
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: skm28 }
+  cost:
+    Bluecrystal: 15
+  categories:
+  - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 3
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
+- type: listing
+  id: ERTUplinkWeaponLightMachineGunM492
+  productEntity: ClothingBackpackDuffelWeaponLightMachineGunM492
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: m492 }
+  cost:
+    Bluecrystal: 20
+  categories:
+    - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTRed
+
+- type: listing
+  id: ERTUplinkWeaponLightMachineGunM492CBURN
+  productEntity: ClothingBackpackDuffelWeaponLightMachineGunM492CBURN
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: m492cburn }
+  cost:
+    Bluecrystal: 20
+  categories:
+    - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN

 - type: listing
  id: ERTUplinkWeaponLightMachineGunMG42
  productEntity: WeaponMachineGunMG42
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg42 }
+  cost:
+    Bluecrystal: 33
+  categories:
+    - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkPowerpackMinigunMG100Incendiary
+  description: ntuplink-gun-minigun-desc
+  productEntity: PowerpackMinigunMG100Incendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg_100 }
+  cost:
+    Bluecrystal: 35
+  categories:
+    - NTAutoGun
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkPowerpackMinigunMG100
+  description: ntuplink-gun-minigun-desc
+  productEntity: PowerpackMinigunMG100
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg_100 }
  cost:
    Bluecrystal: 35
  categories:
@ -97,37 +237,6 @@
      - ERTGamma
      - ERTEpsilon

- type: listing
-  id: ERTUplinkPowerpackMinigunMG100
-  description: ntuplink-gun-minigun-desc
-  productEntity: PowerpackMinigunMG100
-  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mg_100 }
-  cost:
-    Bluecrystal: 38
-  categories:
-    - NTAutoGun
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - CBURN
-      - ERTGamma
-      - ERTEpsilon
-
- type: listing
-  id: ERTUplinkWeaponRifleM28Filled
-  productEntity: ClothingBackpackDuffelWeaponRifleM28Filled
-  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: m28 }
-  cost:
-    Bluecrystal: 14
-  categories:
-  - NTAutoGun
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 3
-
 - type: listing
  id: ERTUplinklWeaponRifleM52Filled
  name: ntuplink-gun-bundlem52-name
@ -230,7 +339,7 @@
  - !type:ListingLimitedStockCondition
    stock: 5

-# Лазеры:
+# region Лазеры:
 - type: listing
  id: ERTUplinkWeaponWeaponPulseRifle
  productEntity: WeaponPulseRifle
@ -245,7 +354,6 @@
  - !type:StoreWhitelistCondition
    whitelist:
      tags:
-      - CBURN
      - ERTGamma
      - ERTEpsilon

@ -263,7 +371,6 @@
  - !type:StoreWhitelistCondition
    whitelist:
      tags:
-      - CBURN
      - ERTGamma
      - ERTEpsilon

@ -293,7 +400,6 @@
  - !type:StoreWhitelistCondition
    whitelist:
      tags:
-      - CBURN
      - ERTGamma
      - ERTEpsilon

@ -309,6 +415,18 @@
  - !type:ListingLimitedStockCondition
    stock: 6

+- type: listing
+  id: ERTUplinkWeaponGunLaserCarbineAutomatic
+  productEntity: WeaponGunLaserCarbineAutomatic
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ik60 }
+  cost:
+    Bluecrystal: 11
+  categories:
+  - NTLasers
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 6
+
 - type: listing
  id: ERTUplinkWeaponEnergyGunTactical
  productEntity: WeaponEnergyGunTactical
@ -344,7 +462,7 @@
      - ERTGamma
      - ERTEpsilon

-# Пистолеты:
+# region Пистолеты:
 - type: listing
  id: ERTUplinkWeaponRevolverSpearhead
  productEntity: WeaponRevolverSpearhead
@ -416,10 +534,10 @@
      - ERTGamma
      - CBURN

-# Боеприпасы:
+# region Боеприпасы:
 - type: listing
  id: ERTUplinkBoxMagazineSubMachineGunTopMounted
-  productEntity: BoxMagazinePistolSubMachineGunTopMounted
+  productEntity: BoxMagazineSMGTopMounted
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_wt550 }
  cost:
    Crystallite: 5
@ -429,6 +547,22 @@
  - !type:ListingLimitedStockCondition
    stock: 6

+- type: listing
+  id: ERTUplinkBoxMagazineSMGTopMountedIncendiary
+  productEntity: BoxMagazineSMGTopMountedIncendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_wt550 }
+  cost:
+    Crystallite: 5
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 6
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
 - type: listing
  id: ERTUplinkMagazineBatteryLr30
  productEntity: MagazineBatteryLr30
@ -516,7 +650,7 @@

 - type: listing
  id: ERTUplinkBoxMagazineRifle
-  productEntity: BoxMagazineRifle
+  productEntity: BoxMagazineRifleKit
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
  cost:
    Crystallite: 5
@ -527,16 +661,48 @@
    stock: 6

 - type: listing
-  id: ERTUplinkBoxMagazineRifleNanotrasen
-  productEntity: BoxMagazineRifleNanotrasen
+  id: ERTUplinkBoxMagazineRifleIncendiary
+  productEntity: BoxMagazineRifleIncendiary
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
  cost:
-    Crystallite: 6
+    Crystallite: 5
  categories:
  - NTAmmo
  conditions:
  - !type:ListingLimitedStockCondition
    stock: 6
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
+- type: listing
+  id: ERTUplinkBoxMagazineRifleNanotrasen
+  productEntity: BoxMagazineRifleNanotrasen
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
+  cost:
+    Crystallite: 7
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 6
+
+- type: listing
+  id: ERTUplinkBoxMagazineRifleNanotrasenIncendiary
+  productEntity: BoxMagazineRifleNanotrasenIncendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
+  cost:
+    Crystallite: 7
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 6
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN

 - type: listing
  id: ERTUplinkBoxMagazineRifleM52
@ -549,6 +715,11 @@
  conditions:
  - !type:ListingLimitedStockCondition
    stock: 6
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon

 - type: listing
  id: ERTUplinkMagazineMagnum
@ -582,7 +753,7 @@
  productEntity: MagazineP90
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
  cost:
-    Crystallite: 5
+    Crystallite: 2
  categories:
    - NTAmmo
  conditions:
@ -592,15 +763,116 @@
      - ERTGamma
      - ERTEpsilon

+- type: listing
+  id: ERTUplinkMagazineP90HP
+  productEntity: MagazineP90HP
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
+  cost:
+    Crystallite: 2
+  categories:
+    - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkMagazineP90FMJ
+  productEntity: MagazineP90FMJ
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
+  cost:
+    Crystallite: 3
+  categories:
+    - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkMagazineP90Incendiary
+  productEntity: MagazineP90Incendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
+  cost:
+    Crystallite: 4
+  categories:
+    - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkMagazineP90AP
+  productEntity: MagazineP90AP
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
+  cost:
+    Crystallite: 5
+  categories:
+    - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkBoxMagazineLightRifle
+  productEntity: BoxMagazineLightRifle
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
+  cost:
+    Crystallite: 6
+  categories:
+    - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTRed
+      - CBURN
+
+- type: listing
+  id: ERTUplinkBoxMagazineLightRifleIncendiary
+  productEntity: BoxMagazineLightRifleIncendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_rifle }
+  cost:
+    Crystallite: 6
+  categories:
+    - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
 - type: listing
  id: ERTUplinkSMGAmmoKit
  productEntity: SMGAmmoKit
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg }
  cost:
-    Crystallite: 9
+    Crystallite: 8
+  categories:
+  - NTAmmo
+
+- type: listing
+  id: ERTUplinkSMGIncendiaryAmmoKit
+  productEntity: SMGIncendiaryAmmoKit
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg }
+  cost:
+    Crystallite: 8
  categories:
  - NTAmmo
  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN

 - type: listing
  id: ERTUplinkBoxMagazineShotgun
@ -619,13 +891,29 @@
  productEntity: BoxMagazineShotgunSlug
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_slug }
  cost:
-    Crystallite: 7
+    Crystallite: 9
  categories:
  - NTAmmo
  conditions:
  - !type:ListingLimitedStockCondition
    stock: 8

+- type: listing
+  id: ERTUplinkBoxMagazineShotgunIncendiary
+  productEntity: BoxMagazineShotgunIncendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_red }
+  cost:
+    Crystallite: 9
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 8
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - CBURN
+
 - type: listing
  id: ERTUplinkBoxMagazineShotgunBeanbag
  productEntity: BoxMagazineShotgunBeanbag
@ -643,7 +931,52 @@
  productEntity: MagazineMachineGunMG42
  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_mg342 }
  cost:
-    Crystallite: 6
+    Crystallite: 4
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkRifleHeavyMagazineFMJ
+  productEntity: RifleHeavyMagazineFMJ
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: 342fmj }
+  cost:
+    Crystallite: 8
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkMRifleHeavyMagazinIncendiary
+  productEntity: RifleHeavyMagazineIncendiary
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: 342incendiary }
+  cost:
+    Crystallite: 10
+  categories:
+  - NTAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - ERTGamma
+      - ERTEpsilon
+
+- type: listing
+  id: ERTUplinkRifleHeavyMagazineAP
+  productEntity: RifleHeavyMagazineAP
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: 342ap }
+  cost:
+    Crystallite: 16
  categories:
  - NTAmmo
  conditions:
@ -665,7 +998,7 @@
  - !type:ListingLimitedStockCondition
    stock: 8

-# NTexplosive:
+# region Взрывчатка:
 - type: listing
  id: ERTUplinkWeaponGrenadeLauncherSecurity
  productEntity: WeaponGrenadeLauncherSecurity
@ -831,6 +1164,18 @@
  - !type:ListingLimitedStockCondition
    stock: 2

+- type: listing
+  id: ERTUplinkSyringeAmbuzol
+  productEntity: SyringeAmbuzol
+  icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: ambuzol-syringe }
+  cost:
+    Crystallite: 9
+  categories:
+    - NTMedicine
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 4
+
 - type: listing
  id: ERTUplinkMedkitOxygenFilled
  productEntity: MedkitOxygenFilled
--- a/Resources/Prototypes/_Sunrise/Datasets/Names/military.yml
+++ b/Resources/Prototypes/_Sunrise/Datasets/Names/military.yml
@ -0,0 +1,55 @@
+- type: localizedDataset
+  id: NamesMilitaryFirstLeaderAmber
+  values:
+    prefix: names-military-leaderamber-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryFirstLeaderRed
+  values:
+    prefix: names-military-leaderred-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryFirstLeaderGamma
+  values:
+    prefix: names-military-leadergamma-first-dataset-
+    count: 3
+
+# Security Names
+- type: localizedDataset
+  id: NamesMilitaryFirstAmber
+  values:
+    prefix: names-military-trooperamber-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryFirstRed
+  values:
+    prefix: names-military-trooperred-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryFirstGamma
+  values:
+    prefix: names-military-troopergamma-first-dataset-
+    count: 3
+
+# Specialist Names
+- type: localizedDataset
+  id: NamesMilitaryFirstAmberSpecial
+  values:
+    prefix: names-military-specialistamber-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryFirstRedSpecial
+  values:
+    prefix: names-military-specialistred-first-dataset-
+    count: 3
+
+- type: localizedDataset
+  id: NamesMilitaryFirstGammaSpecial
+  values:
+    prefix: names-military-specialistgamma-first-dataset-
+    count: 3
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml
@ -27,17 +27,15 @@
      maxItemSize: Huge

 - type: entity
-  parent: ClothingBackpack
+  parent: ClothingBackpackDeathSquad
  id: ClothingDeathSquadronBackpack
  name: death squadron backpack
-  description: A spacious backpack using bluespace technology.
+  description: Holds the kit of CentComm's most feared agents.
  components:
    - type: Sprite
      sprite: _Sunrise/Clothing/Back/Backpacks/deathsquad-backpack.rsi
-    - type: Storage
-      grid:
-        - 0,0,6,3 # TODO: Change this
-      maxItemSize: Huge
+    - type: ExplosionResistance
+      damageCoefficient: 0.1

 - type: entity
  parent: ClothingBackpack
@ -169,4 +167,4 @@
  description: It's just a backpack, but it's beautiful.
  components:
  - type: Sprite
-    sprite: _Sunrise/Clothing/Back/Backpacks/yellowbackpack.rsi
+    sprite: _Sunrise/Clothing/Back/Backpacks/yellowbackpack.rsi
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
@ -217,3 +217,38 @@
  - type: Appearance
  - type: StaticPrice
    price: 1000
+
+- type: entity
+  parent: ClothingBeltMedical
+  id: ClothingBeltMedicalElite
+  name: elite medical belt
+  description: A sterile belt with many pockets for pills and other medications.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Belt/cmo.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Belt/cmo.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.01 #Sunrise-edit
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+      - 0,0,1,1
+      - 3,0,10,1
+  - type: StorageFill
+    contents:
+    - id: MedicatedSuture
+    - id: RegenerativeMesh
+    - id: Hypospray
+    - id: ChemistryBottleAmbuzol
+    - id: ChemistryBottleHolywater
+    - id: ChemistryBottleLeporazine
+    - id: BluespacePillPatchCanister
+    - id: PillCanisterPotassiumIodide
+    - id: MedipenCombatInjector
+    - id: StimpackNT
+    - id: PunctAutoInjector
+    - id: AntiPoisonMedipen
+    - id: CombatMedipen
+    - id: CombatMedipen
+    - id: CombatMedipen
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@ -4,3 +4,39 @@
  components:
  - type: BallisticAmmoProvider
    capacity: 20
+
+- type: entity
+  id: MagazineCannonBallMini
+  name: cannonball suitcase
+  description: A suitcase for neatly storing cannonballs for the pirate’s belt-fed cannon.
+  parent: BaseItem
+  components:
+  - type: Tag
+    tags:
+    - MagazineCannonBallMini
+  - type: BallisticAmmoProvider
+    mayTransfer: false
+    proto: CannonBallMini
+    whitelist:
+      tags:
+      - CannonBallMini
+    capacity: 50
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,1
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/cannonball_belt.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-5
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@ -1,6 +1,6 @@
 - type: entity
  id: MagazineP90
-  name: P90 magazine
+  name: P90 magazine (SP)
  parent: BaseItem
  components:
  - type: Tag
@ -31,6 +31,38 @@
    zeroVisible: false
  - type: Appearance

+- type: entity
+  id: MagazineP90HP
+  name: P90 magazine (HP)
+  parent: MagazineP90
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolHP
+
+- type: entity
+  id: MagazineP90FMJ
+  name: P90 magazine (FMJ)
+  parent: MagazineP90
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolFMJ
+
+- type: entity
+  id: MagazineP90Incendiary
+  name: P90 magazine (incendiary)
+  parent: MagazineP90
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolIncendiary
+
+- type: entity
+  id: MagazineP90AP
+  name: P90 magazine (AP)
+  parent: MagazineP90
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolAP
+
 - type: entity
  id: MagazineMP7
  name: MP7 magazine
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@ -125,6 +125,42 @@
    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
    state: fuzeball

+- type: entity
+  id: CannonBallMini
+  name: cannonball
+  suffix: Pirate
+  parent: BaseCannonBall
+  components:
+  - type: Item
+    size: Tiny
+  - type: CartridgeAmmo
+    proto: PelletGrapeshot
+    deleteOnSpawn: true
+  - type: Sprite
+    scale: 0.6,0.6
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    state: ball
+  - type: Tag
+    tags:
+    - CannonBallMini
+
+- type: entity
+  id: CannonBallGrapeshotMini
+  name: grapeshot
+  suffix: Pirate
+  parent: BaseCartridge
+  components:
+  - type: HitScanCartridgeAmmo
+    hitscan: PelletShotgunImprovisedSpreadTraceLarge
+    deleteOnSpawn: true
+  - type: Sprite
+    scale: 0.75,0.75
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    state: grapeshot
+  - type: Tag
+    tags:
+    - CannonBallMini
+
 - type: entity
  id: GrenadeBlastTimer
  name: timer blast grenade
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@ -61,6 +61,13 @@
      weapon_slot:
      - WeaponMinigunMG100

+- type: entity
+  id: PowerpackMinigunMG100Incendiary
+  parent: PowerpackMinigunMG100
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleIncendiary
+
 - type: entity
  id: BasePowerpackMG100
  parent: BaseItem
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@ -170,10 +170,10 @@
    minAngle: 0
    maxAngle: 0
  - type: Gun
-    minAngle: 5
-    maxAngle: 140
-    angleIncrease: 4.5
-    angleDecay: 70
+    minAngle: 6
+    maxAngle: 90
+    angleIncrease: 2
+    angleDecay: 60
    fireRate: 12
    soundGunshot:
      path: /Audio/_Sunrise/Weapons/Guns/LMGs/shot.ogg
@ -183,7 +183,7 @@
    slots:
      gun_magazine:
        name: Magazine
-        startingItem: MagazineMachineGunMG42
+        startingItem: RifleHeavyMagazineFMJ
        insertSound: /Audio/_Sunrise/Weapons/Guns/LMGs/reload.ogg
        ejectSound: /Audio/_Sunrise/Weapons/Guns/LMGs/unload.ogg
        priority: 2
@ -295,3 +295,86 @@
  - type: GunRequiresWield
  - type: StaticPrice
    price: 10000
+
+- type: entity
+  name: pirate cannon
+  parent: BaseWeaponLightMachineGun
+  id: WeaponLightMachineGunPirateCannon
+  description: Kaboom!
+  components:
+    - type: Sprite
+      sprite: _Sunrise/Objects/Weapons/Guns/LMGs/piratecannon.rsi
+      layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-3
+        map: ["enum.GunVisualLayers.Mag"]
+        type: ContainerContainer
+    - type: Clothing
+      sprite: _Sunrise/Objects/Weapons/Guns/LMGs/piratecannon.rsi
+    - type: Item
+      size: Huge
+      shape:
+      - 0,0,4,3
+      sprite: _Sunrise/Objects/Weapons/Guns/LMGs/piratecannon_inhands_64x.rsi
+      storedSprite:
+        state: storage
+        sprite: _Sunrise/Objects/Weapons/Guns/LMGs/piratecannon_storage_64x.rsi
+    - type: Gun
+      fireRate: 6.5
+      soundGunshot:
+        path: /Audio/Weapons/Guns/Gunshots/mateba.ogg
+        params:
+          volume: -1
+          pitch: 1.2
+      projectileSpeed: 20
+      bigTrigger: true
+      selectedMode: FullAuto
+      availableModes:
+        - FullAuto
+    - type: GunRequiresWield
+    - type: ChamberMagazineAmmoProvider
+      soundRack:
+        path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+        params:
+          volume: -10
+          pitch: 0.8
+      soundAutoEject:
+        path: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg
+      autoEject: true
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazineCannonBallMini
+          insertSound: /Audio/_Sunrise/Weapons/Guns/LMGs/reload.ogg
+          ejectSound: /Audio/_Sunrise/Weapons/Guns/LMGs/unload.ogg
+          priority: 2
+          whitelist:
+            tags:
+            - MagazineCannonBallMini
+        gun_chamber:
+          name: Chamber
+          startingItem: CannonBallMini
+          priority: 1
+          whitelist:
+            tags:
+            - CannonBallMini
+    - type: SpeedModifiedOnWield
+      walkModifier: 0.75
+      sprintModifier: 0.75
+    - type: Appearance
+    - type: MagazineVisuals
+      magState: mag
+      steps: 6
+      zeroVisible: true
+    - type: StaticPrice
+      price: 4000
+    - type: KnockbackByUserTag
+      doestContain:
+        Resomi:
+          knockback: 2
+          staminaMultiplier: 15
+        Felinid:
+          knockback: 1 #half of what resomi take
+          staminaMultiplier: 15
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@ -401,126 +401,6 @@
    maxOffset: 5
    pvsIncrease: 0.5

- type: entity
-  name: M-28
-  parent: BaseWeaponRifleSunrise
-  id: WeaponRifleM28
-  components:
-  - type: Sprite
-    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/m28/big.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-0
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Clothing
-    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/m28/tiny.rsi
-  - type: Item
-    size: Huge
-    shape:
-    - 0,0,3,2
-    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/m28/tiny.rsi
-  - type: Gun
-    minAngle: 1.75
-    maxAngle: 18
-    angleIncrease: 0.85
-    angleDecay: 8
-    fireRate: 4.5
-    soundGunshot:
-      path: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28.ogg
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineRifleHeavySP
-        insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28_reload.ogg
-        ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28_unload.ogg
-        priority: 2
-        whitelist:
-          tags:
-            - MagazineHeavyRifle
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeRifleHeavySP
-        priority: 1
-        whitelist:
-          tags:
-            - CartridgeHeavyRifle
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot
-      gun_chamber: !type:ContainerSlot
-  - type: MagazineVisuals
-    magState: mag
-    steps: 1
-    zeroVisible: true
-  - type: Appearance
-  - type: Wieldable
-  - type: UseDelay
-    delay: 0.75
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 4
-    pvsIncrease: 0.4
-
- type: entity
-  name: AR-18
-  parent: BaseWeaponRifleSunrise
-  id: WeaponRifleAR18
-  components:
-  - type: Sprite
-    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/ar18/big.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-0
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: Clothing
-    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/ar18/tiny.rsi
-  - type: Item
-    size: Huge
-    shape:
-    - 0,0,2,2
-    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/ar18/tiny.rsi
-  - type: Gun
-    minAngle: 1.8
-    maxAngle: 24
-    angleIncrease: 1.25
-    angleDecay: 8
-    fireRate: 4.5
-    soundGunshot:
-      path: /Audio/_Sunrise/Weapons/Guns/Rifles/ar18/ar18_shot.ogg
-  - type: ItemSlots
-    slots:
-      gun_magazine:
-        name: Magazine
-        startingItem: MagazineRifleHeavySP
-        insertSound: /Audio/_Sunrise/Weapons/Guns/Snipers/Different/reload.ogg
-        ejectSound: /Audio/_Sunrise/Weapons/Guns/Snipers/Different/unload.ogg
-        priority: 2
-        whitelist:
-          tags:
-          - MagazineHeavyRifle
-      gun_chamber:
-        name: Chamber
-        startingItem: CartridgeRifleHeavySP
-        priority: 1
-        whitelist:
-          tags:
-          - CartridgeHeavyRifle
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot
-      gun_chamber: !type:ContainerSlot
-  - type: MagazineVisuals
-    magState: mag
-    steps: 1
-    zeroVisible: true
-  - type: Appearance
-  - type: Wieldable
-  - type: UseDelay
-    delay: 0.5
-
 - type: entity
  name: M16A4
  parent: BaseWeaponRifleSunrise
@ -773,3 +653,264 @@
      path: /Audio/_Sunrise/Weapons/Guns/Rifles/ash12/bolt-open.ogg
    soundBoltClosed:
      path: /Audio/_Sunrise/Weapons/Guns/Rifles/ash12/bolt-closed.ogg
+
+- type: entity
+  name: SKM-24
+  parent: [BaseWeaponRifle, BaseMajorContraband]
+  id: WeaponRifleSKM24
+  description: Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Base/big.rsi
+    layers:
+    - state: icon
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Base/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Base/tiny.rsi
+  - type: Gun
+    fireRate: 4.45
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_shot.ogg
+  - type: ChamberMagazineAmmoProvider
+    soundRack:
+      path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifleFMJ
+        insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_reload.ogg
+        ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_unload.ogg
+        priority: 2
+        whitelist:
+          tags:
+          - MagazineLightRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeLightRifleSP
+        priority: 1
+        whitelist:
+          tags:
+          - CartridgeLightRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 7
+    zeroVisible: true
+  - type: Appearance
+
+- type: entity
+  parent: WeaponRifleSKM24
+  id: WeaponRifleSKM24White
+  description: Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained. Saved is earned. Wood replaced with cheap plastic.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/White/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/White/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/White/tiny.rsi
+
+- type: entity
+  parent: WeaponRifleSKM24
+  id: WeaponRifleSKM24Green
+  description: Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained. The favorite color of low-income mercenaries and ordinary USSP members.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Green/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Green/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Green/tiny.rsi
+
+- type: entity
+  parent: WeaponRifleSKM24
+  id: WeaponRifleSKM24Scrap
+  description: Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained. This specimen has seen some rough stuff...and not just once.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Scrap/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Scrap/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Scrap/tiny.rsi
+  - type: WeaponDismantleOnShoot
+    dismantleDistance: 4
+    dismantleChance: 0.006 # Примерно 150-200 патронов
+    selfDamage:
+      types:
+        Blunt: 5
+        Heat: 5
+    items:
+      - id: ModularBarrel
+        launchAngle: 0
+        prob: 1
+      - id: ModularReceiverAuto
+        launchAngle: 90
+        prob: 0.75
+      - id: RifleStock
+        launchAngle: 180
+        prob: 0.80
+      - id: MagazineLightRifleEmpty
+        launchAngle: -90
+        prob: 1
+      - id: CartridgeLightRifleFMJ
+        launchAngle: 45
+        prob: 1
+      - id: CartridgeLightRifleFMJ
+        launchAngle: -45
+        prob: 0.80
+      - id: CartridgeLightRifleFMJ
+        launchAngle: 75
+        prob: 0.75
+      - id: CartridgeLightRifleFMJ
+        launchAngle: -75
+        prob: 0.5
+      - id: CartridgeLightRifleFMJ
+        launchAngle: 120
+        prob: 0.3
+      - id: CartridgeLightRifleFMJ
+        launchAngle: 120
+        prob: 0.25
+      - id: CartridgeLightRifleFMJ
+        launchAngle: -120
+        prob: 0.2
+      - id: CartridgeLightRifleFMJ
+        launchAngle: -120
+        prob: 0.15
+
+- type: entity
+  parent: WeaponRifleSKM24
+  id: WeaponRifleSKM24Syndi
+  description: Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained. Spare option if you lost all your telecrystals at the casino.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Syndicate/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Syndicate/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Syndicate/tiny.rsi
+
+- type: entity
+  parent: WeaponRifleSKM24
+  id: WeaponRifleSKM24Nano
+  description: Cheap and reliable. Enough firepower, little accuracy. Easy to repair, hard to control during sustained. Money doesn't smell.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Nano/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Nano/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm24/Nano/tiny.rsi
+
+- type: entity
+  name: SKM-28
+  parent: [BaseWeaponRifle, BaseMajorContraband]
+  id: WeaponRifleSKM28
+  description: A marksman conversion of the standard SKM-24. Features an extended heavy barrel, reworked internals, and a mounted optical sight. Chambered in .308.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Base/big.rsi
+    layers:
+    - state: icon
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Base/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Base/tiny.rsi
+  - type: GunWieldBonus
+    minAngle: -28
+    maxAngle: -50
+  - type: Gun
+    minAngle: 30
+    maxAngle: 65
+    angleIncrease: 1.5
+    angleDecay: 15
+    fireRate: 4
+    shotsPerBurst: 3
+    selectedMode: Burst
+    availableModes:
+    - Burst
+    - SemiAuto
+    burstFireRate: 11
+    soundGunshot:
+      path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm28/skm28_shot.ogg
+      params:
+        pitch: 0.8
+  - type: ChamberMagazineAmmoProvider
+    soundRack:
+      path: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_cocked.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifleHeavyFMJ
+        insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/skm24/skm_reload.ogg
+        ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28_unload.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineHeavyRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifleHeavySP
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeHeavyRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: true
+  - type: Appearance
+  - type: Wieldable
+  - type: UseDelay
+    delay: 0.75
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 7
+    pvsIncrease: 0.7
+  - type: SpeedModifiedOnWield
+    walkModifier: 0.9
+    sprintModifier: 0.9
+
+- type: entity
+  parent: WeaponRifleSKM28
+  id: WeaponRifleSKM28Syndi
+  description: A marksman conversion of the standard SKM-24. Features an extended heavy barrel, reworked internals, and a mounted optical sight. Chambered in .308. Good choice Nukie.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Syndicate/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Syndicate/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Syndicate/tiny.rsi
+
+- type: entity
+  parent: WeaponRifleSKM28
+  id: WeaponRifleSKM28Nano
+  description: A marksman conversion of the standard SKM-24. Features an extended heavy barrel, reworked internals, and a mounted optical sight. Chambered in .308. Money doesn't smell.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Nano/big.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Nano/tiny.rsi
+  - type: Item
+    sprite: _Sunrise/Objects/Weapons/Guns/Rifles/skm28/Nano/tiny.rsi
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml
@ -10,7 +10,7 @@
      state: ertleader
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirstLeader
+      - NamesMilitaryFirstLeaderAmber
      - NamesMilitaryLast
      nameFormat: name-format-ert
    - type: RandomHumanoidSpawner
@ -33,6 +33,7 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
  parent: EventHumanoidCentcommSunrise
  randomizeName: false
  components:
@ -47,7 +48,7 @@
      prototypes: [ ERTLeaderGearAmber ]
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirstLeader
+      - NamesMilitaryFirstLeaderAmber
      - NamesMilitaryLast
      nameFormat: name-format-ert

@ -62,6 +63,11 @@
      state: ertleadereva
    - type: RandomHumanoidSpawner
      settings: ERTLeaderRed
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstLeaderRed
+      - NamesMilitaryLast
+      nameFormat: name-format-ert

 - type: randomHumanoidSettings
  id: ERTLeaderRed
@ -76,6 +82,11 @@
      job: ERTLeader
    - type: Loadout
      prototypes: [ ERTLeaderGearRed ]
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstLeaderRed
+      - NamesMilitaryLast
+      nameFormat: name-format-ert

 - type: entity
  id: RandomHumanoidSpawnerERTLeaderGamma
@ -84,6 +95,11 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ERTLeaderGamma
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstLeaderGamma
+      - NamesMilitaryLast
+      nameFormat: name-format-ert

 - type: randomHumanoidSettings
  id: ERTLeaderGamma
@ -98,6 +114,11 @@
      job: ERTLeader
    - type: Loadout
      prototypes: [ ERTLeaderGearGamma ]
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstLeaderGamma
+      - NamesMilitaryLast
+      nameFormat: name-format-ert
 ## ERT Security

 - type: entity
@ -111,7 +132,7 @@
      state: ertsecurity
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmber
      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTSecurityAmber
@ -129,7 +150,7 @@
      job: ERTSecurity
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmber
      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTSecurityGearAmber ]
@ -155,6 +176,10 @@
      job: ERTSecurity
    - type: Loadout
      prototypes: [ ERTSecurityGearRed ]
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstRed
+      - NamesMilitaryLast

 - type: entity
  id: RandomHumanoidSpawnerERTSecurityGamma
@ -163,6 +188,10 @@
  components:
    - type: RandomHumanoidSpawner
      settings: ERTSecurityGamma
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGamma
+      - NamesMilitaryLast

 - type: randomHumanoidSettings
  id: ERTSecurityGamma
@ -177,7 +206,10 @@
      job: ERTSecurity
    - type: Loadout
      prototypes: [ ERTSecurityGearGamma ]
-
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGamma
+      - NamesMilitaryLast
 ## ERT Chaplain

 - type: entity
@ -191,7 +223,7 @@
      state: chaplain #needs an ERT variant once a good suit it made.
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTChaplainAmber
@ -210,7 +242,7 @@
      job: ERTChaplain
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTChaplainGearAmber ]
@ -228,7 +260,7 @@
      state: ertjanitor
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTJanitorAmber
@ -246,7 +278,7 @@
      job: ERTJanitor
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTJanitorGearAmber ]
@ -262,6 +294,10 @@
      state: ertjanitoreva
    - type: RandomHumanoidSpawner
      settings: ERTJanitorGamma
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGammaSpecial
+      - NamesMilitaryLast

 - type: randomHumanoidSettings
  id: ERTJanitorGamma
@ -276,7 +312,10 @@
      job: ERTJanitor
    - type: Loadout
      prototypes: [ ERTJanitorGearGamma ]
-
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGammaSpecial
+      - NamesMilitaryLast
 ## ERT Engineer

 - type: entity
@ -290,7 +329,7 @@
      state: ertengineer
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTEngineerAmber
@ -308,7 +347,7 @@
      job: ERTEngineer
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTEngineerGearAmber ]
@ -324,6 +363,10 @@
      state: ertengineereva
    - type: RandomHumanoidSpawner
      settings: ERTEngineerGamma
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGammaSpecial
+      - NamesMilitaryLast

 - type: randomHumanoidSettings
  id: ERTEngineerGamma
@ -338,7 +381,10 @@
      job: ERTEngineer
    - type: Loadout
      prototypes: [ ERTEngineerGearGamma ]
-
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGammaSpecial
+      - NamesMilitaryLast
 ## ERT Medic

 - type: entity
@ -352,7 +398,7 @@
      state: ertmedical
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: RandomHumanoidSpawner
      settings: ERTMedicalAmber
@ -370,7 +416,7 @@
      job: ERTMedical
    - type: RandomMetadata
      nameSegments:
-      - NamesMilitaryFirst
+      - NamesMilitaryFirstAmberSpecial
      - NamesMilitaryLast
    - type: Loadout
      prototypes: [ ERTMedicalGearAmber ]
@ -386,6 +432,10 @@
      state: ertmedicaleva
    - type: RandomHumanoidSpawner
      settings: ERTMedicalGamma
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGammaSpecial
+      - NamesMilitaryLast

 - type: randomHumanoidSettings
  id: ERTMedicalGamma
@ -400,7 +450,10 @@
      job: ERTMedical
    - type: Loadout
      prototypes: [ ERTMedicalGearGamma ]
-
+    - type: RandomMetadata
+      nameSegments:
+      - NamesMilitaryFirstGammaSpecial
+      - NamesMilitaryLast
 ## CBURN EVA VARIANT

 - type: entity
@ -432,6 +485,8 @@
  - Dwarf
  - HumanoidXeno
  - Predator
+  - Resomi
+  - Resomi
  components:
    - type: Loadout
      prototypes: [CBURNGearEVA]
--- a/Resources/Prototypes/_Sunrise/tags.yml
+++ b/Resources/Prototypes/_Sunrise/tags.yml
@ -102,6 +102,9 @@
 - type: Tag
  id: ImprovisedAmmoBox

+- type: Tag
+  id: CannonBallMini
+
 # Weapons
 - type: Tag
  id: WrappedWeapon
@ -161,6 +164,9 @@
 # - type: Tag
 #   id: SpeedLoaderRifle

+- type: Tag
+  id: MagazineCannonBallMini
+
 - type: Tag
  id: MagazinePistolDPSubMachineGun

@ -279,6 +285,9 @@
 - type: Tag
  id: Phazon

+- type: Tag
+  id: PaddyMech
+
 - type: Tag
  id: ClarkeCentralControlModule

--- a/Resources/Textures/_Starlight/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png
+++ b/Resources/Textures/_Starlight/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/ap.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/ap.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/base.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/base.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/fmj.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/fmj.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/hp.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/hp.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/incendiary.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/incendiary.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-left-mag.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-left-mag.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-left-stripe.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-left-stripe.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-right-mag.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-right-mag.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-right-stripe.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/inhand-right-stripe.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-1.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-1.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-2.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-2.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-3.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-3.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-4.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-4.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-5.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-5.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-6.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-6.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-7.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/mag-7.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/sp.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/sp.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/uranium.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_heavy.rsi/uranium.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/base.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/base.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/bolt-open.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/bolt-open.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/equipped-BACKPACK.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/equipped-BACKPACK.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/equipped-SUITSTORAGE.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/equipped-SUITSTORAGE.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/icon.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/icon.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/inhand-left.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/inhand-left.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/inhand-right.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/inhand-right.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-0.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-0.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-1.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-1.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-2.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-2.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-3.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/mag-3.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/meta.json
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/meta.json
@ -0,0 +1,56 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Almost entirely Made by Killer Tamashi & Salem.uwu (Discord), sling part of backpack sling made by Peptide (I thought it was neat so I kept the design) Change color by KaiserMaus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/wielded-inhand-left.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/wielded-inhand-left.png
--- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/wielded-inhand-right.png
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/LMGs/M492_CBURN.rsi/wielded-inhand-right.png
--- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/342ap.png
+++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/342ap.png
--- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/342fmj.png
+++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/342fmj.png
--- a/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/342incendiary.png
+++ b/Resources/Textures/_Sunrise/Interface/Misc/nt_icons.rsi/342incendiary.png
--- a/Show more
+++ b/Show more