Refactor ammo craft and Ammo, Uplink tweaks (#3214)

2025-09-26 22:51:02 +01:00 · 2025-09-26 22:51:02 +01:00 · ba64320dac
commit ba64320dac
parent c286124224
95 changed files with 1954 additions and 1268 deletions
--- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@ -1,17 +1,17 @@
 ent-LightRifleHeavyBase = { ent-BaseItem }
    .desc = { ent-BaseItem.desc }
-ent-LightRifleHeavyMagazineEmpty = Коробка магазина (7.62 любой)
+ent-LightRifleMagazineEmpty = Коробка магазина (7.62 любой)
    .suffix = Пустой
    .desc = { ent-LightRifleHeavyBase.desc }
-ent-LightRifleHeavyMagazineSP = Коробка магазина (7.62 SP)
+ent-LightRifleMagazineSP = Коробка магазина (7.62 SP)
    .desc = { ent-LightRifleHeavyBase.desc }
-ent-LightRifleHeavyMagazineHP = Коробка магазина (7.62 HP)
+ent-LightRifleMagazineHP = Коробка магазина (7.62 HP)
    .desc = { ent-LightRifleHeavyBase.desc }
-ent-LightRifleHeavyMagazineFMJ = Коробка магазина (7.62 FMJ)
+ent-LightRifleMagazineFMJ = Коробка магазина (7.62 FMJ)
    .desc = { ent-LightRifleHeavyBase.desc }
-ent-LightRifleHeavyMagazineIncendiary = Коробка магазина (7.62 зажигательный)
+ent-LightRifleMagazineIncendiary = Коробка магазина (7.62 зажигательный)
    .desc = { ent-LightRifleHeavyBase.desc }
-ent-LightRifleHeavyMagazineUranium = Коробка магазина (7.62 урановый)
+ent-LightRifleMagazineUranium = Коробка магазина (7.62 урановый)
+    .desc = { ent-LightRifleHeavyBase.desc }
+ent-LightRifleMagazineAP = Коробка магазина (7.62 AP)
    .desc = { ent-LightRifleHeavyBase.desc }
-ent-LightRifleHeavyMagazineAP = Коробка магазина (7.62 AP)
-    .desc = { ent-LightRifleHeavyBase.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
@ -1,7 +1,5 @@
-ent-ClothingBackpackDuffelSyndicateFilledBauer = Набор Bauer-127
-    .desc = Легендарная винтовка Bauer-127 с двумя магазинами в комплекте.
-ent-ClothingBackpackDuffelSyndicateFilledDragunov = комплект Драгунова
-    .desc = Культовая винтовка Драгунова с двумя полными магазинами в комплекте.
+ent-ClothingBackpackDuffelSyndicateFilledBauer = Набор "Снайпер"
+    .desc = Знаковая тяжёлая антиматериальная снайперская винтовка вместе с тремя запасными магазинами, ящиком крупнокалиберных патронов и тепловизионными очками.
 ent-ClothingBackpackDuffelWeaponSubMachineGunMP5Filled = Набор MP5
    .desc = Mp5 c 2мя магазинами.
 ent-ClothingBackpackDuffelWeaponSubMachineGunMP7Filled = Набор MP7
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl
@ -3,6 +3,6 @@ ent-CrateSecurityWebbing = ящик с РПС охраны
 ent-CrateSecurityGlovesCombat = ящик с боевыми перчатками
    .desc = Ящик, содержащий трое боевых перчаток. Чтобы открыть необходим уровень доступа Служба безопасности.
 ent-CrateSecuritySWAT = ящик с бронёй SWAT
-    .desc = Ящик, Содержит комплект Спецназа. Две брони SWAT, два шлема спецназа, два противогаза спецназа и боевые ботинки спецназа. Чтобы открыть необходим уровень доступа Службы Безопастности.
+    .desc = Ящик, Содержит комплект Спецназа. Тяжёлая броня SWAT вместе с прочным шлемом спецназа, противогазом спецназа и боевыми ботинками спецназа. Чтобы открыть необходим уровень доступа Службы Безопастности.
 ent-CrateSecurityArmorReflective = ящик с отражающей бронёй
    .desc = Ящик, Содержит комплект отражающей брони. Две отражающей брони. Чтобы открыть необходим уровень доступа Службы Безопастности.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/ussp.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/ussp.ftl
@ -8,3 +8,5 @@ ent-CrateShelfMosin = старый деревянный ящик
    .desc = Большой деревянный ящик с выцветшей краской и эмблемой СССП. Внутри крышки едва различима старая инструкция: зачем нужен штык и за какое место держать винтовку. Судя по пыли, он ждёт уже не одну сотню лет. Предупреждение: Инструкции могут быть устаревшими на несколько веков.
 ent-WrappedMosin = законсервированный Кардашев-Мосин
    .desc = Древняя винтовка Кардашев-Мосина, герметично упакована в бумагу и обильно смазана космической смазкой. Забыта в ожидании войны, которая так и не началась. Патроны не прилагаются, но у вас есть штык!
+ent-CrateAmmunitionSmallDragunov = старый деревянный ящик
+    .desc = Старая Марксманская винтовка, известная своей меткостью и стрельбой на дальние дистанции. Комплект из пяти магазинов с различными типами боеприпасов. Использует винтовочные патроны калибра 7.62x54R.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/armor.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/armor.ftl
@ -3,7 +3,7 @@ ent-ClothingOuterArmorCentcomCarapace = флотский панцирь
 ent-ClothingOuterArmorBlueShield = бронежилет офицера «Синий щит»
    .desc = Синий и прочный.
 ent-ClothingOuterArmorSWAT = Броня SWAT
-    .desc = Удачная попытка NT создать универсальную и недорогую защиту. Предоставляет отличную защиту от множества видов повреждений, но так-же крайне сильно замедляет. Крадковременно защищает от космоса.
+    .desc = Неудачная попытка NT создать универсальную защиту. Предоставляет отличную защиту от множества видов повреждений, но так-же крайне сильно замедляет. Вместе с герметичным шлемом может крадковременно защищать от космоса.
 ent-ClothingOuterArmorAmberCom = Броня Лидера ОБР "Амбер"
    .desc = Универсальная броня NanoTrasen для членов ОБР. Предоставляет отличную защиту от множества видов повреждений, имеет встроенный фонарик. Крадковременно защищает от космоса. Вариант расцветки Лидера ОБР.
 ent-ClothingOuterArmorAmberSec = Броня Офицера ОБР "Амбер"
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@ -12,7 +12,7 @@ ent-MagazineMachineGunMG42 = Короб MG-342
    .desc = Малый короб для MG-342 с короткой лентой винтовочных 7,62х51 NT.
 ent-MagazineLightMachineGunMG60 = Короб ПКМ
    .desc = Короб для ПКМ с длинной  лентой 7,62х54ммR.
-ent-MagazineVP70 = магазин пистолета VP-78
+ent-MagazineVP78 = магазин пистолета VP-78
    .desc = Использует патроны калибра .40.
 ent-MagazineHIBrowning = магазин HIBrowning-88 М4
    .desc = Использует патроны калибра .35 мм
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl
@ -67,3 +67,6 @@ ent-WeaponShotgunMinotaurBiocode = { ent-WeaponShotgunMinotaur }
 ent-WeaponMiniEnergyCrossbowBiocode = { ent-WeaponMiniEnergyCrossbow }
    .suffix = БИОКОД
    .desc = { ent-WeaponMiniEnergyCrossbow.desc }
+ent-WeaponSubMachineGunC40rBiocode  = { ent-WeaponSubMachineGunC40r }
+    .desc = { ent-WeaponSubMachineGunC40r.desc }
+    .suffix = БИОКОД
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl
@ -22,3 +22,5 @@ ent-WeaponSubMachineGunDrozdMk2 = Дрозд Мк2
    .desc = Улучшенный вариант пистолет-пулемёта Drozd, разработанный Small Arms Division корпорации NanoTrasen. Обладает исключительно высокой скорострельностью в режиме очереди, что делает его эффективным для удержания оборонительных позиций или ведения боя на средней и дальней дистанции. Оснащён автоматическим сбросом магазина для ускоренной перезарядки. Использует магазины .35 ПП.
 ent-WeaponSubMachineGunDrozdMk2Empty = Дрозд Мк2
    .desc = { ent-WeaponSubMachineGunDrozdMk2.desc }
+ent-WeaponSubMachineGunC40r = C-40r
+    .desc = Ранняя модель классического буллпап-пистолет-пулемета на 20 патронов производства "Waffle Corp" под патроны .40 высокой останавливающей силы. Ранее широко использовался Gorlex Marauders. Эффективен на коротких и средних дистанциях, стреляет очередями по 2 выстрела или полностью автоматическим режимом.
--- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/backpacks/duffelbag.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/backpacks/duffelbag.ftl
@ -6,6 +6,8 @@ ent-ClothingBackpackDuffelSyndicateFilledShotgun = набор "Бульдог"
    .desc = Простой и надежный: Содержит популярный дробовик Бульдог, барабан пуль и 3 барабана дроби.
 ent-ClothingBackpackDuffelSyndicateFilledSMG = набор "C-20r"
    .desc = Старый добрый: Классический пистолет-пулемет C-20r в комплекте с тремя магазинами.
+ent-ClothingBackpackDuffelSyndicateFilledSMG40 = набор "C-40r"
+    .desc = Более старый: Классический пистолет-пулемет C-40r в комплекте с тремя магазинами.
 ent-ClothingBackpackDuffelSyndicateFilledRifle = набор Estoc DMR
    .desc = Для снайперской стрельбы на средних дистанциях. В комплекте три магазина.
 ent-ClothingBackpackDuffelSyndicateFilledRevolver = набор "Питон"
@ -47,7 +49,11 @@ ent-ClothingBackpackDuffelAcolyteBundle = набор брони послушни
 ent-ClothingBackpackDuffelSyndicateFilledStarterKit = базовый набор оперативника
    .desc = Содержит оружие, медикаменты, средства для взлома, запасные боеприпасы и несколько простых инструментов.
 ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncher = набор "China-Lake"
-    .desc = Старый гранатомет China-Lake, снабженный 11 гранатами различной поражающей способности.
+    .desc = Старый гранатомет China-Lake, снабженный 9 гранатами различной поражающей способности.
+ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncherM79 = набор "M79"
+    .desc = Старый гранатомет M79, снабженный 9 гранатами различной поражающей способности.
+ent-ClothingBackpackDuffelSyndicateFilledGrenadeLauncherGL70 = набор "GL70"
+    .desc = Гранатомет GL70, снабженный 9 гранатами различной поражающей способности.
 ent-ClothingBackpackDuffelSyndicateAmmoIncendiaryFilled = набор боеприпасов зажигательные
    .desc = Перезаряжаю! Содержит коробку зажигательных магазинов для C-20r, коробку барабанов зажигательных для Бульдога и коробку зажигательных патронов для L6 SAW. а так же аптечка против ожогов.
 ent-ClothingBackpackDuffelSyndicateAmmoUraniumFilled = набор боеприпасов урановые
@ -63,4 +69,4 @@ ent-ClothingBackpackDuffelSyndicateCostumeCentcom = вещмешок с кост
 ent-ClothingBackpackDuffelSyndicateOperative = вещмешок оперативника
    .desc = { ent-ClothingBackpackDuffelSyndicateBundle.desc }
 ent-ClothingBackpackDuffelSyndicateOperativeMedic = вещмешок оперативника-медика
-    .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения.
+    .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения.
--- 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
@ -19,8 +19,10 @@ ent-MagazineRiflePractice = магазин (5,56мм учебные)
    .desc = { ent-BaseMagazineRifle.desc }
 ent-MagazineRifleUranium = магазин (5,56мм урановые)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineLightRifleBoxSP = короб магазина L6 SAW (5,56мм SP)
+ent-MagazineRifleBoxSP = короб магазина L6 SAW (5,56мм SP)
    .desc = Коробка, содержащая ленту из 150 патронов калибра .20, используемая легкими пулеметами, такими как L6. Предназначена для хранения кинетических боеприпасов общего назначения.
+ent-MagazineRifleBoxFMJ = короб магазина L6 SAW (5,56мм FMJ)
+    .desc = Коробка, содержащая ленту из 150 патронов калибра .20, используемая легкими пулеметами, такими как L6.
 ent-MagazineLightRifleBoxIncendiary = короб патронов L6 SAW (5,56мм зажигательные)
    .desc = { ent-BaseMagazineLightRifle.desc }
 ent-MagazineLightRifleBoxUranium = короб патронов L6 SAW (5,56мм урановые)
--- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
@ -33,8 +33,10 @@ uplink-magazine-dragunov-desc = Магазин для Драгунова. Сод
 uplink-magazine-dragunov-extended-desc = Магазин для Драгунова. Содержит 20 патронов калибра 7,62х54R.
 uplink-magazine-bulldog-uraniumslug-desc = Барабанный магазин на 8 урановых пулевых патронов. Совместим с "Бульдогом".
 uplink-magazine-bulldog-uranium-desc = Барабанный магазин на 8 патронов урановой дроби. Совместим с "Бульдогом".
-uplink-pistol-magnum-magazine-name = Магазин для Deagle
+uplink-pistol-magnum-magazine-name = Магазин (.45 магнум SP)
 uplink-pistol-magnum-magazine-desc = 7-зарядный однорядный магазин для пистолета. Содержит патроны SP. Совместим с "Диглом".
+uplink-pistol-magnum-magazine-ap-name = Магазин (.45 магнум бронебойные)
+uplink-pistol-magnum-magazine-ap-desc = 7-зарядный однорядный магазин для пистолета. Содержит бронебойные патроны. Совместим с "Диглом".

 ## Misc

@ -79,9 +81,7 @@ uplink-clothing-backpack-syndie-siar52-name = Набор SIAR-52
 uplink-clothing-backpack-syndie-siar52-desc = Включает в себя SIAR-52 что оборудован интегрированым глушителем. и два магазина безгильзовых патрон.
 uplink-weapon-syndie-laser-minigun-name = UVL-21 «Виверна»
 uplink-weapon-syndie-laser-gun-name = S-13 «Чёрная мамба»
-uplink-weapon-bauer-127-name = винтовка Bauer SR-127
-uplink-weapon-dragunov-name = Набор Драгунов
-uplink-weapon-dragunov-desc = Культовая снайперская винтовка и два магазина на 10 патронов, известная своей меткостью и стрельбой на дальние дистанции. Использует винтовочные патроны калибра 7.62x54R.
+uplink-weapon-ussp-dmr-name = Набор Драгунов
 uplink-deagle-name = пистолет «Desert Eagle»
 uplink-deagle-desc = Cерьёзный аргумент в споре. Выгравировано: Мир благодаря превосходящей огневой мощи".
 uplink-mini-energy-crossbow-name = Мини энерго-арбалет
--- a/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl
@ -191,14 +191,16 @@ uplink-sniper-bundle-name = Набор снайпера
 uplink-sniper-bundle-desc = Неприметный чемодан, в котором находятся Христов, 10 запасных патронов и удобная маскировка.
 uplink-c20r-bundle-name = Набор "C-20r"
 uplink-c20r-bundle-desc = Старый добрый: Классический пистолет-пулемёт C-20r в комплекте с тремя магазинами.
+uplink-c40r-bundle-name = Набор "C-40r"
+uplink-c40r-bundle-desc = Более старый: Культовый пистолет-пулемет C-40r в комплекте с тремя магазинами тяжелого калибра.
 uplink-buldog-bundle-name = Набор "Бульдог"
 uplink-buldog-bundle-desc = Простой и надёжный: Содержит популярный дробовик Бульдог, барабан пуль и 3 барабана дроби.
-uplink-grenade-launcher-china-lake-name = Гранатомет China-Lake
-uplink-grenade-launcher-china-lake-desc = Старый гранатомёт China-Lake. Может стрелять как контактными, так и неконтактными гранатами.
-uplink-grenade-launcher-m79-name = М79
-uplink-grenade-launcher-m79-desc = Старый однозарядный гранатомёт. Может стрелять как контактными, так и неконтактными гранатами.
-uplink-grenade-launcher-gl70-name = Гранатомёт GL-70
-uplink-grenade-launcher-gl70-desc = Многозарядный автоматический гранатомёт с барабаном. Может стрелять как контактными, так и неконтактными гранатами.
+uplink-grenade-launcher-china-lake-name = Набор "China-Lake"
+uplink-grenade-launcher-china-lake-desc = Старый гранатомёт China-Lake и сумкой запасных снарядов.. Может стрелять как контактными, так и неконтактными гранатами.
+uplink-grenade-launcher-m79-name = Набор "М79"
+uplink-grenade-launcher-m79-desc = Набор с Старым однозарядным гранатомётом вместе с сумкой запасных снарядов. Может стрелять как контактными, так и неконтактными гранатами.
+uplink-grenade-launcher-gl70-name = Набор "GL-70"
+uplink-grenade-launcher-gl70-desc = Набор с многозарядным автоматическим гранатомётом с барабаном на 6 снарядов и сумкой запасных снарядов. Может стрелять как контактными, так и неконтактными гранатами.
 uplink-l6-saw-bundle-name = Набор "L6 Saw"
 uplink-l6-saw-bundle-desc = Ещё больше дакки: культовый лёгкий пулемёт L6 в комплекте с 2 коробами патронов.
 uplink-zombie-bundle-name = Зомби-набор Синдиката
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@ -59,6 +59,9 @@
      - id: WeaponSubMachineGunC20rBiocode # Sunrise-edit
      - id: MagazinePistolSubMachineGun
        amount: 2
+      - id: MagazinePistolSubMachineGunFMJ  # Sunrise-edit
+        amount: 2
+      - id: MagazinePistol40SubMachineGunHP # Sunrise-add
 #     - id: SMGSuppressor

 - type: entity
@ -72,6 +75,9 @@
    - id: WeaponRifleEstocBiocode # Sunrise-edit
    - id: MagazineRifle
      amount: 2
+    - id: MagazineRifleFMJ  # Sunrise-edit
+      amount: 2
+    - id: MagazineRifleAP # Sunrise-edit

 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
@ -94,25 +100,92 @@
  - type: StorageFill
    contents:
      - id: WeaponLightMachineGunL6Biocode # Sunrise-edit
-      - id: MagazineLightRifleBoxSP
+      - id: MagazineRifleBoxSP
        amount: 2 #Sunrise-add
-      - id: MagazineBoxRifleSP #Sunrise-add
+      - id: MagazineRifleBoxFMJ #Sunrise-add

-#- type: entity
-#  parent: ClothingBackpackDuffelSyndicateBundle
-#  id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
-#  name: China-Lake bundle
-#  description: "An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability."
-#  components:
-#  - type: StorageFill
-#    contents:
-#      - id: WeaponLauncherChinaLakeBiocode # Sunrise-edit
-#      - id: GrenadeBlast
-#        amount: 4
-#      - id: GrenadeFrag
-#        amount: 4
-#      - id: GrenadeEMP
-#        amount: 4
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
+  name: China-Lake bundle
+  description: "An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponLauncherChinaLakeBiocode # Sunrise-edit
+      - id: GrenadeBlastContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeFragContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeEMPContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeBlastTimer
+        amount: 2
+      - id: GrenadeFragTimer
+        amount: 2
+      - id: GrenadeEMPTimer
+        amount: 2
+
+# Sunrise-start
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncherM79
+  name: China-Lake bundle
+  description: "An old m79 grenade launcher bundled with 11 rounds of various destruction capability."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponLauncherM79Biocode # Sunrise-edit
+      - id: GrenadeBlastContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeFragContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeEMPContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeBlastTimer
+        amount: 2
+      - id: GrenadeFragTimer
+        amount: 2
+      - id: GrenadeEMPTimer
+        amount: 2
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncherGL70
+  name: China-Lake bundle
+  description: "GL70 grenade launcher bundled with 11 rounds of various destruction capability."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponGrenadeLauncherGL70Biocode # Sunrise-edit
+      - id: GrenadeBlastContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeFragContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeEMPContact # Sunrise-edit
+        amount: 1
+      - id: GrenadeBlastTimer
+        amount: 2
+      - id: GrenadeFragTimer
+        amount: 2
+      - id: GrenadeEMPTimer
+        amount: 2
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledSMG40
+  name: C-40r bundle
+  description: "Old faithful: The classic C-40r Submachine Gun, bundled with three magazines."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunC40rBiocode
+      - id: MagazinePistol40SubMachineGunSP
+        amount: 2
+      - id: MagazinePistol40SubMachineGunFMJ
+        amount: 2
+      - id: MagazinePistol40SubMachineGunHP
+# Sunrise-end

 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
@ -148,7 +221,7 @@
        amount: 3
      - id: MagazineShotgunSlug
        amount: 1
-      - id: MagazineLightRifleBoxSP
+      - id: MagazineRifleBoxSP
        amount: 2

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@ -158,6 +158,8 @@
        amount: 2
      - id: EmpGrenade
        amount: 2
+  - type: ExplosionResistance # Sunrise-add
+    damageCoefficient: 0.01

 - type: entity
  id: ClothingBeltMilitaryWebbingMedFilled
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@ -263,12 +263,12 @@
  name: uplink-grenade-launcher-china-lake-name
  description: uplink-grenade-launcher-china-lake-desc
  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
-  productEntity: WeaponLauncherChinaLakeBiocode
+  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
  discountCategory: veryRareDiscounts
  discountDownTo:
-    Telecrystal: 10 # Sunrise-Edit
+    Telecrystal: 14
  cost:
-    Telecrystal: 12 # Sunrise-Edit
+    Telecrystal: 20
  categories:
  - UplinkWeaponry
 #Sunrise-start
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@ -79,10 +79,10 @@
  - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was.
    modifiers:
      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
+        Blunt: 0.80
+        Slash: 0.80
+        Piercing: 0.80
+        Heat: 0.80
        Radiation: 0.80
        Caustic: 0.95
  - type: ExplosionResistance
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@ -476,7 +476,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.25
+    bluntStaminaDamageFactor: 1
  - type: MovementSpeedModifier
    baseWalkSpeed: 2.5
    baseSprintSpeed: 4
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@ -10,9 +10,13 @@
      tags:
        - CartridgeAntiMateriel
    proto: CartridgeAntiMateriel
-    capacity: 10
+    # Sunrise-start
+    capacity: 14
  - type: Item
-    size: Small
+    size: Normal
+    shape:
+    - 0,0,1,1
+    # Sunrise-end
  - type: ContainerContainer
    containers:
      ballistic-ammo: !type:Container
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@ -170,3 +170,59 @@
      - state: inhand-right-mag
      - state: inhand-right-stripe
        color: "#540000"
+
+# Sunrise-start
+- type: entity
+  id: MagazineMagnumHP
+  name: pistol magazine (.45 magnum HP)
+  parent: BaseMagazineMagnum
+  description: 7-round single stack pistol magazine. Intended to hold hollow point kinetic ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumHP
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      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: MagazineMagnumFMJ
+  name: pistol magazine (.45 magnum FMJ)
+  parent: BaseMagazineMagnum
+  description: 7-round single stack pistol magazine. Intended to hold Full metal jacket kinetic ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumFMJ
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: stripe
+      color: "#ffffff01"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      - state: inhand-left-stripe
+        color: "#ffffff01"
+      right:
+      - state: inhand-right-mag
+      - state: inhand-right-stripe
+        color: "#ffffff01"
+# Sunrise-End
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@ -850,12 +850,18 @@
      map: ["enum.GunVisualLayers.Base"]
    - state: mag-1
      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: MagazinePistolSubMachineGunEmpty
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@ -450,7 +450,7 @@
 #Sunrise-start
 # Magazines L6 SAW
 - type: entity
-  id: MagazineLightRifleBoxSP
+  id: MagazineRifleBoxSP
  name: "L6 SAW magazine box (.20 rifle SP)"
  parent: BaseMagazineRifle
  description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition.
@ -470,10 +470,31 @@
    zeroVisible: false
  - type: Appearance

+- type: entity
+  id: MagazineRifleBoxFMJ
+  name: "L6 SAW magazine box (.20 rifle FMJ)"
+  parent: BaseMagazineRifle
+  description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold FMJ kinetic ammunition.
+  components:
+  - type: Tag
+    tags:
+      - MagazineLightRifleBox
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleFMJ
+    capacity: 150
+  - type: Item
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 8
+    zeroVisible: false
+  - type: Appearance
+
 - type: entity
  id: MagazineLightRifleBoxIncendiary
  name: "L6 SAW magazine box (.20 rifle incendiary)"
-  parent: MagazineLightRifleBoxSP
+  parent: MagazineRifleBoxSP
  components:
  - type: BallisticAmmoProvider
    proto: CartridgeRifleIncendiary
@ -487,7 +508,7 @@
 - type: entity
  id: MagazineLightRifleBoxUranium
  name: "L6 SAW magazine box (.20 rifle uranium)"
-  parent: MagazineLightRifleBoxSP
+  parent: MagazineRifleBoxSP
  components:
  - type: BallisticAmmoProvider
    proto: CartridgeRifleUranium
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml
@ -1,5 +1,5 @@
 - type: entity
-  parent: MagazineLightRifleBoxSP # It goes in a saw, its funny.
+  parent: MagazineRifleBoxSP # It goes in a saw, its funny.
  id: MagazineFoamBox
  name: ammunition box (foam)
  components:
@ -9,4 +9,4 @@
      tags:
        - BulletFoam
    proto: BulletFoam
-    capacity: 100
+    capacity: 100
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@ -42,7 +42,7 @@
    slots:
      gun_magazine:
        name: Magazine
-        startingItem: MagazineLightRifleBoxSP
+        startingItem: MagazineRifleBoxSP #Sunrise-Edit
        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
        priority: 2
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@ -111,6 +111,7 @@

 - type: hitscan
  id: RedHeavyLaser
+  igniteOnCollision: true # Sunrise-Edit
  damage:
    types:
      Heat: 28
--- a/Resources/Prototypes/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/Recipes/Lathes/ammo.yml
@ -32,26 +32,12 @@
  materials:
    Steel: 25

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleSP
-  result: MagazineRifleSP
-  materials:
-    Steel: 425
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHP
-  result: MagazineRifleHP
-  materials:
-    Steel: 425
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleFMJ
-  result: MagazineRifleFMJ
-  materials:
-    Steel: 525
+# - type: latheRecipe
+#   parent: BaseAmmoRecipe
+#   id: MagazineRifle
+#   result: MagazineRifle
+#   materials:
+#     Steel: 475

 - type: latheRecipe
  parent: BaseAmmoRecipe
@ -62,14 +48,6 @@
    Plastic: 225 #Sunrise-edit
    Plasma: 225 #Sunrise-add

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleAP
-  result: MagazineRifleAP
-  materials:
-    Steel: 500
-    Uranium: 300
-
 - type: latheRecipe
  parent: BaseAmmoRecipe
  id: MagazineRiflePractice
@ -101,36 +79,6 @@
    Plastic: 375 #Sunrise-edit
    Plasma: 375 #Sunrise-add

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifleSP
-  result: MagazineBoxRifleSP
-  materials:
-    Steel: 750
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifleHP
-  result: MagazineBoxRifleHP
-  materials:
-    Steel: 750
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifleFMJ
-  result: MagazineBoxRifleFMJ
-  materials:
-    Steel: 750
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifleAP
-  result: MagazineBoxRifleAP
-  materials:
-    Plastic: 500
-    Steel: 500
-    Uranium: 500
-
 - type: latheRecipe
  parent: BaseAmmoBoxRecipe
  id: MagazineBoxRiflePractice
@ -154,26 +102,12 @@
  materials:
    Steel: 25

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleSP
-  result: MagazineLightRifleSP
-  materials:
-    Steel: 550
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleHP
-  result: MagazineLightRifleHP
-  materials:
-    Steel: 550
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleFMJ
-  result: MagazineLightRifleFMJ
-  materials:
-    Steel: 650
+# - type: latheRecipe
+#   parent: BaseAmmoRecipe
+#   id: MagazineLightRifle
+#   result: MagazineLightRifle
+#   materials:
+#     Steel: 565

 - type: latheRecipe
  parent: BaseAmmoRecipe
@ -184,14 +118,6 @@
    Plastic: 270 #Sunrise-edit
    Plasma: 270 #Sunrise-add

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleAP
-  result: MagazineLightRifleAP
-  materials:
-    Steel: 550
-    Uranium: 350
-
 - type: latheRecipe
  parent: BaseAmmoRecipe
  id: MagazineLightRiflePractice
@ -208,26 +134,12 @@
    Plastic: 360
    Uranium: 360

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifleSP
-  result: MagazineBoxLightRifleSP
-  materials:
-    Steel: 900
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifleHP
-  result: MagazineBoxLightRifleHP
-  materials:
-    Steel: 900
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifleFMJ
-  result: MagazineBoxLightRifleFMJ
-  materials:
-    Steel: 900
+# - type: latheRecipe
+#   parent: BaseAmmoBoxRecipe
+#   id: MagazineBoxLightRifle
+#   result: MagazineBoxLightRifle
+#   materials:
+#     Steel: 900

 - type: latheRecipe
  parent: BaseAmmoBoxRecipe
@ -252,68 +164,6 @@
    Plastic: 600
    Uranium: 600

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifleAP
-  result: MagazineBoxLightRifleAP
-  materials:
-    Plastic: 600
-    Steel: 600
-    Uranium: 600
-
- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: LightRifleHeavyMagazineEmpty
-  result: LightRifleHeavyMagazineEmpty
-  materials:
-    Steel: 100
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: LightRifleHeavyMagazineSP
-  result: LightRifleHeavyMagazineSP
-  materials:
-    Steel: 1412
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: LightRifleHeavyMagazineHP
-  result: LightRifleHeavyMagazineHP
-  materials:
-    Steel: 1412
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: LightRifleHeavyMagazineFMJ
-  result: LightRifleHeavyMagazineFMJ
-  materials:
-    Steel: 1412
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: LightRifleHeavyMagazineUranium
-  result: LightRifleHeavyMagazineUranium
-  materials:
-    Steel: 100
-    Plastic: 1080
-    Uranium: 1080
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: LightRifleHeavyMagazineIncendiary
-  result: LightRifleHeavyMagazineIncendiary
-  materials:
-    Steel: 100
-    Plastic: 1350
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: LightRifleHeavyMagazineAP
-  result: LightRifleHeavyMagazineAP
-  materials:
-    Steel: 1312
-    Uranium: 1312
-
 # .35 Auto
 - type: latheRecipe
  parent: BaseEmptyAmmoRecipe
@ -322,12 +172,12 @@
  materials:
    Steel: 25

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistol
-  result: MagazinePistol
-  materials:
-    Steel: 145
+# - type: latheRecipe
+#   parent: BaseAmmoRecipe
+#   id: MagazinePistol
+#   result: MagazinePistol
+#   materials:
+#     Steel: 145

 - type: latheRecipe
  parent: BaseAmmoRecipe
@ -345,35 +195,6 @@
  materials:
    Steel: 85

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSP
-  result: MagazinePistolSP
-  materials:
-    Steel: 145
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHP
-  result: MagazinePistolHP
-  materials:
-    Steel: 145
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolFMJ
-  result: MagazinePistolFMJ
-  materials:
-    Steel: 145
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolAP
-  result: MagazinePistolAP
-  materials:
-    Steel: 225
-    Uranium: 225
-
 - type: latheRecipe
  parent: BaseAmmoRecipe
  id: MagazinePistolUranium
@ -383,43 +204,6 @@
    Plastic: 65
    Uranium: 120

- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazinePistol40Empty
-  result: MagazinePistol40Empty
-  materials:
-    Steel: 37
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistol40SP
-  result: MagazinePistol40SP
-  materials:
-    Steel: 167
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistol40HP
-  result: MagazinePistol40HP
-  materials:
-    Steel: 167
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistol40FMJ
-  result: MagazinePistol40FMJ
-  materials:
-    Steel: 167
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistol40AP
-  result: MagazinePistol40AP
-  materials:
-    Steel: 90
-    Uranium: 90
-    Plastic: 130
-
 - type: latheRecipe
  parent: BaseEmptyAmmoRecipe
  id: MagazinePistolSubMachineGunEmpty
@ -427,42 +211,12 @@
  materials:
    Steel: 30

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunSP
-  result: MagazinePistolSubMachineGunSP
-  materials:
-    Steel: 300
-
- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazinePistolSubMachineGunHP
-  result: MagazinePistolSubMachineGunHP
-  materials:
-    Steel: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunFMJ
-  result: MagazinePistolSubMachineGunFMJ
-  materials:
-    Steel: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunAP
-  result: MagazinePistolSubMachineGunAP
-  materials:
-    Plastic: 150
-    Steel: 150
-    Uranium: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGun
-  result: MagazinePistolSubMachineGun
-  materials:
-    Steel: 300
+# - type: latheRecipe
+#   parent: BaseAmmoRecipe
+#   id: MagazinePistolSubMachineGun
+#   result: MagazinePistolSubMachineGun
+#   materials:
+#     Steel: 300

 - type: latheRecipe
  parent: BaseAmmoRecipe
@ -470,8 +224,8 @@
  result: MagazinePistolSubMachineGunIncendiary
  materials:
    Steel: 25
-    Plastic: 135 #Sunrise-edit
-    Plasma: 140 #Sunrise-add
+    Plastic: 135 # Sunrise-edit
+    Plasma: 140 # Sunrise-add

 - type: latheRecipe
  parent: BaseAmmoRecipe
@ -501,7 +255,7 @@
  id: MagazinePistolSubMachineGunTopMounted
  result: MagazinePistolSubMachineGunTopMounted
  materials:
-    Steel: 300
+    Steel: 375 # Sunrise-edit

 #- type: latheRecipe
 #  parent: BaseAmmoBoxRecipe
@ -533,68 +287,6 @@
    Plastic: 300
    Uranium: 600

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolSP
-  result: MagazineBoxPistolSP
-  materials:
-    Steel: 600
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolHP
-  result: MagazineBoxPistolHP
-  materials:
-    Steel: 600
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolFMJ
-  result: MagazineBoxPistolFMJ
-  materials:
-    Steel: 600
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolAP
-  result: MagazineBoxPistolAP
-  materials:
-    Plastic: 300
-    Steel: 300
-    Uranium: 600
-
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistol40SP
-  result: MagazineBoxPistol40SP
-  materials:
-    Steel: 334
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistol40HP
-  result: MagazineBoxPistol40HP
-  materials:
-    Steel: 334
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistol40FMJ
-  result: MagazineBoxPistol40FMJ
-  materials:
-    Steel: 334
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistol40AP
-  result: MagazineBoxPistol40AP
-  materials:
-    Steel: 180
-    Uranium: 180
-    Plastic: 260
-
-
 # .45 Magnum
 - type: latheRecipe
  parent: BaseEmptyAmmoRecipe
@ -650,36 +342,6 @@
    Plastic: 120 #Sunrise-edit
    Plasma: 120 #Sunrise-add

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumSP
-  result: SpeedLoaderMagnumSP
-  materials:
-    Steel: 190
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumHP
-  result: SpeedLoaderMagnumHP
-  materials:
-    Steel: 190
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumFMJ
-  result: SpeedLoaderMagnumFMJ
-  materials:
-    Steel: 190
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumAP
-  result: SpeedLoaderMagnumAP
-  materials:
-    Steel: 110
-    Uranium: 110
-    Plastic: 150
-
 - type: latheRecipe
  parent: BaseAmmoBoxRecipe
  id: MagazineBoxMagnumPractice
@ -695,36 +357,6 @@
    Plastic: 240
    Uranium: 180

- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumSP
-  result: MagazineBoxMagnumSP
-  materials:
-    Steel: 240
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumHP
-  result: MagazineBoxMagnumHP
-  materials:
-    Steel: 240
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumFMJ
-  result: MagazineBoxMagnumFMJ
-  materials:
-    Steel: 240
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumAP
-  result: MagazineBoxMagnumAP
-  materials:
-    Plastic: 240
-    Steel: 180
-    Uranium: 180
-
 # .50 Shell
 - type: latheRecipe
  parent: BaseEmptyAmmoRecipe
@ -781,53 +413,6 @@
    Plastic: 160 #Sunrise-edit
    Plasma: 160 #Sunrise-add

-#Speedloaders
- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: SpeedLoaderShotgunEmpty
-  result: SpeedLoaderShotgunEmpty
-  materials:
-    Steel: 30
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderShellShotgun
-  result: SpeedLoaderShellShotgun
-  materials:
-    Steel: 140
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderShotgunBeanbag
-  result: SpeedLoaderShotgunBeanbag
-  materials:
-    Steel: 95
-    Plastic: 80
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderShotgunSlug
-  result: SpeedLoaderShotgunSlug
-  materials:
-    Steel: 110
-    Plastic: 60
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderShotgunIncendiary
-  result: SpeedLoaderShotgunIncendiary
-  materials:
-    Steel: 60
-    Plastic: 110
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderShotgunUranium
-  result: SpeedLoaderShotgunUranium
-  materials:
-    Plastic: 140
-    Uranium: 100
-
 - type: latheRecipe
  parent: BaseAmmoBoxRecipe
  id: BoxShotgunPractice
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@ -93,6 +93,7 @@
  - MagazinePistolSubMachineGunUranium
  - MagazineLightRifleUranium
  - SpeedLoaderMagnumUranium
+  - MagazineMagnumUranium
  - MagazineBoxPistolUranium
  - MagazineBoxMagnumUranium
  - MagazineBoxLightRifleUranium
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@ -27,7 +27,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineEmpty
+  id: LightRifleMagazineEmpty
  name: "Magazine Box (7.62 any)"
  suffix: empty
  parent: LightRifleHeavyBase
@ -45,7 +45,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineSP
+  id: LightRifleMagazineSP
  name: "Magazine Box (7.62 SP)"
  parent: LightRifleHeavyBase
  components:
@ -65,7 +65,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineHP
+  id: LightRifleMagazineHP
  name: "Magazine Box (7.62 HP)"
  parent: LightRifleHeavyBase
  components:
@ -85,7 +85,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineFMJ
+  id: LightRifleMagazineFMJ
  name: "Magazine Box (7.62 FMJ)"
  parent: LightRifleHeavyBase
  components:
@ -105,7 +105,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineIncendiary
+  id: LightRifleMagazineIncendiary
  name: "Magazine Box (7.62 incendiary)"
  parent: LightRifleHeavyBase
  components:
@ -125,7 +125,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineUranium
+  id: LightRifleMagazineUranium
  name: "Magazine Box (7.62 uranium)"
  parent: LightRifleHeavyBase
  components:
@ -145,7 +145,7 @@
  - type: Appearance

 - type: entity
-  id: LightRifleHeavyMagazineAP
+  id: LightRifleMagazineAP
  name: "Magazine Box (7.62 AP)"
  parent: LightRifleHeavyBase
  components:
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@ -277,3 +277,187 @@
  - type: BallisticAmmoProvider
    proto: CartridgePistolImprovised
    capacity: 6
+
+# SMG .40 (45 ACP pistol caliber)
+- type: entity
+  id: BaseMagazinePistol40SubMachineGun  # 45 ACP pistol caliber
+  parent: [ BaseItem, BaseSecurityContraband ]
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - MagazinePistolDPSubMachineGun
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+    whitelist:
+      tags:
+        - CartridgePistolDP
+    capacity: 20
+  - type: Item
+    size: Small
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: MagazinePistol40SubMachineGunEmpty
+  name: SMG magazine (.40 any)
+  suffix: empty
+  parent: BaseMagazinePistol40SubMachineGun
+  description: 20-round one stack magazine for submachine guns.
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-mag
+      right:
+      - state: inhand-right-mag
+
+- type: entity
+  id: MagazinePistol40SubMachineGunSP
+  name: SMG magazine (.40 SP)
+  parent: BaseMagazinePistol40SubMachineGun
+  description: 20-round one stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 20
+    proto: CartridgePistol40SP
+    whitelist:
+      tags:
+      - CartridgePistolDP
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      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: MagazinePistol40SubMachineGunHP
+  name: SMG magazine (.40 HP)
+  parent: BaseMagazinePistol40SubMachineGun
+  description: 20-round one stack magazine for submachine guns. Intended to hold hollow-point ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 20
+    proto: CartridgePistol40HP
+    whitelist:
+      tags:
+      - CartridgePistolDP
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      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: MagazinePistol40SubMachineGunFMJ
+  name: SMG magazine (.40 FMJ)
+  parent: BaseMagazinePistol40SubMachineGun
+  description: 20-round one stack magazine for submachine guns. Intended to hold full-metal-jacket ammunition.
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 20
+    proto: CartridgePistol40FMJ
+    whitelist:
+      tags:
+      - CartridgePistolDP
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - 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: MagazinePistol40SubMachineGunAP
+  name: SMG magazine (.40 AP)
+  parent: BaseMagazinePistol40SubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 20
+    proto: CartridgePistol40AP
+    whitelist:
+      tags:
+      - CartridgePistolDP
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      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"
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@ -37,7 +37,7 @@
 #     slots:
 #       gun_magazine:
 #         name: Magazine
-#         startingItem: LightRifleHeavyMagazineSP
+#         startingItem: LightRifleMagazineSP
 #         whitelist:
 #           tags:
 #             - LightRifleHeavy
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@ -93,7 +93,7 @@
  damage:
    types:
      Piercing: 35
-  armorPenetration: -0.25
+  armorPenetration: -0.13
  pierceChance: 0.40
  derivation: 0.05
  ricochetChance: 0.30
@ -125,9 +125,10 @@
  parent: BulletTrace
  damage:
    types:
-      Piercing: 46 #+ 30%
+      Blunt: 35
+      Piercing: 10 # +30%
  staminaDamage: 10
-  armorPenetration: -1
+  armorPenetration: -0.7
  pierceChance: 0.03
  derivation: 0.05
  ricochetChance: 0.15
@ -200,7 +201,7 @@
  damage:
    types:
      Piercing: 25 #- 30%
-  armorPenetration: 0.50
+  armorPenetration: 0.69
  pierceChance: 0.81
  derivation: 0.05
  ricochetChance: 0.48
@ -218,7 +219,7 @@
  damage:
    types:
      Piercing: 16
-  armorPenetration: -0.25
+  armorPenetration: -0.13
  pierceChance: 0.40
  derivation: 0.2
  ricochetChance: 0.30
@ -250,8 +251,9 @@
  parent: BulletTrace
  damage:
    types:
-      Piercing: 20 #+ 30%
-  armorPenetration: -1
+      Blunt: 16
+      Piercing: 5 # +30%
+  armorPenetration: -0.7
  staminaDamage: 5
  pierceChance: 0.03
  derivation: 0.2
@ -262,7 +264,7 @@
  parent: BulletTrace
  damage:
    types:
-      Piercing: 10 #- 35%
+      Piercing: 11 #- 30%
  armorPenetration: 0.25
  pierceChance: 0.69
  derivation: 0.2
@ -324,8 +326,8 @@
  parent: BulletTrace
  damage:
    types:
-      Piercing: 10 #- 35%
-  armorPenetration: 0.50
+      Piercing: 11 #- 30%
+  armorPenetration: 0.45
  pierceChance: 0.81
  derivation: 0.2
  ricochetChance: 0.48
@ -357,12 +359,13 @@
  staminaDamage: 20
  damage:
    types:
-      Piercing: 24
+      Blunt: 20
+      Piercing: 6 # +30%
  bullet:
    sprite:
      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
      state: bullet
-  armorPenetration: -1
+  armorPenetration: -0.7
  pierceChance: 0.02
  derivation: 0.15
  ricochetChance: 0.10
@ -442,7 +445,7 @@
  damage:
    types:
      Piercing: 19
-  armorPenetration: -0.25
+  armorPenetration: -0.13
  staminaDamage: 2
  pierceChance: 0.40
  derivation: 0.05
@ -462,7 +465,7 @@
      Blunt: 8
  armorPenetration: -0.15
  staminaDamage: 3
-  pierceChance: 0.50
+  pierceChance: 0.20
  derivation: 0.05
  ricochetChance: 0.30
  pierceLevel: Metal
@ -476,9 +479,10 @@
  parent: BulletTrace
  damage:
    types:
-      Piercing: 25 #+ 30%
+      Blunt: 19
+      Piercing: 6 # +30%
  pierceLevel: Wood
-  armorPenetration: -1
+  armorPenetration: -0.7
  staminaDamage: 6
  pierceChance: 0.03
  derivation: 0.05
@ -570,7 +574,7 @@
  damage:
    types:
      Piercing: 17
-  armorPenetration: -0.25
+  armorPenetration: -0.13
  pierceChance: 0.40
  ricochetChance: 0.30
  staminaDamage: 2
@ -585,8 +589,9 @@
  parent: BulletTrace
  damage:
    types:
-      Piercing: 22 #+ 30%
-  armorPenetration: -1
+      Blunt: 17
+      Piercing: 6 # +30%
+  armorPenetration: -0.7
  staminaDamage: 5
  pierceChance: 0.03
  ricochetChance: 0.15
@ -685,10 +690,10 @@
    types:
      Piercing: 28
      Structural: 25
-  armorPenetration: 0.40
+  armorPenetration: 0.35
  staminaDamage: 15
-  pierceChance: 0.35
-  ricochetChance: 0.35
+  pierceChance: 0.08
+  ricochetChance: 0.15
  bullet:
    sprite:
      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@ -700,6 +705,7 @@
  damage:
    types:
      Piercing: 5
+      Structural: 5
  armorPenetration: -0.2
  staminaDamage: 2
  pierceChance: 0.03
@ -1012,6 +1018,22 @@
    types:
      Heat: 0

+- type: hitscan
+  id: TaserBoltExtreme
+  name: taser bolt
+  parent: EnergyTrace
+  bullet:
+    sprite:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+      state: spark
+    color: "#ffff33"
+  staminaDamage: 100
+  #knockdownAmount: 0.5
+  #maxLength: 5
+  damage:
+    types:
+      Heat: 0
+
 - type: hitscan
  id: AdvancedTaserBolt
  name: taser bolt
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
@ -1,26 +1,18 @@
 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
  id: ClothingBackpackDuffelSyndicateFilledBauer
-  name: Bauer-127 bundle
-  description: "The iconic Bauer-127 magazine rifle with 2 raspy magazines in the set."
+  name: Sniper bundle
+  description: "Iconic heavy anti-materiel sniper rifle with three spare magazines, a large-calibre ammo boxes and thermal goggles."
  components:
  - type: StorageFill
    contents:
      - id: WeaponRifleBauer127Biocode
      - id: MagazineBauer127
-      - id: MagazineBauer127
-
- type: entity
-  parent: ClothingBackpackDuffelSyndicateBundle
-  id: ClothingBackpackDuffelSyndicateFilledDragunov
-  name: Dragunov bundle
-  description: "The iconic Dragunov magazine rifle with 2 raspy magazines in the set."
-  components:
-  - type: StorageFill
-    contents:
-      - id: WeaponSniperDragunovBiocode
-      - id: MagazineDragunov
-      - id: MagazineDragunov
+        amount: 3
+      - id: MagazineBoxAntiMateriel
+        amount: 2
+      - id: ClothingEyesGlassesThermalSyndie
+      - id: PowerCellSyndicate

 - type: entity
  parent: ClothingBackpackDuffelSyndicateAmmo
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
@ -105,14 +105,15 @@
  id: CaselessAmmoKit
  name: Siar52 ammo kit
  components:
+  - type: Storage
+    grid:
+    - 0,0,1,3
  - type: StorageFill
    contents:
    - id: MagazinePistolSubMachineGunSIAR52
    - id: MagazinePistolSubMachineGunSIAR52
    - id: MagazinePistolSubMachineGunSIAR52
    - id: MagazinePistolSubMachineGunSIAR52
-    - id: MagazinePistolSubMachineGunSIAR52
-    - id: MagazinePistolSubMachineGunSIAR52
  - type: Sprite
    layers:
    - state: box_of_doom
@ -123,14 +124,15 @@
  id: DragunovAmmoKit
  name: Dragunov ammo kit
  components:
+  - type: Storage
+    grid:
+    - 0,0,1,3
  - type: StorageFill
    contents:
    - id: MagazineDragunov
    - id: MagazineDragunov
-    - id: MagazineDragunov
    - id: MagazineDragunovExtended
    - id: MagazineDragunovExtended
-    - id: MagazineBoxRifleMachineFMJ
  - type: Sprite
    layers:
    - state: box_of_doom
@ -260,12 +262,12 @@
    - 0,0,2,3
  - type: StorageFill
    contents:
-    - id: MagazineLightRifleBoxSP
-    - id: MagazineLightRifleBoxSP
-    - id: MagazineLightRifleBoxSP
-    - id: MagazineBoxRifleBig
-    - id: MagazineBoxRifleBig
-    - id: MagazineBoxRifleBig
+    - id: MagazineRifleBoxSP
+    - id: MagazineRifleBoxSP
+    - id: MagazineRifleBoxSP
+    - id: MagazineRifleBoxSP
+    - id: MagazineRifleBoxFMJ
+    - id: MagazineRifleBoxFMJ
  - type: Sprite
    layers:
    - state: box_of_doom_big
@ -282,13 +284,12 @@
    - 0,0,1,1
  - type: Storage
    grid:
-    - 0,0,1,3
+    - 0,0,2,1
  - type: StorageFill
    contents:
    - id: MagazineDl6902
    - id: MagazineDl6902
-    - id: MagazineBoxLightRifleBig
-    - id: MagazineBoxLightRifleBig
+    - id: MagazineDl6902
  - type: Sprite
    layers:
    - state: box_of_doom_big
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml
@ -24,22 +24,16 @@
  id: CrateSecuritySWAT
  parent: CrateSecgear
  name: SWAT armor crate
-  description: Contains a SWAT kit. 2 heavy armor suit, 2 special forces helmet, 2special forces gas mask and 2 combat Swat boots. To open it, the Security Service access level is required.
+  description: Contains a SWAT kit. One heavy armor suit with special forces helmet, special forces gas mask and combat Swat boots. To open it, the Security Service access level is required.
  components:
  - type: StorageFill
    contents:
      - id: ClothingOuterArmorSWAT
-        amount: 2
      - id: ClothingMaskGasSwat
-        amount: 2
      - id: ClothingShoesSwat
-        amount: 2
      - id: ClothingHeadHelmetSwat
-        amount: 2
      - id: ClothingBeltSecurity
-        amount: 2
      - id: CombatKnife
-        amount: 2

 - type: entity
  id: CrateSecurityArmorReflective
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/ussp.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/ussp.yml
@ -60,6 +60,21 @@
      - id: SpeedLoaderHeavyRifleRFMJ
        amount: 16

+- type: entity
+  parent: CrateAmmunitionSmall
+  id: CrateAmmunitionSmallDragunov
+  name: old small ammunition crate
+  suffix: Filled, Sniper
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSniperDragunovBiocode
+      - id: MagazineDragunov
+        amount: 2
+      - id: MagazineDragunovIncendiary
+        amount: 2
+      - id: MagazineDragunovUranium
+
 - type: entity
  parent: BaseStructureDynamic
  id: CrateShelfMosin
--- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
@ -60,6 +60,7 @@

    WeaponSubMachineGunAtreides: 3
    WeaponSubMachineGunC20r: 3
+    WeaponSubMachineGunC40r: 3
    WeaponSubMachineGunDrozd: 3
    WeaponSubMachineGunDrozdMk2: 3
    WeaponSubMachineGunP90: 3
--- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@ -158,18 +158,28 @@
  - UplinkWearables

 # Ammunition
+
+# For the Deagle
 - type: listing
  id: UplinkPistolMagnumMagazine
  name: uplink-pistol-magnum-magazine-name
  description: uplink-pistol-magnum-magazine-desc
-  icon:
-    { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/deagle.rsi, state: base, }
-  productEntity: MagazineDeagle
+  productEntity: MagazineMagnum
  cost:
    Telecrystal: 1
  categories:
    - UplinkAmmo

+- type: listing
+  id: UplinkMagazineMagnumAP
+  name: uplink-pistol-magnum-magazine-ap-name
+  description: uplink-pistol-magnum-magazine-ap-desc
+  productEntity: MagazineMagnumAP
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkAmmo
+
 - type: listing
  id: UplinkPistol9mmMagazineFMJ
  description: uplink-pistol-magazine-desc
@ -231,7 +241,7 @@
  id: UplinkMagazineLightRifleBox
  description: uplink-magazine-lmg-desc
  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon }
-  productEntity: MagazineLightRifleBoxSP
+  productEntity: MagazineRifleBoxSP
  discountCategory: usualDiscounts
  discountDownTo:
    Telecrystal: 2
@ -482,7 +492,7 @@
  discountDownTo:
    Telecrystal: 2
  cost:
-    Telecrystal: 4
+    Telecrystal: 3
  categories:
  - UplinkAmmo
  conditions:
@ -502,7 +512,7 @@
  discountDownTo:
    Telecrystal: 2
  cost:
-    Telecrystal: 4
+    Telecrystal: 3
  categories:
  - UplinkAmmo
  conditions:
@ -522,7 +532,7 @@
  discountDownTo:
    Telecrystal: 2
  cost:
-    Telecrystal: 4
+    Telecrystal: 3
  categories:
  - UplinkAmmo
  conditions:
@ -616,6 +626,27 @@
 #       tags:
 #       - AssaultOpsUplink

+- type: listing
+  id: UplinkC40RBundle
+  name: uplink-c40r-bundle-name
+  description: uplink-c40r-bundle-desc
+  icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledSMG40
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 10
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkWeaponry
+  #Sunrise-start
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - AssaultOpsUplink
+  #Sunrise-end
+
 - type: listing
  id: UplinkClothingBackpackSyndieDL6902Filled
  name: uplink-clothing-backpack-syndie-dl6902-name
@ -690,15 +721,14 @@

 - type: listing
  id: UplinkWeaponDragunov
-  name: uplink-weapon-dragunov-name
-  productEntity: ClothingBackpackDuffelSyndicateFilledDragunov
-  description: uplink-weapon-dragunov-desc
+  name: uplink-weapon-ussp-dmr-name
+  productEntity: CrateAmmunitionSmallDragunov
  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Snipers/dragunov/big.rsi, state: icon }
  discountCategory: veryRareDiscounts
  discountDownTo:
    Telecrystal: 13
  cost:
-    Telecrystal: 17
+    Telecrystal: 16
  categories:
  - UplinkWeaponry
  conditions:
@ -709,15 +739,13 @@

 - type: listing
  id: UplinkWeaponBauer127
-  name: uplink-weapon-bauer-127-name
  productEntity: ClothingBackpackDuffelSyndicateFilledBauer
-  description: uplink-weapon-bauer-127-name
  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Snipers/bauer127/big.rsi, state: icon }
  discountCategory: veryRareDiscounts
  discountDownTo:
-    Telecrystal: 14
-  cost:
    Telecrystal: 18
+  cost:
+    Telecrystal: 22
  categories:
  - UplinkWeaponry
  conditions:
@ -1737,12 +1765,12 @@
  id: uplinkWeaponPistolDeagle
  name: uplink-deagle-name
  description: uplink-deagle-desc
-  productEntity: WeaponPistolDeagle
+  productEntity: WeaponPistolDeagleBiocode
  discountCategory: rareDiscounts
  discountDownTo:
    Telecrystal: 4
  cost:
-    Telecrystal: 7
+    Telecrystal: 5
  categories:
  - UplinkWeaponry

@ -1764,12 +1792,12 @@
  name: uplink-grenade-launcher-m79-name
  description: uplink-grenade-launcher-m79-desc
  icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Launchers/m79/big.rsi, state: base }
