Фиксы всякого (#3832)

2026-01-31 22:27:45 +00:00 · 2026-01-31 22:27:45 +00:00 · 5c0b0716fd
commit 5c0b0716fd
parent 59586b04a8
64 changed files with 1426 additions and 357 deletions
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@ -568,7 +568,7 @@ public sealed partial class GunSystem : SharedGunSystem

        var lifetime = 0.4f;

-        if (TryComp<TimedDespawnComponent>(gunUid, out var despawn))
+        if (TryComp<TimedDespawnComponent>(ent, out var despawn)) // Sunrise-Edit
        {
            lifetime = despawn.Lifetime;
        }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/implanters.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/misc/implanters.ftl
@ -11,5 +11,5 @@ ent-DeathRattleImplanterFreelance = { ent-BaseImplantOnlyImplanterSyndi }
    .suffix = freelance death rattle
    .desc = { ent-BaseImplantOnlyImplanterSyndi.desc }
 ent-ScramImplanterProto = { ent-ScramImplanter }
-    .suffix = prototype
+    .suffix = prototype scram
    .desc = { ent-ScramImplanter.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl
@ -2,6 +2,8 @@ ent-MagazineBR64 = BR64 magazine
    .desc = Standart EarthGov type of heavy magazines.
 ent-BaseMagazineBauer127 = magazine (15mm anti-materiel)
    .desc = A large magazine for a heavy weapon, holds 15×115mm anti-materiel rounds.
+ent-MagazineBauer127Large = large magazine (15mm space anti-materiel)
+    .desc = { ent-BaseMagazineBauer127.desc }
 ent-MagazineBauer127 = { ent-BaseMagazineBauer127 }
    .desc = { ent-BaseMagazineBauer127.desc }
 ent-MagazineBauer127Penetrator = magazine (15mm penetrator)
@ -17,6 +19,15 @@ ent-BaseMagazineDragunov = magazine Dragunov (7,62mmR)
 ent-MagazineDragunovExtended = magazine Dragunov (7,62mmR)
    .suffix = Sunrise
    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovSP = magazine Dragunov (7,62mmR SP)
+    .suffix = Sunrise
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovHP = magazine Dragunov (7,62mmR HP)
+    .suffix = Sunrise
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovFMJ = magazine Dragunov (7,62mmR FMJ)
+    .suffix = Sunrise
+    .desc = { ent-BaseMagazineDragunov.desc }
 ent-MagazineDragunov = magazine Dragunov (7,62mmR)
    .suffix = Sunrise
    .desc = { ent-BaseMagazineDragunov.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/misc.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/misc.ftl
@ -3,6 +3,13 @@ ent-CableDet = explosive cord

 ent-CableDetStack = explosive cord
    .desc = Explosive cord for removing whatever is in your way.
+    .suffix = Full
+
+ent-CableDetStack10 = { ent-CableDetStack }
+    .suffix = 10
+
+ent-CableDetStack1 = { ent-CableDetStack }
+    .suffix = 1

 ent-EmptyDetonator = detonator cap
    .desc = A detonator cap. Requires a trigger and wire.
--- a/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/_strings/_sunrise/guidebook/guides.ftl
@ -51,3 +51,4 @@ guide-entry-sr-rule-cep = Политика эскалации конфликто
 guide-entry-sr-rule-ccp = Политика создания персонажей
 guide-entry-sr-rule-pana = Препятствование аресту неантагонистами
 guide-entry-improvised-grenade-casing = Improvised grenade casing
+guide-entry-detonator-triggers = Explosive cord and triggers
--- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
@ -1,4 +1,4 @@
-## Targets
+## Targets

 uplink-core-extraction-toolbox-name = Core Extraction Toolbox
 uplink-core-extraction-toolbox-desc = A toolbox containing everything you need to remove a nuclear bomb's plutonium core. Instructions not included.
@ -149,3 +149,4 @@ uplink-energy-dome-desc = A personal shield generator that protects the wearer f
 uplink-syndicate-teleporter-name = Hand syndicate teleporter
 uplink-syndicate-teleporter-desc = An experimental hand teleporting device. Teleports its owner forward in a small area. Be careful not to end up in the wall.

+
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/armor.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/armor.ftl
@ -31,7 +31,7 @@ ent-ClothingOuterArmorAmberNewJan = { ent-ClothingOuterArmorAmberJan }
 ent-ClothingOuterArmorAbductor = жилет абдуктора
    .desc = { ent-ClothingOuterArmorBasic.desc }
 ent-ClothingOuterArmorPlate = плитоносец
-    .desc = Стандартный бронежилет типа II, обеспечивающий хорошую защиту от пуль и лазеров благодаря вставленным фронтальной и тыльной плитам, но не дающий особой защиты от остального.
+    .desc = Стандартный бронежилет типа II, обеспечивающий хорошую защиту от пуль благодаря вставленным фронтальной и тыльной плитам, но не дающий особой защиты от остального.
 ent-ClothingOuterArmorStab = противоножевой жилет
    .desc = Несмотря на название, это обычный бронежилет типа II, обеспечивающий хорошую защиту от ударов и колющих атак, но не более.
 ent-ClothingOuterArmorHeatAbsorb = теплозащитный жилет
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl
@ -76,6 +76,18 @@ ent-MobPirateT2ShotgunGlass = мушкетонщик пиратов
    .desc = Знает толк в дробовиках, вооружен мушкетоном. Меньше дробовик, больше ручная пушка. Стреляет всем, что влезло в ствол.
 ent-MobPirateT2Musket = мушкетер пиратов
    .desc = Пират вооруженый старинным мушкетом крупного калибра и штыком.
+ent-MobPirateT2MusketEMP = { ent-MobPirateT2Musket }
+    .suffix = ЭМИ
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketBlast = { ent-MobPirateT2Musket }
+    .suffix = Взрыв
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketFrag = { ent-MobPirateT2Musket }
+    .suffix = Осколки
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketPenetrator = { ent-MobPirateT2Musket }
+    .suffix = Бронебой
+    .desc = { ent-MobPirateT2Musket.desc }
 ent-MobPirateT2MachineCannon = ядромётчик пиратов
    .desc = Пират с ручной пушкой с ленточным питанием... Что?!.
 ent-MobPirateT2Mech = Большой Ярк
@ -130,3 +142,238 @@ ent-MobPirateT3Boss = Красный Черепень
    .desc = Тяжёлый боевой экзокостюм СССП разновидности «Дюранда». Медленный, но неумолимый. Вооружён старым пулемётом крупного калибра. Может выдать рывок, выпустить огонь или скрыться в дыму, сопровождая всё жутким смехом.
 ent-MobPirateT3Tachanka = Тачанка
    .desc = Пулемёт! Установлен и заряжен!
+
+# timed despawn variants reuse base names/descriptions
+ent-MobPirateT1KnifeTimed = { ent-MobPirateT1Knife }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Knife.desc }
+ent-MobPirateT1MonkeyKnuckleDustersTimed = { ent-MobPirateT1MonkeyKnuckleDusters }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyKnuckleDusters.desc }
+ent-MobPirateT1PickaxeTimed = { ent-MobPirateT1Pickaxe }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Pickaxe.desc }
+ent-MobPirateT1PistolTimed = { ent-MobPirateT1Pistol }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Pistol.desc }
+ent-MobPirateT1MosinTimed = { ent-MobPirateT1Mosin }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Mosin.desc }
+ent-MobPirateT1PKATimed = { ent-MobPirateT1PKA }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1PKA.desc }
+ent-MobPirateT1MonkeyFlareGunTimed = { ent-MobPirateT1MonkeyFlareGun }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyFlareGun.desc }
+ent-MobPirateT1MonkeyFlareGunCoinTimed = { ent-MobPirateT1MonkeyFlareGunCoin }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyFlareGunCoin.desc }
+ent-MobPirateT1MonkeyFlareGunIncendiaryTimed = { ent-MobPirateT1MonkeyFlareGunIncendiary }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyFlareGunIncendiary.desc }
+ent-MobPirateT1MonkeyFlareGunUraniumTimed = { ent-MobPirateT1MonkeyFlareGunUranium }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyFlareGunUranium.desc }
+ent-MobPirateT1ScrapSMGTimed = { ent-MobPirateT1ScrapSMG }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1ScrapSMG.desc }
+ent-MobPirateT1SMGTimed = { ent-MobPirateT1SMG }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1SMG.desc }
+ent-MobPirateT1FlintlockTimed = { ent-MobPirateT1Flintlock }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Flintlock.desc }
+ent-MobPirateT1MonkeyFireBombTimed = { ent-MobPirateT1MonkeyFireBomb }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyFireBomb.desc }
+ent-MobPirateT1MonkeyEDaggerTimed = { ent-MobPirateT1MonkeyEDagger }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1MonkeyEDagger.desc }
+ent-MobPirateT1HunterTimed = { ent-MobPirateT1Hunter }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Hunter.desc }
+ent-MobPirateT1HunterSmashTimed = { ent-MobPirateT1HunterSmash }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1HunterSmash.desc }
+ent-MobPirateT1BombardierFireTimed = { ent-MobPirateT1BombardierFire }
+    .suffix = Деспавн 20мин, Зажиг
+    .desc = { ent-MobPirateT1BombardierFire.desc }
+ent-MobPirateT1BombardierGlassTimed = { ent-MobPirateT1BombardierGlass }
+    .suffix = Деспавн 20мин, Картечь
+    .desc = { ent-MobPirateT1BombardierGlass.desc }
+ent-MobPirateT1BombardierPipeTimed = { ent-MobPirateT1BombardierPipe }
+    .suffix = Деспавн 20мин, Бомба
+    .desc = { ent-MobPirateT1BombardierPipe.desc }
+ent-MobPirateT1ECutlassTimed = { ent-MobPirateT1ECutlass }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1ECutlass.desc }
+ent-MobPirateT1EPickaxeTimed = { ent-MobPirateT1EPickaxe }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1EPickaxe.desc }
+ent-MobPirateT1PlasmaCutterTimed = { ent-MobPirateT1PlasmaCutter }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1PlasmaCutter.desc }
+ent-MobPirateT1ScrapRifleTimed = { ent-MobPirateT1ScrapRifle }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1ScrapRifle.desc }
+ent-MobPirateT1RifleTimed = { ent-MobPirateT1Rifle }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Rifle.desc }
+ent-MobPirateT1BorgAssaultTimed = { ent-MobPirateT1BorgAssault }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1BorgAssault.desc }
+ent-MobPirateT1BorgMiningTimed = { ent-MobPirateT1BorgMining }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1BorgMining.desc }
+ent-MobPirateT1BorgDerelictTimed = { ent-MobPirateT1BorgDerelict }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1BorgDerelict.desc }
+ent-MobPirateT2CutlassTimed = { ent-MobPirateT2Cutlass }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Cutlass.desc }
+ent-MobPirateT2ECutlassTimed = { ent-MobPirateT2ECutlass }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2ECutlass.desc }
+ent-MobPirateT2SledgehammerTimed = { ent-MobPirateT2Sledgehammer }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Sledgehammer.desc }
+ent-MobPirateT2GauntletDrillTimed = { ent-MobPirateT2GauntletDrill }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2GauntletDrill.desc }
+ent-MobPirateT2ShotgunTimed = { ent-MobPirateT2Shotgun }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Shotgun.desc }
+ent-MobPirateT2ShotgunMiniBallTimed = { ent-MobPirateT2ShotgunMiniBall }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2ShotgunMiniBall.desc }
+ent-MobPirateT2ShotgunGlassTimed = { ent-MobPirateT2ShotgunGlass }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2ShotgunGlass.desc }
+ent-MobPirateT2MusketTimed = { ent-MobPirateT2Musket }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketEMPTimed = { ent-MobPirateT2MusketEMP }
+    .suffix = Деспавн 20мин, ЭМИ
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketBlastTimed = { ent-MobPirateT2MusketBlast }
+    .suffix = Деспавн 20мин, Взрыв
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketFragTimed = { ent-MobPirateT2MusketFrag }
+    .suffix = Деспавн 20мин, Осколки
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MusketPenetratorTimed = { ent-MobPirateT2MusketPenetrator }
+    .suffix = Деспавн 20мин, Бронебой
+    .desc = { ent-MobPirateT2Musket.desc }
+ent-MobPirateT2MachineCannonTimed = { ent-MobPirateT2MachineCannon }
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2MachineCannon.desc }
+ent-MobPirateT2DoubleFlintlockTimed = { ent-MobPirateT2DoubleFlintlock }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2DoubleFlintlock.desc }
+ent-MobPirateT2DoubleRevolverTimed = { ent-MobPirateT2DoubleRevolver }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2DoubleRevolver.desc }
+ent-MobPirateT2RevolverCutlassTimed = { ent-MobPirateT2RevolverCutlass }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2RevolverCutlass.desc }
+ent-MobPirateT2GrapeshotTimed = { ent-MobPirateT2Grapeshot }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Grapeshot.desc }
+ent-MobPirateT2CannoballTimed = { ent-MobPirateT2Cannoball }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Cannoball.desc }
+ent-MobPirateT2MechTimed = { ent-MobPirateT2Mech }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Mech.desc }
+ent-MobPirateT2JuggernautTimed = { ent-MobPirateT2Juggernaut }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Juggernaut.desc }
+ent-MobPirateT3BolaTimed = { ent-MobPirateT3Bola }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Bola.desc }
+ent-MobPirateT3StunTimed = { ent-MobPirateT3Stun }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Stun.desc }
+ent-MobPirateT3Shield1984Timed = { ent-MobPirateT3Shield1984 }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Shield1984.desc }
+ent-MobPirateT3ShieldSMGTimed = { ent-MobPirateT3ShieldSMG }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3ShieldSMG.desc }
+ent-MobPirateT3DMRTimed = { ent-MobPirateT3DMR }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3DMR.desc }
+ent-MobPirateT3Rifle2Timed = { ent-MobPirateT3Rifle2 }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Rifle2.desc }
+ent-MobPirateT3RifleTimed = { ent-MobPirateT3Rifle }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Rifle.desc }
+ent-MobPirateT3LaserSMGTimed = { ent-MobPirateT3LaserSMG }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3LaserSMG.desc }
+ent-MobPirateT3LaserCannonTimed = { ent-MobPirateT3LaserCannon }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3LaserCannon.desc }
+ent-MobPirateT3RevolverTimed = { ent-MobPirateT3Revolver }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Revolver.desc }
+ent-MobPirateT3SMGTimed = { ent-MobPirateT3SMG }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3SMG.desc }
+ent-MobPirateT3L6Timed = { ent-MobPirateT3L6 }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3L6.desc }
+ent-MobPirateT3TachankaTimed = { ent-MobPirateT3Tachanka }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Tachanka.desc }
+ent-MobPirateT3RPDTimed = { ent-MobPirateT3RPD }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3RPD.desc }
+ent-MobPirateT3GrenadierTimed = { ent-MobPirateT3Grenadier }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Grenadier.desc }
+ent-MobPirateT3InfiltratorTimed = { ent-MobPirateT3Infiltrator }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Infiltrator.desc }
+ent-MobPirateT3SniperTimed = { ent-MobPirateT3Sniper }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Sniper.desc }
+ent-MobPirateT1BossTimed = { ent-MobPirateT1Boss }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT1Boss.desc }
+ent-MobPirateT2BossTimed = { ent-MobPirateT2Boss }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT2Boss.desc }
+ent-MobPirateT3BossTimed = { ent-MobPirateT3Boss }
+
+    .suffix = Деспавн 20мин
+    .desc = { ent-MobPirateT3Boss.desc }
+
+
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/implanters.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/implanters.ftl
@ -2,7 +2,7 @@ ent-SmokeScreenImplanter = { ent-Implanter }
    .desc = { ent-BaseImplantOnlyImplanterSyndi.desc }
    .suffix = Дым
 ent-CreepyLaughImplanter = { ent-Implanter }
-    .suffix = Санрайз, Смех
+    .suffix = Смех ужаса
    .desc = { ent-BaseImplantOnlyImplanterSyndi.desc }
 ent-RadioImplanterFreelance = { ent-Implanter }
    .suffix = Фриланс, радио
@ -11,5 +11,5 @@ ent-DeathRattleImplanterFreelance = { ent-Implanter }
    .suffix = Фриланс, предсмертный хрип
    .desc = { ent-BaseImplantOnlyImplanterSyndi.desc }
 ent-ScramImplanterProto = { ent-ScramImplanter }
-    .suffix = прототип
+    .suffix = прототип побег
    .desc = { ent-ScramImplanter.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
@ -1,6 +1,6 @@
-ent-BaseMagazinePistolCaselessRifleExtended = расширенный пистолетный магазин (.20 безгильзовый)
+ent-BaseMagazinePistolCaselessRifleExtended = расширенный пистолетный магазин (.25 безгильзовый)
    .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
 ent-MagazineCannonBallMini = чемодан с ядрами
    .desc = Чемодан для аккуратного хранения ядер от пиратской пушки с ленточной подачей.
-ent-MagazinePistolSubMachineGunCaselessExtended = Расширенный магазин (.20 безгильзовые)
+ent-MagazinePistolSubMachineGunCaselessExtended = Расширенный магазин (.25 безгильзовые)
    .desc = { ent-BaseMagazineLightRifle.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/sniper.ftl
@ -14,23 +14,24 @@ ent-MagazineBauer127Frag = магазин (15мм осколочные)
    .desc = Большой магазин для тяжёлого оружия, вмещает патроны 15x115 мм осколочного действия.
 ent-MagazineBauer127Emp = магазин (15мм ЭМИ)
    .desc = Большой магазин для тяжёлого оружия, вмещает патроны 15x115 мм ЭМИ действия.
-ent-BaseMagazineDragunov = магазин Драгунова (7,62ммR)
+ent-BaseMagazineDragunov = магазин (7,62ммR)
    .desc = { ent-BaseItem.desc }
-ent-MagazineDragunovExtended = магазин Драгунова (7,62ммR)
-    .suffix = Восход
+ent-MagazineDragunovExtended = магазин (7,62ммR)
    .desc = { ent-BaseMagazineDragunov.desc }
-ent-MagazineDragunov = магазин Драгунова (7,62ммR)
-    .suffix = Восход
+ent-MagazineDragunovSP = магазин (7,62ммR SP)
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovHP = магазин (7,62ммR HP)
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunovFMJ = магазин (7,62ммR FMJ)
+    .desc = { ent-BaseMagazineDragunov.desc }
+ent-MagazineDragunov = магазин (7,62ммR)
    .desc = { ent-BaseMagazineDragunov.desc }
 ent-MagazineDragunovEmpty = магазин (7,62ммR любой)
-    .suffix = Восход, пустой
+    .suffix = пустой
    .desc = { ent-MagazineDragunov.desc }
 ent-MagazineDragunovIncendiary = магазин (7,62ммR зажигательные)
-    .suffix = Восход
    .desc = { ent-MagazineDragunov.desc }
 ent-MagazineDragunovPractice = магазин (7,62ммR учебные)
-    .suffix = Восход
    .desc = { ent-BaseMagazineDragunov.desc }
 ent-MagazineDragunovUranium = магазин (7,62ммR урановые)
-    .suffix = Восход
    .desc = { ent-BaseMagazineDragunov.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl
@ -27,7 +27,7 @@ ent-WeaponPistolDeagleMetus = Desert Eagle Metus
    .desc = На рукояти потёртости от старых рук, тяжёлое и уверенное, как приговор, что не раз выносился без разбирательств.
    .suffix = Санрайз
 ent-WeaponRevolverSpearhead = Авангард
-    .desc = Громоздкий авторевольвер револьвер, который иногда используется штурмовыми отрядами и офицерами спецподразделений, а также гражданскими правоохранительными органами. Стреляет патронами .45 Магнум.
+    .desc = Громоздкий авторевольвер, который иногда используется штурмовыми отрядами и офицерами спецподразделений, а также гражданскими правоохранительными органами. Стреляет патронами .45 Магнум.
 ent-WeaponRevolverSpearheadBlack = Авангард
    .desc = { ent-WeaponRevolverSpearhead.desc }
 ent-WeaponPistolM1984 = D1984
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/misc.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/misc.ftl
@ -78,6 +78,12 @@ ent-CableDet = взрывной шнур
 ent-CableDetStack = взрывной шнур
    .desc = Взрывной шнур, чтобы убрать всё, что стоит на пути.
    .suffix = Полный
+ent-CableDetStack10 = { ent-CableDetStack }
+    .desc = { ent-CableDetStack.desc }
+    .suffix = 10
+ent-CableDetStack1 = { ent-CableDetStack }
+    .desc = { ent-CableDetStack.desc }
+    .suffix = 1

 ent-ParcelWrapAdmeme = блюспейс-обёртка
    .desc = Бумага для упаковки предметов при транспортировке. Эта, кажется, способна прятать внутри подозрительно много пространства.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/guidebook/guides.ftl
@ -2,6 +2,7 @@

 guide-entry-ammunition = Боеприпасы
 guide-entry-improvised-grenade-casing = Самодельная граната (корпус)
+guide-entry-detonator-triggers = Взрывной шнур и триггеры

 guide-entry-disease = Разумная болезнь
 guide-entry-expeditions = Экспедиции
--- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
@ -33,6 +33,10 @@ uplink-magazine-bauer127-extended-desc = Магазин для Bauer127. Сод
 uplink-magazine-dl6902-name = Короб-магазин DL6902 (7,62мм)
 uplink-magazine-dl6902-desc = Магазин для Dl6902. Содержит 200 патронов калибра 7,62х39мм.
 uplink-magazine-dragunov-desc = Магазин для Драгунова. Содержит 10 патронов калибра 7,62х54R.
+uplink-magazine-dragunov-sp-desc = Магазин для Драгунова. Содержит 10 патронов SP калибра 7,62х54R.
+uplink-magazine-dragunov-hp-desc = Магазин для Драгунова. Содержит 10 патронов HP калибра 7,62х54R.
+uplink-magazine-dragunov-fmj-desc = Магазин для Драгунова. Содержит 10 патронов FMJ калибра 7,62х54R.
+uplink-magazine-dragunov-incendiary-desc = Магазин для Драгунова. Содержит 10 зажигательных патронов калибра 7,62х54R.
 uplink-magazine-dragunov-extended-desc = Магазин для Драгунова. Содержит 20 патронов калибра 7,62х54R.
 uplink-magazine-bulldog-uraniumslug-desc = Барабанный магазин на 8 урановых пулевых патронов. Совместим с "Бульдогом".
 uplink-magazine-bulldog-uranium-desc = Барабанный магазин на 8 патронов урановой дроби, легко поражает экипаж нанотрейзен лучевой болезнью.
@ -46,10 +50,10 @@ uplink-skm24-ammo-desc = Винтовочный магазин на 30 патр
 uplink-estoc-ammo-name = Магазин для винтовки (.20)
 uplink-estoc-ammo-desc = Магазин на 25 патронов. Совместим с Эсток.
 ## Weapon (Sunrise)
-uplink-c40r-name = C-40r
-uplink-c40r-desc = Безгильзовый пистолет-пулемёт C-40r, великолепно работает на ближней дистанции.
 uplink-c40r-bundle-name = Набор "C-40r"
-uplink-c40r-bundle-desc = Включает C-40r вместе с несколькими магазинами для быстрой перестрелки.
+uplink-c40r-bundle-desc = Более старый: Культовый пистолет-пулемет C-40r в комплекте с тремя магазинами тяжелого калибра.
+uplink-c40r-name = C-40r биокодированный
+uplink-c40r-desc = Культовый пистолет-пулемет C-40r в комплекте с коробкой стандартных патронов 40-го калибра.

 uplink-magazine-127-desc = Магазин Bauer SR-127 на 7 патронов предназначеных для уничтожения мехов, киборгов или стркутур таких как решетки и окна, пары попаданий достаточно для пролома стены.
 uplink-magazine-127pen-desc = Магазин Bauer SR-127 на 7 патронов предназначеных для ликвидации защищенных противников а так же целей за укрытиями и стенами, прекрасно сочетаются с термальным зрением.
@ -203,7 +207,7 @@ uplink-smoke-screen-implanter-desc = Создает небольшое обла
 uplink-creepy-laugh-implanter-name = Имплантер Жуткого Смеха
 uplink-creepy-laugh-implanter-desc = Аудиоимплант, воспроизводящий фирменный смех синди-киборга. Раздражает, пугает, стиль гарантирован.
 uplink-scram-implanter-proto-name = Имплантер Прототип-Побег
-uplink-scram-implanter-proto-desc = Имплант на 2 заряда с огромной перезарядкой в 20 минут. Телепортирует вас в крупном радиусе, пытается перенести на свободную клетку, иногда может сбоить. Он точно безопасен?
+uplink-scram-implanter-proto-desc = Имплант с й зарядом и огромной перезарядкой в 15 минут. Телепортирует вас в крупном радиусе, пытается перенести на свободную клетку, иногда может сбоить. Он точно безопасен?

 ## Ammo Kits and Bundle

--- a/Resources/Locale/ru-RU/_strings/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/ru-RU/_strings/ghost/roles/ghost-role-component.ftl
@ -1,4 +1,4 @@
-# also used in MakeGhostRuleWindow and MakeGhostRoleCommand
+# also used in MakeGhostRuleWindow and MakeGhostRoleCommand
 ghost-role-component-default-rules =
    Вы не помните ничего из своей предыдущей жизни, если администратор не сказал вам обратное.
                                     Вы не помните ничего из своей предыдущей жизни и не помните ничего из того, что узнали, будучи призраком.
@ -292,3 +292,9 @@ ghost-role-information-artifact-description = Осуществляйте сво
 ghost-role-information-syndie-assaultborg-name = Штурмовой киборг Синдиката
 ghost-role-information-syndie-assaultborg-description = Ядерным оперативникам требуется подкрепление. Вы, хладнокремниевая машина для убийств, будете им помогать. Больше дакки!
 ghost-role-information-expedition-pirate-rules = Вы [color=red][bold]Умный Пират[/bold][/color] более умный ваших товарищей, не дайте утилизаторам вас ограбить. Вам [color=red][bold]запрещено[/bold][/color] покидать комплекс и саму экспедицию на шаттле.
+ghost-role-information-rules-expedition-pirate-antagonist =
+    Вы — [color=red][bold]NPC-пират[/bold][/color]. Ваши намерения вредят станции и её экипажу.
+    Вы должны [bold]защищать[/bold] свою территорию и сотрудничать с другими пиратами.
+    Вам [color=green][bold]можно[/bold][/color] покинуть экспедицию на шаттле, но [color=red][bold]только[/bold][/color] если [color=orange][bold]утилизаторы[/bold][/color] (живые или мёртвые) находятся на шаттле.
+    Помните, что вы как [color=red][bold]NPC-пират[/bold][/color] [bold]ограничены[/bold] временем: через [color=red][bold]20 минут[/bold][/color] вас автоматически переместят в наблюдателя.
+    Вы не помните ничего из своей предыдущей жизни и не помните ничего из того, что узнали, будучи призраком.
--- a/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/store/uplink-catalog.ftl
@ -211,16 +211,10 @@ 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-c40r-name = C-40r биокодированный
-uplink-c40r-desc = Культовый пистолет-пулемет C-40r в комплекте с коробкой стандартных патронов 40-го калибра.
 uplink-bulldog-bundle-name = Набор "Бульдог"
 uplink-bulldog-bundle-desc = Простой и надёжный: содержит популярный дробовик Бульдог, барабан пуль и три барабана дроби а так же термальный визор.
 uplink-grenade-launcher-china-lake-name = Набор "China-Lake"
 uplink-grenade-launcher-china-lake-desc = Старый гранатомёт China-Lake и сумкой запасных снарядов. Может стрелять как контактными, так и неконтактными гранатами.
-uplink-grenade-launcher-m79-bundle-name = Набор "М79"
-uplink-grenade-launcher-m79-bundle-desc = Набор однозарядного гранатомёта вместе с сумкой запасных снарядов, чтобы начать гранатомётную вечеринку в джунглях.
 uplink-grenade-launcher-gl70-name = Набор "GL-70"
 uplink-grenade-launcher-gl70-desc = Набор с многозарядным автоматическим гранатомётом с барабаном на 6 снарядов и сумкой запасных снарядов. Может стрелять как контактными, так и неконтактными гранатами.
 uplink-l6-saw-bundle-name = Набор "L6 Saw"
--- a/Resources/Maps/_Sunrise/Shuttles/Salvage/oredozer.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/Salvage/oredozer.yml
@ -655,15 +655,7 @@ entities:
    - type: GridPathfinding
    - type: ImplicitRoof
    - type: ExplosionAirtightGrid
- proto: AirlockExternalGlassNukeopLocked
-  entities:
-  - uid: 344
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,2.5
-      parent: 1
- proto: AirlockExternalNukeopLocked
+- proto: AirlockExternalGlassCargoLocked
  entities:
  - uid: 83
    components:
@ -739,6 +731,12 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -4.5,-6.5
      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,2.5
+      parent: 1
 - proto: AirlockSalvageLocked
  entities:
  - uid: 4
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@ -148,10 +148,9 @@
    maxCharges: 3
  # Sunrise-Start
  - type: AutoRecharge
-    rechargeDuration: 600
+    rechargeDuration: 300
  # Sunrise-End
  - type: Action
-    useDelay: 5 # Sunrise-Edit
    checkCanInteract: false
    itemIconStyle: BigAction
    priority: -20
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@ -34,9 +34,6 @@
  - type: ArmorSparkEffect #starlight
  - type: StaminaResistance # Sunrise-Add
    damageCoefficient: 0.9 # Sunrise-Add
-  - type: Item
-    shape:
-    - 0,0,2,2
  # Sunrise-End

 #Standard armor vest, allowed for security and bartenders
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@ -300,7 +300,7 @@
    walkModifier: 0.8
    sprintModifier: 0.8
  - type: HeldSpeedModifier
-  - type: EmpImmune # Мехи теперь имеют прямой урон от ЭМИ.
+  #- type: EmpImmune # Мехи теперь имеют прямой урон от ЭМИ. Sunrise-Edit: Комент до Фикса Вайтлистов батарей

 - type: entity
  id: PowerCageSmall
@ -355,6 +355,7 @@
  - type: Battery
    maxCharge: 6200
    startingCharge: 6200
+  - type: EmpImmune # Sunrise-Edit: "Эдит" до Фикса Вайтлистов батарей, потом удалим

 - type: entity
  id: PowerCageSmallEmpty
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml
@ -40,7 +40,7 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_plasmacutter
  - type: Gun
-    fireRate: 0.35
+    fireRate: 0.45
    projectileSpeed: 22
    selectedMode: SemiAuto
    availableModes:
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@ -235,6 +235,7 @@
  name: Ripley APLU
  description: Versatile and lightly armored, the Ripley is useful for almost any heavy work scenario. The "APLU" stands for Autonomous Power Loading Unit.
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -292,6 +293,7 @@
  name: Ripley APLU MK-II
  description: The "MK-II" has a pressurized cabin for space operations, but the added weight has slowed it down.
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -421,6 +423,7 @@
  name: H.O.N.K.
  description: "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!"
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -478,6 +481,7 @@
  name: HAMTR
  description: "An experimental mech which uses a brain–computer interface to connect directly to a hamsters brain."
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -534,6 +538,7 @@
  name: Vim
  description: A miniature exosuit from Nanotrasen, developed to let the irreplaceable station pets live a little longer.
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -623,6 +628,7 @@
  name: Gygax
  description: While lightly armored, the Gygax has incredible mobility thanks to its ability that lets it smash through walls at high speeds.
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -690,6 +696,7 @@
  name: Durand
  description: A slow but beefy combat exosuit that is extra scary in confined spaces due to its punches. Xenos hate it!
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -765,6 +772,7 @@
  name: Marauder
  description: Looks like we're all saved. # ERT mech
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -854,6 +862,7 @@
  name: Seraph
  description: That's the last thing you'll see.
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -946,6 +955,7 @@
  name: Dark Gygax
  description: A modified Gygax used for nefarious purposes. On the back of the armor plate there is an inscription "Cybersun Inc."
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
@ -1037,6 +1047,7 @@
  name: Mauler
  description: A modified Marauder used by the Syndicate that's not as maneuverable as the Dark Gygax, but it makes up for that in armor and sheer firepower. On the back of the armor plate there is an inscription "Cybersun Inc."
  components:
+  - type: FootprintEmitter # Sunrise-Add
  - type: Sprite
    drawdepth: Mobs
    noRot: true
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/cord.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/cord.yml
@ -75,6 +75,11 @@
      # - Window
      # - Wall
  # - type: StickyVisualizer
+  # Sunrise-Start
+  - type: GuideHelp
+    guides:
+    - SunriseDetonatorTriggers
+  # Sunrise-End

 - type: entity
  parent: CableDetStack
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/detonator.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/detonator.yml
@ -47,6 +47,11 @@
          Unprimed: { state: complete }
  - type: StaticPrice
    price: 25
+  # Sunrise-Start
+  - type: GuideHelp
+    guides:
+    - SunriseDetonatorTriggers
+  # Sunrise-End

 - type: entity
  parent: EmptyDetonator
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@ -40,3 +40,8 @@
        volume: -1
  - type: StaticPrice
    price: 1
+  # Sunrise-Start
+  - type: GuideHelp
+    guides:
+    - SunriseAmmunition
+  # Sunrise-End
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@ -555,7 +555,7 @@
    damage:
      types:
        Blunt: 25
-        Structural: 30
+        Structural: 20
  # Short lifespan
  - type: TimedDespawn
    lifetime: 0.275 # roughly 6.5 tiles
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@ -124,6 +124,9 @@
          - type: Gravity
            enabled: true
            inherent: true
+          - type: IFF
+            flags: HideLabel
+            color: "#d67e27"
          protos:
          - VGRoid

--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@ -1,6 +1,6 @@
 - type: entity
  id: Airlock
-  parent: BaseStructure
+  parent: [BaseStructure, BaseDeltaPressurePlasma]
  name: airlock
  description: It opens, it closes, and maybe crushes you.
  components:
@ -205,7 +205,7 @@

 - type: entity
  id: AirlockGlass
-  parent: Airlock
+  parent: [Airlock, BaseDeltaPressureReinforcedPlasmaQuarter]
  name: glass airlock
  components:
  - type: MeleeSound
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@ -39,7 +39,7 @@
    thresholds:
    - trigger:
        !type:DamageTrigger
-        damage: 120
+        damage: 75 # Sunrise-Edit
      behaviors:
      - !type:DoActsBehavior
        acts: ["Destruction"]
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@ -1007,7 +1007,7 @@
        density: 2000

 - type: entity
-  parent: BaseWall
+  parent: [BaseWall, BaseDeltaPressurePlasma]
  id: WallSolid
  name: solid wall
  components:
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@ -257,7 +257,7 @@
    selectionTime: IntraPlayerSpawn
    definitions:
    - prefRoles: [ Traitor ]
-      max: 8
+      max: 13 # Sunrise-Edit
      playerRatio: 10
      pickCommandStaff: true # Sunrise-Edit
      maxCommandStaff: 1 # Sunrise-Edit
--- a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
@ -8,8 +8,15 @@
  - MagazineShotgunEmpty
  - MagazineShotgunSlug
  - MagazinePistolCaselessRifle
+  - MagazinePistolSubMachineGunCaselessExtended
  - MagazineBoxAntiMateriel
  # Sunrise-start
  - MagazineRifleBoxSP
  - MagazineRifleBoxFMJ
+  - MagazinePistol40SubMachineGunSP
+  - MagazinePistol40SubMachineGunHP
+  - MagazinePistol40SubMachineGunFMJ
+  - MagazineDragunovSP
+  - MagazineDragunovHP
+  - MagazineDragunovFMJ
  # Sunrise-end
--- a/Resources/Prototypes/_Sunrise/Actions/implants.yml
+++ b/Resources/Prototypes/_Sunrise/Actions/implants.yml
@ -5,9 +5,9 @@
  description: Randomly teleports you within a large distance.
  components:
  - type: LimitedCharges
-    maxCharges: 2
+    maxCharges: 1
  - type: AutoRecharge
-    rechargeDuration: 1200
+    rechargeDuration: 900
  - type: Action
    checkCanInteract: false
    useDelay: 10
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
@ -137,7 +137,7 @@
    containers:
      storagebase: !type:AllSelector
        children:
-        - id: MagazineDragunov
+        - id: MagazineDragunovSP
          amount: 2
        - id: MagazineDragunovExtended
          amount: 2
@ -449,3 +449,4 @@
      orGroup: RapierToxin
    - id: ChemistryBottleLead
      orGroup: RapierToxin
+
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/ussp.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/ussp.yml
@ -1,4 +1,4 @@
- type: entity
+- type: entity
  parent: CrateGeneric
  id: CrateAmmunitionSmall
  name: old small ammunition crate
@ -69,7 +69,7 @@
  - type: StorageFill
    contents:
      - id: WeaponSniperDragunov
-      - id: MagazineDragunov
+      - id: MagazineDragunovSP
        amount: 2
      - id: MagazineDragunovIncendiary
        amount: 2
@ -231,3 +231,4 @@
    - Recyclable
    - WrappedWeapon

+
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/briefcases.yml
@ -52,8 +52,9 @@
        children:
        - id: WeaponSniperDragunov
        - id: MagazineDragunovIncendiary
-        - id: MagazineDragunovUranium
-        - id: MagazineDragunov
+        - id: MagazineDragunovSP
+        - id: MagazineDragunovHP
+        - id: MagazineDragunovFMJ

 - type: entity
  id: BriefcaseWeaponM79Filled
--- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml
@ -342,7 +342,7 @@
    MagazineBoxHeavyRifleIncendiary: 3
    MagazineBoxHeavyRifleUranium: 3
    MagazineBR64: 5
-    MagazineDragunov: 5
+    MagazineDragunovSP: 5
    MagazineBauer127: 5
    MagazineBoxAntiMateriel: 3
    # LMG Ammo
--- a/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml
@ -1127,7 +1127,7 @@
  id: UplinkPirateMagDragunov
  description: uplink-magazine-dragunov-desc
  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi, state: base }
-  productEntity: MagazineDragunov
+  productEntity: MagazineDragunovSP
  cost:
    Doubloon: 6
  categories:
--- a/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
@ -1316,7 +1316,7 @@
  name: uplink-sunrise-clothing-neck-cloak-black-sec-name
  productEntity: ClothingNeckCloakBlackSec
  cost:
-    Suntick: 15
+    Suntick: 20
  categories:
  - SecurityThings
  conditions:
@ -1331,22 +1331,7 @@
  name: uplink-sunrise-weapon-disabler-name
  productEntity: WeaponDisabler
  cost:
-    Suntick: 10
-  categories:
-  - SecurityThings
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-  - !type:BuyerDepartmentCondition
-    whitelist:
-    - Security
-
- type: listing
-  id: UplinkSunriseClothingOuterArmorBulletproof
-  name: uplink-sunrise-clothing-outer-armor-bulletproof-name
-  productEntity: ClothingOuterArmorBulletproof
-  cost:
-    Suntick: 10
+    Suntick: 15
  categories:
  - SecurityThings
  conditions:
--- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
@ -48,6 +48,9 @@
  productEntity: PouchAmmo
  categories:
  - UplinkWearables
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 2

 - type: listing
  id: UplinkPouchExplosive
@ -512,14 +515,44 @@

 - type: listing
  id: UplinkMagazineDragunov
-  description: uplink-magazine-dragunov-desc
+  description: uplink-magazine-dragunov-sp-desc
  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi, state: base }
-  productEntity: MagazineDragunov
+  productEntity: MagazineDragunovSP
  cost:
    Telecrystal: 1
  categories:
  - UplinkAmmo

+- type: listing
+  id: UplinkMagazineDragunovHP
+  description: uplink-magazine-dragunov-hp-desc
+  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi, state: base }
+  productEntity: MagazineDragunovHP
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazineDragunovFMJ
+  description: uplink-magazine-dragunov-fmj-desc
+  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi, state: base }
+  productEntity: MagazineDragunovFMJ
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazineDragunovIncendiary
+  description: uplink-magazine-dragunov-incendiary-desc
+  icon: { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Rifle/dragunov_mag.rsi, state: base }
+  productEntity: MagazineDragunovIncendiary
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkAmmo
+
 - type: listing
  id: UplinkMagazineDragunovExtended
  description: uplink-magazine-dragunov-extended-desc