-  productEntity: WeaponLauncherM79Biocode
+  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncherM79
  discountCategory: veryRareDiscounts
  discountDownTo:
-    Telecrystal: 2 # Good morning Vietnam!
+    Telecrystal: 10 # Good morning Vietnam!
  cost:
-    Telecrystal: 6
+    Telecrystal: 14
  categories:
  - UplinkWeaponry
  conditions:
@ -1784,12 +1812,12 @@
  name: uplink-grenade-launcher-gl70-name
  description: uplink-grenade-launcher-gl70-desc
  icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/big.rsi, state: icon }
-  productEntity: WeaponGrenadeLauncherGL70Biocode
+  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncherGL70
  discountCategory: veryRareDiscounts
  discountDownTo:
-    Telecrystal: 18
+    Telecrystal: 20
  cost:
-    Telecrystal: 25
+    Telecrystal: 35
  categories:
  - UplinkWeaponry
  conditions:
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml
@ -122,6 +122,11 @@
  - type: Clothing
    sprite: _Sunrise/Clothing/Eyes/Glasses/synd_thermal.rsi
  - type: ShowSyndicateIcons
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellSyndicate

 - type: entity
  parent: [ClothingEyesGlassesThermal, ShowSecurityIcons, BaseSecurityCommandContraband]
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
@ -67,27 +67,36 @@
    sprite: Clothing/OuterClothing/Armor/heavy.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/Armor/heavy.rsi