@ -819,12 +852,9 @@
  id: UplinkBoomboxBundle
  name: uplink-music-boombox-name
  description: uplink-music-boombox-desc
-  productEntity: ClothingBackpackDuffelBoomboxBundle
-  discountCategory: usualDiscounts
-  discountDownTo:
-    Telecrystal: 2
+  productEntity: BoomboxSyndie
  cost:
-    Telecrystal: 4
+    Telecrystal: 2
  categories:
  - UplinkPointless

@ -2003,7 +2033,7 @@
 # Implats

 - type: listing
-  id: UplinkSmokeScreenImplanter  #PR Wiz #31782
+  id: UplinkSmokeScreenImplanter
  name: uplink-smoke-screen-implanter-name
  description: uplink-smoke-screen-implanter-desc
  icon: { sprite: Objects/Weapons/Grenades/smoke.rsi, state: icon }
@ -2051,9 +2081,9 @@
  productEntity: LauncherCreamPieFake
  discountCategory: usualDiscounts
  discountDownTo:
-    Telecrystal: 6
+    Telecrystal: 4
  cost:
-    Telecrystal: 8
+    Telecrystal: 5
  categories:
  - UplinkJob
  conditions:
@ -2067,7 +2097,7 @@
  description: uplink-heavy-cleanade-desc
  productEntity: CleanerGrenadeAcidBox
  cost:
-    Telecrystal: 4
+    Telecrystal: 3
  categories:
  - UplinkJob
  conditions:
@ -2152,9 +2182,9 @@
  productEntity: LauncherSyringeRapid
  discountCategory: rareDiscounts
  discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 1
  cost:
-    Telecrystal: 3
+    Telecrystal: 2
  categories:
  - UplinkJob
  conditions:
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml
@ -362,7 +362,7 @@
  parent: ClothingOuterArmorBasic
  id: ClothingOuterArmorPlate
  name: plate carrier
-  description: A standard Type II armored vest that provides good protection against bullets and lasers with the help of a plate inserted in the back and front, but not much else.
+  description: A standard Type II armored vest that provides good protection against bullets with the help of a plate inserted in the back and front, but not much else.
  components:
  - type: Pierceable
    level: Metal
--- a/Resources/Prototypes/_Sunrise/Entities/Effects/overlays.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Effects/overlays.yml
@ -27,8 +27,8 @@
  components:
  - type: PointLight
    color: "#D6E4FF"
-    energy: 0.1
-    radius: 7
+    energy: 0.05
+    radius: 6
    softness: 20

 - type: entity
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
@ -7,6 +7,9 @@
    selectedBorgType: security
  - type: Loadout
    prototypes: [ BorgArmorSiliconLoadoutMk2 ]
+  - type: Tag
+    tags:
+    - NoPaint

 - type: entity
  id: BorgChassisPeace
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/prunks.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/prunks.yml
@ -66,6 +66,9 @@
  parent: ToySword
  components:
  - type: Wieldable
+  - type: ItemToggle
+    onUse: false
+    onActivate: false
  - type: Sprite
    sprite: Objects/Weapons/Melee/e_sword_double.rsi
    layers:
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
@ -331,6 +331,9 @@
    containers:
      mech-battery-slot:
      - PowerCageMedium
+  - type: Tag
+    tags:
+    - DoorBumpOpener # No paint unique ripley

 # Ripley MK-II "Death"
 - type: entity
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml
@ -264,13 +264,67 @@
      - state: inhand-right-mag

 - type: entity
-  id: MagazineDragunov
-  name: "magazine Dragunov (7,62mmR)"
+  id: MagazineDragunovSP
+  name: "magazine Dragunov (7,62mmR SP)"
  suffix: Sunrise
  parent: BaseMagazineDragunov
  components:
  - type: BallisticAmmoProvider
    proto: CartridgeHeavyRifleRSP
+  - 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: MagazineDragunovHP
+  name: "magazine Dragunov (7,62mmR HP)"
+  suffix: Sunrise
+  parent: BaseMagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyRifleRHP
+  - 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: MagazineDragunovFMJ
+  name: "magazine Dragunov (7,62mmR FMJ)"
+  suffix: Sunrise
+  parent: BaseMagazineDragunov
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeHeavyRifleRFMJ
  - type: Sprite
    layers:
    - state: base
@ -288,7 +342,7 @@
  id: MagazineDragunovEmpty
  name: "magazine (7,62mmR any)"
  suffix: Sunrise, empty
-  parent: MagazineDragunov
+  parent: MagazineDragunovSP
  components:
  - type: BallisticAmmoProvider
    proto: null
@ -309,7 +363,7 @@
  id: MagazineDragunovIncendiary
  name: "magazine (7,62mmR incendiary)"
  suffix: Sunrise
-  parent: MagazineDragunov
+  parent: MagazineDragunovSP
  components:
  - type: BallisticAmmoProvider
    proto: CartridgeHeavyRifleRIncendiary
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@ -912,9 +912,9 @@
    impactEffect: BulletImpactEffectKinetic
    damage:
      types:
-        Heat: 14
-        Slash: 14
-        Structural: 30
+        Heat: 13
+        Slash: 13
+        Structural: 23
    penetrationThreshold: 800
    penetrationDamageTypeRequirement:
    - Structural
@ -926,8 +926,6 @@
    radius: 2.5
    color: "#dd16d395"
    energy: 0.5
-  - type: GatheringProjectile
-    amount: 6

 - type: entity
  name: wide plasma barrage
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@ -488,14 +488,14 @@
  - type: Wieldable
    unwieldOnUse: false
  - type: GunWieldBonus
-    minAngle: -2.5
+    minAngle: -3
    maxAngle: -25
  - type: Gun
-    minAngle: 5.5
+    minAngle: 6
    maxAngle: 45
-    angleIncrease: 2.75
-    angleDecay: 20
-    fireRate: 7
+    angleIncrease: 2.5
+    angleDecay: 18
+    fireRate: 6
    selectedMode: FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@ -1,4 +1,4 @@
- type: entity
+- type: entity
  name: Dragunov
  parent: [ BaseWeaponRifle, BaseGunWieldable ]
  id: WeaponSniperDragunov
@ -39,13 +39,13 @@
    slots:
      gun_magazine:
        name: Magazine