+    equipSound: /Audio/Items/belt_equip.ogg
+    unequipSound: /Audio/Items/belt_equip.ogg
+    equipDelay: 2
+    unequipDelay: 3
+    stripDelay: 8
+  - type: Item
+    size: Ginormous
  - type: StaminaResistance
-    damageCoefficient: 0.75
+    damageCoefficient: 0.7
  - type: Pierceable
    level: Rock
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.55
-        Slash: 0.55
-        Piercing: 0.3
+        Blunt: 0.45
+        Slash: 0.45
+        Piercing: 0.45
        Heat: 0.6
        Radiation: 0.6
        Caustic: 0.6
  - type: ExplosionResistance
-    damageCoefficient: 0.65
+    damageCoefficient: 0.6
  - type: PressureProtection
    highPressureMultiplier: 0.5
-    lowPressureMultiplier: 0.25
+    lowPressureMultiplier: 1000
  - type: TemperatureProtection
    heatingCoefficient: 0.5
    coolingCoefficient: 0.5
+  - type: FireProtection
+    reduction: 0.4
  - type: ClothingSpeedModifier
    walkModifier: 0.8
    sprintModifier: 0.8
@ -132,9 +141,11 @@
  - type: TemperatureProtection
    heatingCoefficient: 0.02
    coolingCoefficient: 0.5