-        startingItem: MagazineDragunov
+        startingItem: MagazineDragunovSP
        insertSound: /Audio/_Sunrise/Weapons/Guns/Snipers/Dragunov/dragunov_reload.ogg
        ejectSound: /Audio/_Sunrise/Weapons/Guns/Snipers/Dragunov/dragunov_unload.ogg
        priority: 2
        whitelist:
          tags:
-            - MagazineDragunov
+            - MagazineDragunovSP
      gun_chamber:
        name: Chamber
        startingItem: CartridgeHeavyRifleRFMJ
@ -321,3 +321,4 @@
  - type: Tag
    tags:
      - WrappedWeapon
+
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/e_pickaxe.yml
@ -16,7 +16,7 @@
        types:
          Heat: 8
          Piercing: 2
-          Structural: 30
+          Structural: 25
    deactivatedSecret: true
  - type: Sprite
    sprite: _Sunrise/Objects/Weapons/Melee/energy_pickaxe.rsi
@ -48,8 +48,8 @@
        shader: unshaded
  - type: Reflect
    reflectProb: 0.1
-  - type: Tag
-    tags:
-    - Pickaxe
+  # - type: Tag
+  #   tags:
+  #   - Pickaxe
  - type: StaticPrice
    price: 1200
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml
@ -9,7 +9,7 @@

 - type: entity
  id: DoubleGlassAirlock
-  parent: AirlockGlass
+  parent: [AirlockGlass, BaseDeltaPressureReinforcedPlasmaQuarter]
  name: double glass airlock
  components:
  - type: MeleeSound
@ -42,7 +42,7 @@

 - type: entity
  id: TripleGlassAirlock
-  parent: AirlockGlass
+  parent: [AirlockGlass, BaseDeltaPressureReinforcedPlasmaQuarter]
  name: triple glass airlock
  description: It opens, it closes, and maybe crushes you, but it bigger than normal door.
  components:
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/bombs.yml
@ -52,13 +52,16 @@
  suffix: Bomb
  components:
    - type: Sprite
-      sprite: _Sunrise/Objects/Weapons/Bombs/Pizzabomb.rsi
+      sprite: _Sunrise/Objects/Weapons/Bombs/pizzabomb.rsi
    - type: TwoStageTrigger #Trigger the sound trigger, delay, then explode
      triggerDelay: 0.5
      components:
        - type: ExplodeOnTrigger # Explode after the delay
          keysIn:
            - stageTwo
+    - type: Item
+      sprite: _Sunrise/Objects/Weapons/Bombs/pizzabomb.rsi
+      heldPrefix: box
    - type: EmitSoundOnTrigger
      sound: /Audio/Machines/microwave_done_beep.ogg
    - type: TriggerOnUiOpen # Timer is triggered on storage open
--- a/Resources/Prototypes/_Sunrise/Guidebook/detonator_triggers.yml
+++ b/Resources/Prototypes/_Sunrise/Guidebook/detonator_triggers.yml
@ -0,0 +1,5 @@
+- type: guideEntry
+  id: SunriseDetonatorTriggers
+  name: guide-entry-detonator-triggers
+  text: "/ServerInfo/Guidebook/_Sunrise/DetonatorTriggers.xml"
+  priority: 6
--- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml
+++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml
@ -1,6 +1,27 @@
 # Gloves with fake weapon visuals for NPCs
 - type: entity
-  parent: ClothingHandsBase
+  abstract: true
+  parent: BaseItem
+  id: ClothingHandsBaseNPC
+  components:
+  - type: Clothing
+    slots: [gloves]
+    equipSound:
+      path: /Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg
+      params:
+        volume: -4
+        maxDistance: 3
+  - type: DamageOnInteractProtection
+    damageProtection:
+      flatReductions:
+        Heat: 5
+  - type: Insulated
+  - type: Unremoveable
+  - type: FireProtection
+    reduction: 0.5
+
+- type: entity
+  parent: ClothingHandsBaseNPC
  id: ClothingHandsNoGloves
  name: combat gloves
  abstract: true
@ -8,27 +29,17 @@
  - type: Unremoveable
  - type: FireProtection
    reduction: 0.5
-  - type: MeleeWeapon #Sunrise-start
-    attackRate: 1.5
+  - type: MeleeWeapon
+    attackRate: 1.25
    damage:
      types:
        Blunt: 10
-        Structural: 10
-    bluntStaminaDamageFactor: 1.5
+        Structural: 20
+    bluntStaminaDamageFactor: 1
    soundHit:
      collection: Punch
    animation: WeaponArcFist
-    mustBeEquippedToUse: true #Sunrise-end
-
- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsNoGlovesNoDamage
-  abstract: true
-  components:
-  - type: Insulated
-  - type: Unremoveable
-  - type: FireProtection
-    reduction: 0.5
+    mustBeEquippedToUse: true

 - type: entity
  parent: ClothingHandsNoGloves
@ -43,8 +54,8 @@
    wideAnimationRotation: -135
    damage:
      types:
-        Blunt: 8
-        Structural: 10
+        Blunt: 10
+        Structural: 20
    bluntStaminaDamageFactor: 3.0
    soundHit:
      collection: MetalThud
@ -104,7 +115,7 @@
      types:
        Slash: 10
        Heat: 12
-        Structural: 15
+        Structural: 25
    soundHit:
      path: /Audio/Weapons/eblade1.ogg
      params:
@ -395,6 +406,7 @@
      types:
        Piercing: 15
        Bloodloss: 2
+        Structural: 20

 - type: entity
  parent: [ClothingHandsBlackSMG, ClothingHandsSlashArcMeleeBase, PirateArmorPirateEvaArmored]
@ -411,6 +423,7 @@
    damage:
      types:
        Piercing: 12
+        Structural: 20

 - type: entity
  parent: ClothingHandsBlackSMG
@ -468,7 +481,7 @@
    damage:
      types:
        Slash: 17
-        Structural: 15
+        Structural: 25
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
      params:
@ -719,7 +732,7 @@
      types:
        Slash: 10
        Heat: 12
-        Structural: 15
+        Structural: 25
    soundHit:
      path: /Audio/Weapons/eblade1.ogg
      params:
@ -805,7 +818,7 @@
    damage:
      types:
        Blunt: 20
-        Structural: 20
+        Structural: 30
    bluntStaminaDamageFactor: 1.5
    soundHit:
      collection: MetalThud
@ -1168,19 +1181,19 @@
  categories: [ HideSpawnMenu ]

 - type: entity
-  parent: [ClothingHandsNoGlovesNoDamage, PirateArmorGoliath]
+  parent: [ClothingHandsBaseNPC, PirateArmorGoliath]
  id: ClothingHandsPirateArmorT1Goliath
  suffix: pirate T1 goliath armor
  categories: [ HideSpawnMenu ]

 - type: entity
-  parent: [ClothingHandsNoGlovesNoDamage, PirateArmorGoliathMining]
+  parent: [ClothingHandsBaseNPC, PirateArmorGoliathMining]
  id: ClothingHandsPirateArmorT1GoliathMining
  suffix: pirate T1 goliath mining armor
  categories: [ HideSpawnMenu ]

 - type: entity
-  parent: [ClothingHandsNoGloves, PirateArmorPirateEva]
+  parent: [ClothingHandsBaseNPC, PirateArmorPirateEva]
  id: ClothingHandsPirateArmorT1PirateEva
  suffix: pirate T1 EVA armor
  categories: [ HideSpawnMenu ]
@ -1192,7 +1205,7 @@
  categories: [ HideSpawnMenu ]

 - type: entity
-  parent: [ClothingHandsNoGlovesNoDamage, PirateArmorMechArmorMediumSyndi]
+  parent: [ClothingHandsBaseNPC, PirateArmorMechArmorMediumSyndi]
  id: ClothingHandsPirateArmorT2Invisible
  suffix: pirate T2 armor
  categories: [ HideSpawnMenu ]
--- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml
+++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml
@ -13,7 +13,7 @@
        Cold: 0.1
    heatDamage:
      types:
-        Heat: 1.5
+        Heat: 1
  - type: ThermalRegulator
    metabolismHeat: 800
    radiatedHeat: 100
--- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/npc_loot_pirate.yml
+++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/npc_loot_pirate.yml
@ -1,4 +1,4 @@
-#region BASE
+#region BASE

 - type: entity
  id: NpcLootBase
@ -2181,7 +2181,7 @@
      prob: 0.6
      orGroup: dragunovPool
    # Items
-    - id: MagazineDragunov
+    - id: MagazineDragunovSP
      amount: 2
      prob: 0.3
      orGroup: dragunovAmmoPool
@ -3807,3 +3807,4 @@
    sound:
      path: /Audio/Items/jumpsuit_equip.ogg

+
--- a/Resources/Prototypes/_Sunrise/NPCs/pirates.yml
+++ b/Resources/Prototypes/_Sunrise/NPCs/pirates.yml
--- a/Resources/Prototypes/_Sunrise/Procedural/salvage_factions.yml
+++ b/Resources/Prototypes/_Sunrise/Procedural/salvage_factions.yml
@ -3,85 +3,85 @@
  desc: salvage-faction-scrappers
  entries:
    # melee
-    - proto: MobPirateT1Knife
+    - proto: MobPirateT1KnifeTimed
      prob: 0.25
-    - proto: MobPirateT1MonkeyKnuckleDusters
+    - proto: MobPirateT1MonkeyKnuckleDustersTimed
      prob: 0.25
-    - proto: MobPirateT1Pickaxe
+    - proto: MobPirateT1PickaxeTimed
      prob: 0.25