+  - type: FireProtection
+    reduction: 0.5
  - type: ClothingSpeedModifier
-    walkModifier: 0.90
-    sprintModifier: 0.90
+    walkModifier: 0.95
+    sprintModifier: 0.85
  #Shoulder mounted flashlight
  - type: ToggleableLightVisuals
    spriteLayer: light
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Boxes/heavy_rifle.yml
@ -11,7 +11,7 @@
      tags:
        - CartridgeHeavyRifle
    proto: CartridgeRifleHeavySP
-    capacity: 20
+    capacity: 40
  - type: Item
    size: Small
  - type: ContainerContainer
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@ -218,13 +218,13 @@
  - type: Appearance

 - type: entity
-  id: MagazineVP70
+  id: MagazineVP78
  name: VP70 magazine
  parent: BaseItem
  components:
    - type: Tag
      tags:
-        - MagazineVP70
+        - MagazineVP78
    - type: BallisticAmmoProvider
      proto: CartridgePistol40SP  # 45 ACP
      mayTransfer: true
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
@ -119,7 +119,7 @@
  parent: BaseCannonBall
  components:
  - type: CartridgeAmmo
-    proto: BulletGrenadeBlastContact
+    proto: BulletGrenadeBlastTimer
    deleteOnSpawn: true
  - type: Sprite
    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