-    - proto: MobPirateT1MonkeyEDagger
+    - proto: MobPirateT1MonkeyEDaggerTimed
      cost: 3
      prob: 0.1
-    - proto: MobPirateT1ECutlass
+    - proto: MobPirateT1ECutlassTimed
      cost: 5
      prob: 0.05
-    - proto: MobPirateT1EPickaxe
+    - proto: MobPirateT1EPickaxeTimed
      cost: 5
      prob: 0.1
-    - proto: MobPirateT1Hunter
+    - proto: MobPirateT1HunterTimed
      cost: 5
      prob: 0.1
-    - proto: MobPirateT1HunterSmash
+    - proto: MobPirateT1HunterSmashTimed
      cost: 6
      prob: 0.08
    # range
-    - proto: MobPirateT1Pistol
+    - proto: MobPirateT1PistolTimed
      cost: 2
      prob: 0.2
-    - proto: MobPirateT1Mosin
+    - proto: MobPirateT1MosinTimed
      cost: 2
      prob: 0.2
-    - proto: MobPirateT1PKA
+    - proto: MobPirateT1PKATimed
      prob: 0.2
-    - proto: MobPirateT1MonkeyFlareGun
+    - proto: MobPirateT1MonkeyFlareGunTimed
      prob: 0.1
-    - proto: MobPirateT1MonkeyFlareGunCoin
+    - proto: MobPirateT1MonkeyFlareGunCoinTimed
      prob: 0.08
-    - proto: MobPirateT1MonkeyFlareGunIncendiary
+    - proto: MobPirateT1MonkeyFlareGunIncendiaryTimed
      prob: 0.05
-    - proto: MobPirateT1MonkeyFlareGunUranium
+    - proto: MobPirateT1MonkeyFlareGunUraniumTimed
      prob: 0.03
-    - proto: MobPirateT1ScrapSMG
+    - proto: MobPirateT1ScrapSMGTimed
      cost: 3
      prob: 0.1
-    - proto: MobPirateT1SMG
+    - proto: MobPirateT1SMGTimed
      cost: 4
      prob: 0.1
-    - proto: MobPirateT1MonkeyFireBomb
+    - proto: MobPirateT1MonkeyFireBombTimed
      cost: 3
      prob: 0.1
-    - proto: MobPirateT1BombardierFire
+    - proto: MobPirateT1BombardierFireTimed
      cost: 4
      prob: 0.05
-    - proto: MobPirateT1BombardierGlass
+    - proto: MobPirateT1BombardierGlassTimed
      cost: 4
      prob: 0.05
-    - proto: MobPirateT1BombardierPipe
+    - proto: MobPirateT1BombardierPipeTimed
      cost: 4
      prob: 0.05
-    - proto: MobPirateT1Flintlock
+    - proto: MobPirateT1FlintlockTimed
      prob: 0.2
-    - proto: MobPirateT1PlasmaCutter
+    - proto: MobPirateT1PlasmaCutterTimed
      cost: 5
      prob: 0.1
-    - proto: MobPirateT1ScrapRifle
+    - proto: MobPirateT1ScrapRifleTimed
      cost: 6
      prob: 0.1
-    - proto: MobPirateT1Rifle
+    - proto: MobPirateT1RifleTimed
      cost: 6
      prob: 0.1
    # borgs
-    - proto: MobPirateT1BorgAssault
-      cost: 5
+    - proto: MobPirateT1BorgAssaultTimed
+      cost: 3
      prob: 0.05
-    - proto: MobPirateT1BorgMining
+    - proto: MobPirateT1BorgMiningTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT1BorgDerelict
+    - proto: MobPirateT1BorgDerelictTimed
      cost: 1
      prob: 0.15
-    - proto: MobPirateT1Boss
-      cost: 10
+    - proto: MobPirateT1BossTimed
+      cost: 5
      prob: 0.05
  configs:
    DefenseStructure: ComputerPirateExchanger
@ -92,64 +92,72 @@
  desc: salvage-faction-pirates
  entries:
    # melee
-    - proto: MobPirateT2Cutlass
+    - proto: MobPirateT2CutlassTimed
      prob: 0.1
-    - proto: MobPirateT2ECutlass
+    - proto: MobPirateT2ECutlassTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT2Sledgehammer
+    - proto: MobPirateT2SledgehammerTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT2GauntletDrill
+    - proto: MobPirateT2GauntletDrillTimed
      cost: 2
      prob: 0.1
    # range
-    - proto: MobPirateT2Shotgun
+    - proto: MobPirateT2ShotgunTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT2ShotgunMiniBall
+    - proto: MobPirateT2ShotgunMiniBallTimed
      prob: 0.1
-    - proto: MobPirateT2ShotgunGlass
+    - proto: MobPirateT2ShotgunGlassTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT2Musket
-      prob: 0.1
-    - proto: MobPirateT2MachineCannon
+    - proto: MobPirateT2MusketTimed
+      prob: 0.05
+    - proto: MobPirateT2MusketEMPTimed
+      prob: 0.05
+    - proto: MobPirateT2MusketBlastTimed
+      prob: 0.05
+    - proto: MobPirateT2MusketFragTimed
+      prob: 0.05
+    - proto: MobPirateT2MusketPenetratorTimed
+      prob: 0.05
+    - proto: MobPirateT2MachineCannonTimed
      cost: 3
      prob: 0.1
-    - proto: MobPirateT2DoubleFlintlock
+    - proto: MobPirateT2DoubleFlintlockTimed
      prob: 0.1
-    - proto: MobPirateT2DoubleRevolver
+    - proto: MobPirateT2DoubleRevolverTimed
      prob: 0.1
    # rare
-    - proto: MobPirateT2RevolverCutlass
+    - proto: MobPirateT2RevolverCutlassTimed
      cost: 3
      prob: 0.04
-    - proto: MobPirateT2Grapeshot
+    - proto: MobPirateT2GrapeshotTimed
      cost: 5
      prob: 0.04
-    - proto: MobPirateT2Cannoball
+    - proto: MobPirateT2CannoballTimed
      cost: 5
      prob: 0.04
-    - proto: MobPirateT2Mech
+    - proto: MobPirateT2MechTimed
      cost: 7
      prob: 0.03
-    - proto: MobPirateT2Juggernaut
+    - proto: MobPirateT2JuggernautTimed
      cost: 7
      prob: 0.04
    # borgs
-    - proto: MobPirateT1BorgAssault
+    - proto: MobPirateT1BorgAssaultTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT1BorgMining
+    - proto: MobPirateT1BorgMiningTimed
      cost: 1
      prob: 0.1
-    - proto: MobPirateT1BorgDerelict
+    - proto: MobPirateT1BorgDerelictTimed
      cost: 1
      prob: 0.1
-    - proto: MobPirateT2Boss
-      cost: 10
-      prob: 0.02
+    - proto: MobPirateT2BossTimed
+      cost: 5
+      prob: 0.1
  configs:
    DefenseStructure: ComputerPirateExchanger
    Megafauna: MobPirateT2Boss
@ -159,72 +167,99 @@
  desc: salvage-faction-freelancers
  entries:
    # melee
-    - proto: MobPirateT3Bola
+    - proto: MobPirateT3BolaTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT3Stun
+    - proto: MobPirateT3StunTimed
      cost: 2
      prob: 0.1
+    - proto: MobPirateT1ECutlassTimed
+      cost: 1
+      prob: 0.05
    # range
-    - proto: MobPirateT3Shield1984
+    - proto: MobPirateT1BombardierFireTimed
+      cost: 1
+      prob: 0.05
+    - proto: MobPirateT1BombardierGlassTimed
+      cost: 1
+      prob: 0.05
+    - proto: MobPirateT1BombardierPipeTimed
+      cost: 1
+      prob: 0.05
+    - proto: MobPirateT1PistolTimed
+      cost: 1
+      prob: 0.05
+    - proto: MobPirateT1SMGTimed
+      cost: 1
+      prob: 0.1
+    - proto: MobPirateT1ScrapSMGTimed
+      cost: 1
+      prob: 0.05
+    - proto: MobPirateT1ScrapRifleTimed
+      cost: 1
+      prob: 0.05
+    - proto: MobPirateT1RifleTimed
+      cost: 1
+      prob: 0.1
+    - proto: MobPirateT3Shield1984Timed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT3ShieldSMG
+    - proto: MobPirateT3ShieldSMGTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT3DMR
+    - proto: MobPirateT3DMRTimed
      cost: 3
      prob: 0.1
-    - proto: MobPirateT3Rifle2
+    - proto: MobPirateT3Rifle2Timed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT3Rifle
+    - proto: MobPirateT3RifleTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT3LaserSMG
+    - proto: MobPirateT3LaserSMGTimed
      cost: 2
      prob: 0.1
-    - proto: MobPirateT3LaserCannon
+    - proto: MobPirateT3LaserCannonTimed
      cost: 3
      prob: 0.1
-    - proto: MobPirateT3Revolver
+    - proto: MobPirateT3RevolverTimed
      cost: 2
      prob: 0.08
-    - proto: MobPirateT3SMG
+    - proto: MobPirateT3SMGTimed
      cost: 2
      prob: 0.15
    # rare
-    - proto: MobPirateT3L6
+    - proto: MobPirateT3L6Timed
      cost: 5
      prob: 0.04
-    - proto: MobPirateT3RPD
+    - proto: MobPirateT3RPDTimed
      cost: 5
      prob: 0.05
-    - proto: MobPirateT3Tachanka
+    - proto: MobPirateT3TachankaTimed
      cost: 6
      prob: 0.04