@ -133,7 +133,7 @@
  - type: CartridgeAmmo
    proto: BulletGrenadeBlastTimer
  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
    layers:
    - state: blast
      map: ["enum.AmmoVisualLayers.Base"]
@ -167,7 +167,7 @@
  - type: CartridgeAmmo
    proto: BulletGrenadeFragTimer
  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
    layers:
    - state: frag
      map: ["enum.AmmoVisualLayers.Base"]
@ -184,7 +184,7 @@
  - type: CartridgeAmmo
    proto: BulletGrenadeEMPTimer
  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
    layers:
    - state: emp
      map: ["enum.AmmoVisualLayers.Base"]
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@ -862,7 +862,7 @@
    availableModes:
    - FullAuto
  - type: HitscanBatteryAmmoProvider
-    proto: RedLaserBeam # Sunrise-TODO: Нужен товый прототип для данной пушки
+    proto: RedHeavyLaser # Sunrise-TODO: Нужен товый прототип для данной пушки
    fireCost: 40
  - type: Wieldable
  - type: GunWieldBonus
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml
@ -108,6 +108,16 @@
    - Syndicate
    alertText: Данное оружие биокодировано. Вы не можете его использовать.

+- type: entity
+  parent: WeaponPistolDeagle
+  id: WeaponPistolDeagleBiocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
 - type: entity
  parent: WeaponRifleM90GrenadeLauncher
  id: WeaponRifleM90GrenadeLauncherBiocode
@ -227,3 +237,13 @@
    factions:
    - Syndicate
    alertText: Данное оружие биокодировано. Вы не можете его использовать.
+
+- type: entity
+  parent: WeaponSubMachineGunC40r
+  id: WeaponSubMachineGunC40rBiocode
+  suffix: BIOCODE
+  components:
+  - type: FactionWeaponBlocker
+    factions:
+    - Syndicate
+    alertText: Данное оружие биокодировано. Вы не можете его использовать.
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@ -80,7 +80,7 @@
        whitelist:
          tags:
          - MagazinePistolDP
-          - MagazineVP70
+          - MagazineVP78
      gun_chamber:
        name: Chamber
        startingItem: CartridgePistol40FMJ # .45 ACP
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@ -693,3 +693,62 @@
          whitelist:
            tags:
            - CartridgePistol
+
+- type: entity
+  name: C-40r submachine gun
+  parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband]
+  id: WeaponSubMachineGunC40r
+  description: Early model of classic 20-round bullpup submachine gun by "Waffle Corp" chambered for .40 high-stopping-power rounds. Previously widely used by the Gorlex Marauders. Effective at short to medium ranges, capable of 2-round burst or fully automatic fire.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi
+  - type: Wieldable
+    unwieldOnUse: false
+  - type: GunWieldBonus
+    minAngle: -19
+    maxAngle: -16
+  - type: Gun
+    minAngle: 21
+    maxAngle: 32
+    shotsPerBurst: 2
+    burstFireRate: 14
+    availableModes:
+    - Burst
+    - FullAuto
+    soundGunshot:
+      collection: aug
+  - type: ChamberMagazineAmmoProvider
+    autoEject: true
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: true
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistol40SubMachineGunSP
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+          - MagazinePistolDPSubMachineGun
+        whitelistFailPopup: gun-magazine-whitelist-fail
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol40SP
+        priority: 1
+        whitelist:
+          tags:
+          - CartridgePistolDP
+  - type: Appearance
+  - type: StaticPrice
+    price: 5000
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@ -26,7 +26,7 @@
    - SemiAuto
    minAngle: 25
    maxAngle: 46
-    fireRate: 2.25
+    fireRate: 4
    soundGunshot:
      path: /Audio/_Sunrise/Weapons/Guns/Snipers/Dragunov/dragunov_shot.ogg
      params:
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/security.yml
@ -13,7 +13,10 @@
    - MagazineBoxMagnumRubber
    - MagazineMagnumRubber
    - MagazineMagnum
+    - MagazineMagnumFMJ
+    - MagazineMagnumHP
    - MagazineMagnumEmpty
+    - MagazineMagnumPractice
    # Pistol
    - MagazineBoxPistolSP
    - MagazineBoxPistolHP
@ -37,10 +40,10 @@
    - BoxShellTranquilizer
    #####################MAGAZINE#######################
    # LMG
-    - LightRifleHeavyMagazineSP
-    - LightRifleHeavyMagazineHP
-    - LightRifleHeavyMagazineFMJ
-    - LightRifleHeavyMagazineEmpty
+    - LightRifleMagazineSP
+    - LightRifleMagazineHP
+    - LightRifleMagazineFMJ
+    - LightRifleMagazineEmpty
    # Light Rifle
    - MagazineLightRifleSP
    - MagazineLightRifleHP
@ -141,7 +144,7 @@
    - MagazineBoxPistolIncendiary
    - MagazineBoxPistolUranium
    - MagazineBoxPistolAP
-    #- MagazineBoxPistol40AP
+    - MagazineBoxPistol40AP
  # Rifle
    - MagazineBoxRifleIncendiary
    - MagazineBoxRifleUranium
@ -157,9 +160,9 @@
    - BoxShellTranquilizer
  #####################MAGAZINE#######################
  # LMG
-    - LightRifleHeavyMagazineIncendiary
-    - LightRifleHeavyMagazineUranium
-    - LightRifleHeavyMagazineAP
+    - LightRifleMagazineIncendiary
+    - LightRifleMagazineUranium
+    - LightRifleMagazineAP
  # Light Rifle
    - MagazineLightRifleIncendiary
    - MagazineLightRifleUranium
@ -168,11 +171,13 @@
    - SpeedLoaderMagnumIncendiary
    - SpeedLoaderMagnumUranium
    - SpeedLoaderMagnumAP
+    - MagazineMagnumUranium
+    - MagazineMagnumAP
  # Pistol
    - MagazinePistolIncendiary
    - MagazinePistolUranium
    - MagazinePistolAP
-    #- MagazinePistol40AP
+    - MagazinePistol40AP
  # Pistol High Capacity
    - MagazinePistolHighCapacityIncendiary
    - MagazinePistolHighCapacityUranium
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml
@ -46,202 +46,6 @@
    Silver: 100
    Plasma: 500

- type: latheRecipe
-  id: MagazineBatteryLr30
-  parent: BaseAmmoRecipe
-  result: MagazineBatteryLr30
-  materials:
-    Steel: 250
-    Glass: 50
-    Plasma: 25
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleBoxIncendiary
-  result: MagazineLightRifleBoxIncendiary
-  materials:
-    Steel: 150
-    Plastic: 475
-    Plasma: 475
-
- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazineMagnumEmpty
-  result: MagazineMagnumEmpty
-  materials:
-    Steel: 25
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineMagnum
-  result: MagazineMagnum
-  materials:
-    Steel: 145
-
- type: latheRecipe
-  id: MagazineLightMachineGunMG60
-  result: MagazineLightMachineGunMG60
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 3700
-
- type: latheRecipe
-  id: MagazinePPSH41
-  result: MagazinePPSH41
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 1200
-
- type: latheRecipe
-  id: MagazineRPD
-  result: MagazineRPD
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 1465
-
- type: latheRecipe
-  id: MagazineLightRifleBox
-  result: MagazineLightRifleBoxSP
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 1100
-
- type: latheRecipe
-  id: MagazineNewVector
-  result: MagazineNewVector
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 835
-
- type: latheRecipe
-  id: MagazineMP38
-  result: MagazineMP38
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 835
-
- type: latheRecipe
-  id: MagazineMP5
-  result: MagazineMP5
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 835
-
- type: latheRecipe
-  id: MagazineMP7
-  result: MagazineMP7
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 835
-
- type: latheRecipe
-  id: MagazineP90
-  result: MagazineP90
-  categories:
-  - Ammo
-  completetime: 10
-  materials:
-    Steel: 1250
-    Plastic: 100
-
- type: latheRecipe
-  id: MagazineScorpion
-  result: MagazineScorpion
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 835
-
- type: latheRecipe
-  id: MagazineAK
-  result: MagazineAK
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 565
-
- type: latheRecipe
-  id: MagazineDragunov
-  result: MagazineDragunov
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 800
-
- type: latheRecipe
-  id: MagazineV31
-  result: MagazineV31
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 985
-    Plastic: 600
-
- type: latheRecipe
-  id: MagazineACP14
-  result: MagazineACP14
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 250
-
- type: latheRecipe
-  id: MagazineGlock22
-  result: MagazineGlock22
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 250
-
-# - type: latheRecipe
-#   id: MagazineVP70
-#   result: MagazineVP70
-#   categories:
-#   - Ammo
-#   completetime: 5
-#   materials:
-#     Steel: 250
-
- type: latheRecipe
-  id: MagazineHIBrowning
-  result: MagazineHIBrowning
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 250
-
- type: latheRecipe
-  id: MagazineDeagle
-  result: MagazineDeagle
-  categories:
-  - Ammo
-  completetime: 5
-  materials:
-    Steel: 193
-
 - type: latheRecipe
  parent: BaseWeaponRecipeSidearm
  id: FlareGunSecurityUpgrade
@ -318,111 +122,6 @@
    Plastic: 300
    Gold: 50

-#
-#- type: latheRecipe  # Отдельной технологией
-#  id: BaseMagazinePistolCaselessRifleExtended
-#  result: BaseMagazinePistolCaselessRifleExtended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 350
-#    Plastic: 200
-#
-#- type: latheRecipe
-#  id: MagazinePPSH41Extended
-#  result: MagazinePPSH41Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 1200
-#
-#- type: latheRecipe
-#  id: MagazineMP5Extended
-#  result: MagazineMP5Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 600
-#
-#- type: latheRecipe
-#  id: MagazineMP7Extended
-#  result: MagazineMP7Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 600
-#
-#- type: latheRecipe
-#  id: MagazineRifleExtended
-#  result: MagazineRifleExtended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 450
-#
-#- type: latheRecipe
-#  id: MagazineAR18Extended
-#  result: MagazineAR18Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 650
-#
-#- type: latheRecipe
-#  id: MagazineM28Extended
-#  result: MagazineM28Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 650
-#
-#- type: latheRecipe
-#  id: MagazineV31Extended
-#  result: MagazineV31Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 1300
-#    Plastic: 100
-#
-#- type: latheRecipe
-#  id: MagazineBauer127Extended
-#  result: MagazineBauer127Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 1200
-#    Plastic: 50
-#
-#- type: latheRecipe
-#  id: MagazineBR64Extended
-#  result: MagazineBR64Extended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 1000
-#    Plastic: 50
-#
-#- type: latheRecipe
-#  id: MagazineDragunovExtended
-#  result: MagazineDragunovExtended
-#  categories:
-#  - Weapons
-#  completetime: 12
-#  materials:
-#    Steel: 1200
-
-
 - type: latheRecipe
  id: EnergyDomeDirectionalTurtle
  result: EnergyDomeDirectionalTurtle
@ -433,33 +132,6 @@
    Gold: 250
    Uranium: 50

- type: latheRecipe
-  id: ShellEMPArtillery
-  result: ShellEMPArtillery
-  completetime: 3
-  materials:
-    Steel: 150
-    Plastic: 100
-    Glass: 20
-
- type: latheRecipe
-  id: ShellBlastArtillery
-  result: ShellBlastArtillery
-  completetime: 3
-  materials:
-    Steel: 450
-    Plastic: 300
-    Gold: 150
-
- type: latheRecipe
-  id: ShellFlashArtillery
-  result: ShellFlashArtillery
-  completetime: 3
-  materials:
-    Steel: 150
-    Plastic: 100
-    Glass: 20
-
 # Mech Weapons
 - type: latheRecipe
  id: WeaponMechCombatIon