-    - proto: MobPirateT3Grenadier
+    - proto: MobPirateT3GrenadierTimed
      cost: 5
      prob: 0.05
-    - proto: MobPirateT3Infiltrator
+    - proto: MobPirateT3InfiltratorTimed
      cost: 5
      prob: 0.04
-    - proto: MobPirateT3Sniper
+    - proto: MobPirateT3SniperTimed
      cost: 5
      prob: 0.03
    # borgs
-    - proto: MobPirateT1BorgAssault
+    - proto: MobPirateT1BorgAssaultTimed
      cost: 1
      prob: 0.05
-    - proto: MobPirateT1BorgMining
+    - proto: MobPirateT1BorgMiningTimed
      cost: 1
      prob: 0.02
-    - proto: MobPirateT1BorgDerelict
+    - proto: MobPirateT1BorgDerelictTimed
      cost: 1
      prob: 0.02
-    - proto: MobPirateT3Boss
-      cost: 10
-      prob: 0.02
+    - proto: MobPirateT3BossTimed
+      cost: 5
+      prob: 0.1
  configs:
    DefenseStructure: ComputerPirateExchanger
    Megafauna: MobPirateT3Boss
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml
@ -434,6 +434,13 @@
  materials:
    Steel: 375

+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunCaselessExtended
+  result: MagazinePistolSubMachineGunCaselessExtended
+  materials:
+    Steel: 500
+
 - type: latheRecipe
  parent: BaseAmmoRecipe
  id: MagazinePistolSubMachineGunAP
@ -443,6 +450,28 @@
    Plasteel: 115
    Uranium: 40

+# .40 SMG
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistol40SubMachineGunSP
+  result: MagazinePistol40SubMachineGunSP
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistol40SubMachineGunHP
+  result: MagazinePistol40SubMachineGunHP
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistol40SubMachineGunFMJ
+  result: MagazinePistol40SubMachineGunFMJ
+  materials:
+    Steel: 375
+
 # .35 Auto WT550
 - type: latheRecipe
  parent: BaseAmmoRecipe
@ -1104,14 +1133,32 @@
    Steel: 835

 - type: latheRecipe
-  id: MagazineDragunov
-  result: MagazineDragunov
+  id: MagazineDragunovSP
+  result: MagazineDragunovSP
  categories:
  - Ammo
  completetime: 5
  materials:
    Steel: 800

+- type: latheRecipe
+  id: MagazineDragunovHP
+  result: MagazineDragunovHP
+  categories:
+  - Ammo
+  completetime: 5
+  materials:
+    Steel: 800
+
+- type: latheRecipe
+  id: MagazineDragunovFMJ
+  result: MagazineDragunovFMJ
+  categories:
+  - Ammo
+  completetime: 5
+  materials:
+    Steel: 850
+
 - type: latheRecipe
  id: MagazineGlock22
  result: MagazineGlock22
--- a/Resources/Prototypes/_Sunrise/secret_weights.yml
+++ b/Resources/Prototypes/_Sunrise/secret_weights.yml
@ -1,9 +1,12 @@
 - type: weightedRandom
  id: SunriseSecret
  weights:
-    Traitor: 0.6
+    Traitor: 0.4
    BloodCult: 0.1
    AssaultOps: 0.1
    Revolutionary: 0.1
-    Nukeops: 0.1
+    Nukeops: 0.2
    ExtraLowPop: 1
+    Zombie: 0.04
+    Zombieteors: 0.01
+    Survival: 0.05
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@ -51,42 +51,42 @@
 #    - AssaultOps
 #    - SubGamemodesRule
 #    - Xenoborgs
-    - KesslerSyndromeScheduler
+#    - KesslerSyndromeScheduler
 #    - RampingStationEventScheduler
 #    - SpaceTrafficControlEventScheduler
 #    - BasicRoundstartVariation

-#- type: gamePreset
-#  id: AllerAtOnce
-#  alias:
-#  - allall
-#  - aller
-#  - badidea
-#  - punishment
-#  name: aller-at-once-title
-#  description: aller-at-once-description
-#  showInVote: false #Please god dont do this
-#  hide: false # Sunrise-Edit
-#  minPlayers: 20 # Sunrise-Edit: 20 players for NUKEOPS
-#  rules:
-#    - Nukeops
-#    - Traitor
-#    - Revolutionary
-#    - Zombie
-#    - Wizard
+- type: gamePreset
+  id: AllerAtOnce
+  alias:
+  - allall
+  - aller
+  - badidea
+  - punishment
+  name: aller-at-once-title
+  description: aller-at-once-description
+  showInVote: false #Please god dont do this
+  hide: false # Sunrise-Edit
+  minPlayers: 20 # Sunrise-Edit: 20 players for NUKEOPS
+  rules:
+    - Nukeops
+    - Traitor
+    - Revolutionary
+    - Zombie
+    - Wizard
    - Xenoborgs
-#    - FleshCult
-#    - BloodCult
-#    - AssaultOps
-#    - SubGamemodesRule
-#    - BasicStationEventScheduler
-#    - KesslerSyndromeScheduler
-#    - MeteorSwarmMildScheduler
-#    - MeteorSwarmScheduler
-#    - RampingStationEventScheduler
-#    - SpaceTrafficControlEventScheduler
-#    - SpaceTrafficControlFriendlyEventScheduler
-#    - BasicRoundstartVariation
+    - FleshCult
+    - BloodCult
+    - AssaultOps
+    - SubGamemodesRule
+    - BasicStationEventScheduler
+    - KesslerSyndromeScheduler
+    - MeteorSwarmMildScheduler
+    - MeteorSwarmScheduler
+    - RampingStationEventScheduler
+    - SpaceTrafficControlEventScheduler
+    - SpaceTrafficControlFriendlyEventScheduler
+    - BasicRoundstartVariation

 # Sunrise-Edit: Replace by Extra
 #- type: gamePreset
@ -277,20 +277,20 @@
  - SpaceTrafficControlEventScheduler
  - BasicRoundstartVariation

-#- type: gamePreset
-#  id: Zombieteors
-#  alias:
-#  - zombieteors
-#  - zombombies
-#  - meteombies
-#  name: zombieteors-title
-#  description: zombieteors-description
-#  showInVote: true # Sunrise-Edit
-#  hide: true # Sunrise-Edit
-#  minPlayers: 20 # Sunrise-Edit: 20 players for ZOMBIES
-#  rules:
-#  - Zombie
-#  - BasicStationEventScheduler
-#  - KesslerSyndromeScheduler
-#  - SpaceTrafficControlEventScheduler
-#  - BasicRoundstartVariation
+- type: gamePreset
+  id: Zombieteors
+  alias:
+  - zombieteors
+  - zombombies
+  - meteombies
+  name: zombieteors-title
+  description: zombieteors-description
+  showInVote: true # Sunrise-Edit
+  hide: true # Sunrise-Edit
+  minPlayers: 20 # Sunrise-Edit: 20 players for ZOMBIES
+  rules:
+  - Zombie
+  - BasicStationEventScheduler
+  - KesslerSyndromeScheduler
+  - SpaceTrafficControlEventScheduler
+  - BasicRoundstartVariation
--- a/Resources/ServerInfo/Guidebook/_Sunrise/DetonatorTriggers.xml
+++ b/Resources/ServerInfo/Guidebook/_Sunrise/DetonatorTriggers.xml
@ -0,0 +1,38 @@
+  # Взрывной шнур, детонатор и триггеры
+
+  Это руководство описывает основу сборки взрывных связок: детонатор, триггеры и взрывной шнур.
+
+  ## Основные компоненты
+  <Box>
+  <GuideEntityEmbed Entity="CableDetStack1" Caption="Взрывной шнур" Scale="1"/>
+  <GuideEntityEmbed Entity="EmptyDetonator" Caption="Пустой детонатор" Scale="1"/>
+  </Box>
+  ## Виды триггеров
+  <Box>
+  <GuideEntityEmbed Entity="TimerTrigger" Caption="Таймер-триггер" Scale="1"/>
+  <GuideEntityEmbed Entity="SignalTrigger" Caption="Сигнальный триггер" Scale="1"/>
+  <GuideEntityEmbed Entity="VoiceTrigger" Caption="Голосовой триггер" Scale="1"/>
+  </Box>
+  ## Общая схема сборки
+  1. Соберите детонатор, установив в него один из триггеров и вставьте взрывной шнур.
+  <Box>
+  <GuideEntityEmbed Entity="BoxDetonator" Caption="" Scale="2"/>
+  <GuideEntityEmbed Entity="WiredDetonator" Caption="" Scale="2"/>
+  </Box>
+  <Box>
+  2. Проложите взрывной шнур по полу в месте где вы ходите создать контролируемый взрыв для разрушения. Взрыв мощный чтобы проломить стену, но достаточно небольшого радиуса дабы не задеть вас.
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  <GuideEntityEmbed Entity="CableDet" Caption="" Scale="1.5"/>
+  </Box>
+
+  3. Активируйте заранее таймер-триггер для подрыва связки и прикрепите его к напольному шнуру либо прикрепите готовый детонатор с иными типами трикеров заранее и взорвите на удалении.
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@ -958,3 +958,6 @@ ImplantExtractorMachineCircuitboard: InterrogatorMachineCircuitboard
 # 2026-01-02
 EnergyDomeWiredTest: null
 # Sunrise-End
+
+# 2026-01-30
+MagazineDragunov: MagazineDragunovSP