@ -621,283 +293,6 @@
    Glass: 300
    Plastic: 50

-# WT550 Sunrise Ammunition
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedSP
-  result: MagazinePistolSubMachineGunTopMountedSP
-  materials:
-    Steel: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedRubber
-  result: MagazinePistolSubMachineGunTopMountedRubber
-  materials:
-    Steel: 50
-    Plastic: 150
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunRubber
-  result: MagazinePistolSubMachineGunRubber
-  materials:
-    Steel: 50
-    Plastic: 150
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedHP
-  result: MagazinePistolSubMachineGunTopMountedHP
-  materials:
-    Steel: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedAP
-  result: MagazinePistolSubMachineGunTopMountedAP
-  materials:
-    Plastic: 150
-    Steel: 150
-    Uranium: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedPractice
-  result: MagazinePistolSubMachineGunTopMountedPractice
-  materials:
-    Steel: 150
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedIncendiary
-  result: MagazinePistolSubMachineGunTopMountedIncendiary
-  materials:
-    Steel: 25
-    Plastic: 135
-    Plasma: 140
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedUranium
-  result: MagazinePistolSubMachineGunTopMountedUranium
-  materials:
-    Steel: 25
-    Plastic: 250
-    Uranium: 250
-
-# Heavy .308
- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazineRifleHeavyEmpty
-  result: MagazineRifleHeavyEmpty
-  materials:
-    Steel: 50
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHeavyUranium
-  result: MagazineRifleHeavyUranium
-  materials:
-    Steel: 50
-    Plastic: 350
-    Uranium: 350
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHeavyIncendiary
-  result: MagazineRifleHeavyIncendiary
-  materials:
-    Steel: 50
-    Plastic: 350
-    Plasma: 300
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHeavySP
-  result: MagazineRifleHeavySP
-  materials:
-    Steel: 650
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHeavyHP
-  result: MagazineRifleHeavyHP
-  materials:
-    Steel: 650
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHeavyFMJ
-  result: MagazineRifleHeavyFMJ
-  materials:
-    Steel: 800
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleHeavyAP
-  result: MagazineRifleHeavyAP
-  materials:
-    Steel: 650
-    Uranium: 350
-
-## Heavy rifle Box
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRifleUranium
-  result: MagazineBoxHeavyRifleUranium
-  materials:
-    Steel: 25
-    Plastic: 200
-    Uranium: 200
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRifleIncendiary
-  result: MagazineBoxHeavyRifleIncendiary
-  materials:
-    Steel: 25
-    Plastic: 200
-    Plasma: 200
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRifleSP
-  result: MagazineBoxHeavyRifleSP
-  materials:
-    Steel: 425
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRifleHP
-  result: MagazineBoxHeavyRifleHP
-  materials:
-    Steel: 425
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRifleFMJ
-  result: MagazineBoxHeavyRifleFMJ
-  materials:
-    Steel: 525
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRifleAP
-  result: MagazineBoxHeavyRifleAP
-  materials:
-    Steel: 425
-    Uranium: 200
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxHeavyRiflePractice
-  result: MagazineBoxHeavyRiflePractice
-  materials:
-    Steel: 225
-
- type: latheRecipe # Sunrise-Todo: Отдельной дешевой Т2 технологией с зависимостью от Uranium Munitions и Incendiary Ammunition
-  parent: BaseEmptyAmmoRecipe
-  id: MagazinePistolHighCapacityEmpty
-  result: MagazinePistolHighCapacityEmpty
-  materials:
-    Steel: 30
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacityUranium
-  result: MagazinePistolHighCapacityUranium
-  materials:
-    Steel: 25
-    Plastic: 125
-    Uranium: 125
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacityIncendiary
-  result: MagazinePistolHighCapacityIncendiary
-  materials:
-    Steel: 25
-    Plastic: 70
-    Plasma: 70
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacitySP
-  result: MagazinePistolHighCapacitySP
-  materials:
-    Steel: 200
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacityHP
-  result: MagazinePistolHighCapacityHP
-  materials:
-    Steel: 200
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacityFMJ
-  result: MagazinePistolHighCapacityFMJ
-  materials:
-    Steel: 200
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacityAP
-  result: MagazinePistolHighCapacityAP
-  materials:
-    Plastic: 75
-    Steel: 125
-    Uranium: 150
-
-# Rubber Ammunition
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolRubber
-  result: MagazinePistolRubber
-  materials:
-    Steel: 25
-    Plastic: 50
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolHighCapacityRubber
-  result: MagazinePistolHighCapacityRubber
-  materials:
-    Steel: 30
-    Plastic: 70
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumRubber
-  result: SpeedLoaderMagnumRubber
-  materials:
-    Steel: 50
-    Plastic: 50
-
- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineMagnumRubber
-  result: MagazineMagnumRubber
-  materials:
-    Steel: 25
-    Plastic: 60
-
- type: latheRecipe
-  parent: BaseAmmoBoxRecipe
-  id: MagazineBoxMagnumRubber
-  result: MagazineBoxMagnumRubber
-  materials:
-    Plastic: 120
-
- type: latheRecipe
-  parent: BaseAmmoBoxRecipe
-  id: MagazineBoxPistolRubber
-  result: MagazineBoxPistolRubber
-  materials:
-    Plastic: 300
-
 #Cybernetics
 - type: latheRecipe
  id: ImplantCaseMantisBladeMaxGuard
--- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml
+++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml
@ -23,16 +23,17 @@
  cost: 11500
  recipeUnlocks:
  - SpeedLoaderMagnumAP
+  - MagazineMagnumAP
  - MagazinePistolAP
-  #- MagazinePistol40AP
+  - MagazinePistol40AP
  - MagazineRifleAP
  - MagazineLightRifleAP
  - MagazineBoxMagnumAP
  - MagazineBoxPistolAP
-  #- MagazineBoxPistol40AP
+  - MagazineBoxPistol40AP
  - MagazineBoxRifleAP
  - MagazineBoxLightRifleAP
-  - LightRifleHeavyMagazineAP
+  - LightRifleMagazineAP
  - MagazinePistolSubMachineGunAP
  - MagazinePistolSubMachineGunTopMountedAP
  - MagazinePistolHighCapacityAP
--- a/Resources/Prototypes/_Sunrise/tags.yml
+++ b/Resources/Prototypes/_Sunrise/tags.yml
@ -107,6 +107,9 @@
  id: GorillaUpgradeKit

 # Magazines:
+- type: Tag
+  id: MagazinePistolDPSubMachineGun
+
 - type: Tag
  id: MagazineM28

@ -156,7 +159,7 @@
  id: MagazineMachineGunHeavyRifle # .308 calibler

 - type: Tag
-  id: MagazineVP70
+  id: MagazineVP78

 - type: Tag
  id: MagazineDeagle
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/base.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/base.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/bolt-open.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/bolt-open.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/icon.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/icon.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-left.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/inhand-right.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/mag-0.png
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/mag-0.png
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/uzi.rsi/meta.json
@ -1,31 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by RaMbUt878, for SunRise",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "bolt-open"
-        },
-        {
-            "name": "mag-0"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/blast.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/emp.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/frag.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
@ -5,7 +5,7 @@
        "y": 32
    },
    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi,  fuzeball, empshot Made by KaiserMaus",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi,  all state resprited by KaiserMaus",
    "states": [
        {
            "name": "fuzeball"
@ -23,6 +23,18 @@
                  0.1
                ]
              ]
-            }
+        },
+        {
+            "name": "blast"
+        },
+        {
+            "name": "emp"
+        },
+        {
+            "name": "frag"
+        },
+        {
+            "name": "spent"
+        }
    ]
 }
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/spent.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/base.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/base.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-left-mag.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-left-mag.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-left-stripe.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-left-stripe.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-right-mag.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-right-mag.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-right-stripe.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/inhand-right-stripe.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-1.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-1.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-2.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-2.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-3.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-3.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-4.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-4.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-5.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/mag-5.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/meta.json
@ -0,0 +1,51 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "red-icon"
+        },
+        {
+            "name": "stripe"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "inhand-left-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-stripe",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-mag",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-stripe",
+            "directions": 4
+        }
+    ]
+}
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/red-icon.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/red-icon.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/stripe.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/smg_mag.rsi/stripe.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/base.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/base.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/bolt-open.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/bolt-open.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/equipped-BACKPACK.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/equipped-BACKPACK.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/equipped-SUITSTORAGE.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/equipped-SUITSTORAGE.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/icon.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/icon.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/inhand-left.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/inhand-left.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/inhand-right.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/inhand-right.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-0.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-0.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-1.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-1.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-2.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-2.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-3.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-3.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-4.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-4.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-5.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/mag-5.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/meta.json
@ -0,0 +1,65 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github) Icons and wielded modify by KaiserMaus (Github)",
+    "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": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "suppressor"
+        },
+        {
+            "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/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/suppressor.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/suppressor.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/wielded-inhand-left.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/wielded-inhand-left.png
--- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/wielded-inhand-right.png
+++ b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi/wielded-inhand-right.png
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@ -831,7 +831,7 @@ GunSafeCombineSmallArms: SpawnerSafeSmallArms
 BoxMagazineRifle: BoxMagazineRifleSP
 MagazineBoxLightRifle: MagazineBoxLightRifleSP
 MagazineBoxPistol: MagazineBoxPistolSP
-MagazineLightRifleBox: MagazineLightRifleBoxSP
+MagazineLightRifleBox: MagazineRifleBoxSP
 MagazineLightRifle: MagazineLightRifleSP
 MagazinePistolSubMachineGun: MagazinePistolSubMachineGunSP
 MagazineRifle: MagazineRifleSP
--- a/Tools/_sunrise/Schemas/ignore_list.yml
+++ b/Tools/_sunrise/Schemas/ignore_list.yml
@ -101,6 +101,7 @@ ignore_list:
  - 'Sun-kist'
  - 'Robust Softdrinks'
  - 'C-20r'
+  - 'C-40r'
  - 'Donut Corp.'
  - 'LV426'
  - 'Kept ya waiting, huh?'