NPC Пираты, снаряжение пиратов, консоль-аплинк пиратов. (#3370)

Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-12-25 17:25:55 +00:00 · 2025-12-25 17:25:55 +00:00 · 33b4dbb91f
commit 33b4dbb91f
parent 6343a5cd7e
362 changed files with 20911 additions and 5182 deletions
--- a/Resources/Audio/_Sunrise/Effects/silence.ogg
+++ b/Resources/Audio/_Sunrise/Effects/silence.ogg
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/eva-helmets.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/eva-helmets.ftl
@ -0,0 +1,11 @@
+ent-ClothingHeadSoftsuitCBURN = CBURN шлем
+    .desc = Тяжёлый огнеупорный шлем, используемый подразделениями спецзачистки.
+ent-ClothingHeadHelmetPirate = пиратский космический шлем
+    .desc = Шлем для скафандра, имеет пару серьезных трещен, но не переживай, скотч всему голова.
+ent-ClothingHeadHelmetPirateAlt = пиратский космический шлем
+    .desc = Шлем для скафандра с нарисованным черепом, чтобы брать всех на абордаж на стиле.
+ent-ClothingHeadHelmetPirateOld = pirate hardsuit helmet
+    .desc = A special hardsuit helmet, made for Scooner.
+    .suffix = Pirate, Sunrise
+ent-ClothingHeadHelmetPirateAlt2 = пиратский космический шлем
+    .desc = Шлем для скафандра
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl
@ -23,8 +23,5 @@ ent-ClothingHeadHelmetHardsuitUegCap = space suit helmet of a space marines capt
 ent-ClothingHeadHelmetHardsuitPirateCapSun = pirate captain's hardsuit helmet
    .desc = A special hardsuit helmet, made for the captain of a pirate ship.
    .suffix = Pirate, Sunrise
-ent-ClothingHeadHelmetHardsuitPirateSun = pirate hardsuit helmet
-    .desc = A special hardsuit helmet, made for Scooner.
-    .suffix = Pirate, Sunrise
 ent-ClothingHeadHelmetHardsuitInfiltration = syndicate infiltration hardsuit helmet
    .desc = { ent-ClothingHeadHardsuitBase.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl
@ -24,12 +24,6 @@ ent-ClothingHardsuitUegParatrooper = space marine spacesuit
    .desc = This piece is worn exclusively by those who bring democracy and freedom to civilization, freeing it from the oppression of dictatorship and totalitarianism. Thanks to the new technologies of the United Government of Earth, the spacesuit is provided with mobility and high protection. As well as a built-in communication system, which periodically propagandizes propaganda replicas of democracy.
 ent-ClothingHardsuitUegCap = spacesuit of the commander of space marines
    .desc = As you look at it, you can imagine the pain, suffering and labor that a paratrooper endured to achieve the honor of wearing this suit. It represents the fear and horror before your eyes. If you have seen the wearer of this suit in person, you should thank him for the freedom and democracy he has given you, glory to the United Government of Earth!
-ent-ClothingOuterHardsuitPirateEVASun = deep space EVA suit
-    .desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space.
-    .suffix = Pirate, Sunrise
-ent-ClothingOuterHardsuitPirateSun = pirate hardsuit
-    .desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
-    .suffix = Pirate, Sunrise
 ent-ClothingOuterHardsuitPirateCapSun = pirate captain's hardsuit
    .desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
    .suffix = Pirate, Sunrise
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
@ -12,3 +12,6 @@ ent-AutolathePrisonMetusMachineCircuitboard = prison autolathe machine board
    .desc = Worn, with broken mounts and fine cracks, still warm in places from occasional power pulses.
 ent-SewingPrinterMetusMachineCircuitboard = prison sewing printer machine board
    .desc = Scarred with solder marks, corroded contacts, and burn traces, dim LEDs flicker occasionally.
+
+ent-PirateTechFabCircuitboard = pirate techfab machine board
+    .desc = { ent-BaseMachineCircuitboard.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/base_guns.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/base_guns.ftl
@ -6,9 +6,3 @@ ent-GunHeavy = { "" }
    .desc = { "" }
 ent-GunVeryHeavy = { "" }
    .desc = { "" }
-ent-GunMeleeLight = { "" }
-    .desc = { "" }
-ent-GunMeleeMedium = { "" }
-    .desc = { "" }
-ent-GunMeleeHeavy = { "" }
-    .desc = { "" }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
@ -1,5 +1,3 @@
-ent-BaseWeaponRifleSunrise = BaseWeaponRifleSunrise
-    .desc = A rooty tooty point and shooty.
 ent-WeaponRifleAKM = AKMS
    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleAKMU = AKM-U
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/lathe.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/lathe.ftl
@ -2,6 +2,8 @@ ent-ExosuitFabricatorHyperConvection = hyper convection exosuit fabricator
    .desc = A highly-experimental Exosuit Fabricator that harnesses the power of extreme heat to slowly create objects more cost-effectively.
 ent-AutolathePrisonMetus = prison autolathe
    .desc = Produces basic metal and glass items of prison standard.
+ent-PirateTechFab = pirate fabrication
+    .desc = Prints basic weapons, ammo and gear for unruly gangs. The cost-optimized model sacrifices speed and variety for lower resource use.
 ent-AmmoLathe = ammo lathe
    .suffix = ShuttleBattle
    .desc = Prints ammunition, repair parts for shuttle crew. "Cost-optimized model" has reduced fabrication speed and limited selection.
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@ -21,7 +21,7 @@ ent-MagazineLightRifleMaxim = pan magazine (.30 rifle)
    .desc = { ent-BaseMagazineLightRifle.desc }
 ent-MagazineLightRiflePkBox = PK munitions box (.30 rifle)
    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazineLightRifleBox = L6 SAW magazine box (.30 rifle)
+ent-MagazineRifleBox = L6 SAW magazine box (.30 rifle)
    .desc = Box containing a 100-round belt of linked .30 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition.
 ent-MagazineLightRifle = magazine (.30 rifle)
    .desc = Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition.
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl
@ -21,7 +21,9 @@ ent-MagazineRifleUranium = magazine (.20 rifle uranium)
    .desc = { ent-BaseMagazineRifle.desc }
 ent-MagazineRifleBoxSP = L6 SAW magazine box (.20 rifle SP)
    .desc = 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.
-ent-MagazineLightRifleBoxIncendiary = L6 SAW magazine box (.30 rifle incendiary)
-    .desc = { ent-MagazineLightRifleBox.desc }
-ent-MagazineLightRifleBoxUranium = L6 SAW magazine box (.30 rifle uranium)
-    .desc = { ent-MagazineLightRifleBox.desc }
+ent-MagazineRifleBoxEmpty = L6 SAW magazine box (.20 rifle any)
+    .desc = { ent-MagazineRifleBox.desc }
+ent-MagazineRifleBoxIncendiary = L6 SAW magazine box (.20 rifle incendiary)
+    .desc = { ent-MagazineRifleBox.desc }
+ent-MagazineRifleBoxUranium = L6 SAW magazine box (.20 rifle uranium)
+    .desc = { ent-MagazineRifleBox.desc }
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl
@ -1,2 +1,2 @@
 ent-MagazineFoamBox = ammunition box (foam)
-    .desc = { ent-MagazineLightRifleBox.desc }
+    .desc = { ent-MagazineRifleBox.desc }
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/rifles/rifles.ftl
@ -1,5 +1,3 @@
-ent-BaseWeaponRifle = BaseWeaponRifle
-    .desc = A rooty tooty point and shooty.
 ent-WeaponRifleAk = AKMS
    .desc = A somewhat battered combat rifle of a design originating from old Earth. Favored by criminals, militias, and terrorists due to its famed reliability and easy-to-manufacture design. Feeds from .30 rifle magazines.
 ent-WeaponRifleM90GrenadeLauncher = M-90gl
--- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl
@ -1,2 +1,2 @@
-ent-CartridgeLightRifleImprovised = самодельный винтовочный патрон (.30)
-  .desc = Самодельная винтовочная пуля, использующая фосфор в качестве метательного заряда вместо пороха, что делает её гораздо менее эффективной.
+ent-CartridgeLightRifleImprovised = патрон (7,62мм самодельный)
+  .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
@ -1,9 +1,9 @@
 ent-CrateAmmunitionSmall = старый деревянный ящик
    .desc = Малый деревянный ящик с выцветшей краской и эмблемой СССП.
-ent-CrateAmmunitionSmallLightRifle = старый деревянный ящик
+ent-CrateAmmunitionSmallLightRifle = старый патронный ящик
    .suffix = Заполненный
    .desc = Малый деревянный ящик с выцветшей краской и эмблемой СССП. На внутренней стороне крышки с трудом читается инструкция о патронах калибра 7,62х54ммR.
-ent-CrateShelfMosin = старый деревянный ящик
+ent-CrateShelfMosin = ящик с кардашёв-мосин
    .suffix = Заполненный
    .desc = Большой деревянный ящик с выцветшей краской и эмблемой СССП. Внутри крышки едва различима старая инструкция: зачем нужен штык и за какое место держать винтовку. Судя по пыли, он ждёт уже не одну сотню лет. Предупреждение: Инструкции могут быть устаревшими на несколько веков.
 ent-WrappedMosin = законсервированный Кардашев-Мосин
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/ears/headsets.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/ears/headsets.ftl
@ -24,3 +24,9 @@ ent-ClothingHeadsetCommaid = гарнитура горничной команд
    .desc = { ent-ClothingHeadset.desc }
 ent-ClothingHeadsetAltCentComSunrise = полноразмерная гарнитура Центком
    .desc = { ent-ClothingHeadsetAltCentCom.desc }
+ent-ClothingHeadsetFreelanceNoKey = { ent-ClothingHeadsetFreelance }
+    .suffix = Без ключей
+    .desc = { ent-ClothingHeadsetFreelance.desc }
+ent-ClothingHeadsetAltSyndicateNoKey = { ent-ClothingHeadsetAltSyndicate }
+    .suffix = Без ключей
+    .desc = { ent-ClothingHeadsetAltSyndicate.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/eva-helmets.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/eva-helmets.ftl
@ -0,0 +1,17 @@
+ent-ClothingHeadSoftsuitCBURN = CBURN шлем
+    .desc = Тяжёлый огнеупорный шлем, используемый подразделениями спецзачистки.
+ent-ClothingHeadHelmetPirate = абордажный EVA шлем
+    .desc = Простой и стильный шлем EVA. Создан для скромных космических подвигов и абордажей. Имеет пару серьёзных трещин, но не переживай — изолента всё исправит.
+    .suffix = Пират
+ent-ClothingHeadHelmetPirateAlt = абордажный EVA шлем
+    .desc = Простой и стильный шлем EVA с нарисованным черепом — для абордажа со вкусом.
+    .suffix = Пират
+ent-ClothingHeadHelmetPirateOld = EVA шлем
+    .desc = Шлем для скафандра, чтобы брать всех на абордаж.
+    .suffix = Пират
+ent-ClothingHeadHelmetPirateAlt2 = абордажный EVA шлем
+    .desc = Простой и стильный шлем EVA. Создан для скромных космических подвигов и абордажей.
+    .suffix = Пират
+ent-ClothingHeadHelmetHardsuitScaf = шлем скуфандра EVA
+    .desc = Крепкий шлем. Внутри пропах злостью прежнего владельца.
+    .suffix = Пират
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/head/hardsuit-helmets.ftl
@ -23,9 +23,6 @@ ent-ClothingHeadHelmetHardsuitUegCap = шлем скафандра капита
 ent-ClothingHeadHelmetHardsuitPirateCapSun = космический шлем капитана пиратов
    .desc = Специальный защитный шлем, изготовленный для капитана пиратского корабля на ней надпись "аррр".
    .suffix = Пират, Рассвет
-ent-ClothingHeadHelmetHardsuitPirateSun = пиратский космический шлем
-    .desc = Специальный шлем для скафандра, чтобы брать всех на абордаж.
-    .suffix = Пират, Рассвет
 ent-ClothingHeadHelmetHardsuitInfiltration = шлем скафандра для инфильтрации Синдиката
    .desc = { ent-ClothingHeadHardsuitBase.desc }
 ent-ClothingHeadHelmetHardsuitSalvageGoliath = шлем скафандра «Голиаф»
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/hardsuits.ftl
@ -25,15 +25,18 @@ ent-ClothingHardsuitUegParatrooper = скафандр космического
    .desc = Данный экземпляр носят исключительно те, кто приносит демократию и свободу цивилизации, освобождая её от гнёта диктатуры и тоталитаризма. Благодаря новым технологиям Объединённого Правительства Земли - скафандр обеспечен мобильностью и высокой защитой. А также встроенной системой связи, которая периодически пропагандирует агитационные реплики демократии.
 ent-ClothingHardsuitUegCap = скафандр командира космических десантников
    .desc = Смотря на него - вы можете представить себе ту боль, страдания и труд, который перенёс на себе десантник, дабы добиться той чести, чтобы носить данный скафандр. Олицетворяет страх и ужас перед вашими глазами. Если вы вживую увидели носителя этого скафандра - вам стоит поблагодарить его за предоставленную вам свободу и демократию, слава Объединённому Правительству Земли!
-ent-ClothingOuterHardsuitPirateEVASun = скафандр EVA для глубоко космоса
-    .desc = Тяжелый скафандр, обеспечивающий базовую защиту от холода и суровых реалий глубокого космоса.
-    .suffix = Pirate, Sunrise
-ent-ClothingOuterHardsuitPirateSun = пиратский скафандр
+ent-ClothingOuterHardsuitPirate = древний бронескафандр
    .desc = Древний бронированный скафандр, идеально подходящий для защиты от космической цинги и негодяев с ящиками с инструментами.
-    .suffix = Pirate, Sunrise
-ent-ClothingOuterHardsuitPirateCapSun = капитанский пиратский скафнадр
+    .suffix = Pirate
+ent-ClothingOuterHardsuitPirateCapSun = капитанский древний бронескафандр
    .desc = Древний бронированный скафандр, идеально подходящий для защиты от космической цинги и негодяев с ящиками с инструментами.
-    .suffix = Pirate, Sunrise
+    .suffix = Pirate
+ent-ClothingOuterHardsuitPrivateer = скафандр фрилансера
+    .desc = Скафандр, который носят те, кто бороздит космос без флага и за горсть дублонов готов влезть в любую авантюру или абордаж. Поцарапанный и помятый, но всё ещё держит воздух без скотча.
+    .suffix = Pirate
+ent-ClothingOuterHardsuitPrivateerArmored = бронескафандр фрилансера
+    .desc = Усиленная версия скафандра фрилансера, собранная из честно добытых бронепластин и парочки бутылок рома. Тяжёлый как похмелье, но идеально подходит для дружеских визитов с фейерверками.
+    .suffix = Pirate
 ent-ClothingOuterHardsuitChameleon = синдикатовский хамелеон
    .desc = Глядя на его материалы, в голове невольно всплывают образы из области научной фантастики.
 ent-ClothingOuterHardsuitInfiltration = скафандр инфильтратора
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/softsuits.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/softsuits.ftl
@ -0,0 +1,15 @@
+ent-ClothingOuterEVASuitPirateOld = древний скафандр EVA
+    .desc = Древний бронированный скафандр, идеально подходящий для защиты от космической цинги и негодяев с ящиками с инструментами.
+    .suffix = Пираты
+ent-ClothingOuterEVASuitPirate = скафандр EVA
+    .desc = Потрёпанный костюм, весь в скотче, повидавший не один абордаж. На спине бирка: «Совсем не принадлежит пирату, честно.
+    .suffix = Пираты
+ent-ClothingOuterEVASuitPirateArmored = абордажный скафандр EVA
+    .desc = Потрёпанный костюм, весь в скотче и заплатах. Поверх надета мягкая броня, такая же дырявая но всё ещё держит удар.
+    .suffix = Пираты
+ent-ClothingOuterEVASuitPirateArmoredAlt = абордажный скафандр EVA
+    .desc = Потрёпанный костюм, весь в скотче и заплатах. Поверх надета мягкая броня с нарисованным черепом, чтобы все знали силу Шкелетов! Ачк! Ачк!
+    .suffix = Пираты
+ent-ClothingOuterHardsuitScaf = Скуфандр EVA
+    .desc = Зелёно-коричневый EVA-костюм, используемый пиратами и наёмниками. Слабо защищает от лазеров, но пули почти не берут. Cоздан для быстрого отхода, когда дело идёт наперекосяк.
+    .suffix = Пираты
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/mobs/npcs/pirates.ftl
@ -0,0 +1,113 @@
+ent-MobPirateT1MonkeyKnuckleDusters = обезьяна-абордажник
+    .desc = Самый дешёвый новичок в команде. Готов на всё ради зарплаты ввиде бананов. Держит кастеты с клеймом кроваво-красной буквы S.
+ent-MobPirateT1MonkeyFlareGun = обезьяна-стрелок
+    .desc = Самый дешёвый новичок в команде. Готов на всё ради зарплаты ввиде бананов. Вооружен сигнальным пистолетом.
+ent-MobPirateT1MonkeyFlareGunUranium = { ent-MobPirateT1MonkeyFlareGun }
+    .desc = { ent-MobPirateT1MonkeyFlareGun.desc }
+ent-MobPirateT1MonkeyFlareGunCoin = { ent-MobPirateT1MonkeyFlareGun }
+    .desc = { ent-MobPirateT1MonkeyFlareGun.desc }
+ent-MobPirateT1MonkeyFlareGunIncendiary = { ent-MobPirateT1MonkeyFlareGun }
+    .desc = { ent-MobPirateT1MonkeyFlareGun.desc }
+ent-MobPirateT1MonkeyFireBomb = обезьяна-гренадер
+    .desc = Главное что не в холодильнике. Готов на всё ради зарплаты ввиде бананов. Удерживает связку самодельных зажигательных бомб.
+ent-MobPirateT1MonkeyEDagger = обезьяна-абордажник
+    .desc = Член команды пиратов прошедших не один абордаж, но работает все ещё за бананы. держит энерго кинжал.
+ent-MobPirateT1Flintlock = пороховой попуга
+    .desc = Вокс в команде пиратов, прямо таки боевой попугай.
+ent-MobPirateT1Hunter = охотник на голиафов
+    .desc = Ветеран-утилизатор, достаточно богат, чтобы исследовать заброшенные руины и ходить в абордажи ради адреналина и приключений.
+ent-MobPirateT1Knife = абордажник мусорщиков
+    .desc = Первым лезет в пролом. Возвращается редко, зато шуму наделает.
+ent-MobPirateT1ECutlass = абордажник-ветеран мусорщиков
+    .desc = Машет с характерным Вжууу Вжууу звуком энерго-сабли, постоянно демонстрируя, насколько круты эти Ээээээнерго-мечи.
+ent-MobPirateT1Pickaxe = шахтёр мусорщиков
+    .desc = Вооружён верной киркой и жадностью, каждая группа нуждается в таких простых бойцах.
+ent-MobPirateT1EPickaxe = шахтёр-ветеран мусорщиков
+    .desc = Мародёр, накопивший достаточно монет, чтобы позволить себе достойное снаряжение.
+ent-MobPirateT1Pistol = пистолетчик мусорщиков
+    .desc = Низкоранговый рейдер, вооруженный из излишков оружием.
+ent-MobPirateT1Mosin = стрелок мусорщиков
+    .desc = Стрелок с винтовкой времён древних войн. Любит цитировать уставы СССП, которых никто не видел.
+ent-MobPirateT1ScrapRifle = автоматчик мусорщиков
+    .desc = В команде, где все вооружены чем попало, он прихватил автомат, во всяком случае он был им… когда-то.
+ent-MobPirateT1PKA = утиль мусорщиков
+    .desc = Прото-кинетический ускоритель в руках, ром в животе. Так и добывает дублоны.
+ent-MobPirateT1PlasmaCutter = утиль-ветеран мусорщиков
+    .desc = Опытный пират-утилизатор. С плазменным резаком способен разрезать обшивку шаттлов и обеспечивать проход для абордажной команды.
+ent-MobPirateT1ScrapSMG = рейдер мусорщиков
+    .desc = Обожает стрелять, ненавидит целиться. Жмёт спуск, пока всё вокруг не перестанут шевелиться. Вооружён импровизированным ПП.
+ent-MobPirateT1SMG = рейдер-ветеран мусорщиков
+    .desc = Обожает стрелять, ненавидит целиться. Жмёт спуск, пока всё вокруг не перестанут шевелиться. Вооружён древним ПП.
+
+ent-MobPirateT2Grapeshot = шрапнельный громых
+    .desc = Разносит всё в клочья, превращая вещи в сыр с дырками. Говорит, что «осколки — это тоже искусство».
+ent-MobPirateT2Cannoball = пушкарь пиратов
+    .desc = Заряжает пушку взрывными ядрами после попадания которых в твою шхуну от неё ничего не останется.
+ent-MobPirateT2Cutlass = абордажник пиратов
+    .desc = Вольный член команды абордажа. Присоёдинился недавно но уже вовсю использует внезапность и стремительность, чтобы захватить цель.
+ent-MobPirateT2ECutlass = абордажник-ветеран пиратов
+    .desc = Член команды абордажа. Использует внезапность и стр..а нет у него же Ээээнерго Сабля! Трепещите крысы!.
+ent-MobPirateT2Sledgehammer = кувалдарь пиратов
+    .desc = Абордажник, вооружённый кувалдой, которой способен проломить шлюз или чью-нибудь голову.
+ent-MobPirateT2GauntletDrill = бурильщик пиратов
+    .desc = Бурит во имя… бурения. Ни один корпус шаттла или гора не устоит перед его буровой перчаткой.
+ent-MobPirateT2Shotgun = мушкетонщик пиратов
+    .desc = Знает толк в дробовиках, вооружен мушкетоном. Меньше дробовик, больше ручная пушка. Стреляет всем, что влезло в ствол.
+ent-MobPirateT2ShotgunMiniBall = мушкетонщик пиратов
+    .desc = Знает толк в дробовиках, вооружен мушкетоном. Меньше дробовик, больше ручная пушка. Стреляет всем, что влезло в ствол.
+ent-MobPirateT2ShotgunGlass = мушкетонщик пиратов
+    .desc = Знает толк в дробовиках, вооружен мушкетоном. Меньше дробовик, больше ручная пушка. Стреляет всем, что влезло в ствол.
+ent-MobPirateT2Musket = мушкетер пиратов
+    .desc = Пират вооруженый старинным мушкетом крупного калибра и штыком.
+ent-MobPirateT2MachineCannon = ядромётчик пиратов
+    .desc = Пират с ручной пушкой с ленточным питанием... Что?!.
+ent-MobPirateT2Mech = Большой Ярк
+    .desc = Тяжелый древний мех для суровых условий глубокого космоса. Этот Громилла оснащён встроенным промышленным горным буром.
+ent-MobPirateT2Juggernaut = Мурмилло
+    .desc = Одет в тяжелый древний бронескафандр. Медлительный, но чрезвычайно живучий.
+ent-MobPirateT2DoubleFlintlock = дуэлист пиратов
+    .desc = Вооружён парой старинных кремнёвых пистолетов. Стреляет медленно, зато больно.
+ent-MobPirateT2DoubleRevolver = пистолетчик пиратов
+    .desc = Использует два пиратских револьвера. Один револьвер хорошо а два ещё лучше.
+ent-MobPirateT2RevolverCutlass = боцман пиратов
+    .desc = Закалённый пират. Сочетает меткость стрелка и свирепость абордажника. Предпочитает сначала прострелить, а потом дорубить то, что осталось.
+
+ent-MobPirateT3Revolver = охотник за головами
+    .desc = Наёмник, вставший под пиратские флаги. Быстрые руки, ещё быстрее курок.
+ent-MobPirateT3Grenadier = пират-гренадер
+    .desc = Увешан фейерверками и бомбами. О технике безопасности не слышал или просто громко игнорирует.
+ent-MobPirateT3Bola = наёмник преследователь
+    .desc = Спонсированный наёмник, швыряющий болы, тебе не убежать от него.
+ent-MobPirateT3Stun = наёмник глушитель
+    .desc = Фрилансер, сначала оглушающий гранатой, а затем добивающий цель.
+ent-MobPirateT3Shield1984 = наёмник пистолетчик
+    .desc = Наёмник вооружённый стробо-щитом и качественным пистолетом, ты же надел солнечные очки?
+ent-MobPirateT3ShieldSMG = наёмник абордажник
+    .desc = Наёмник с тяжёлым пулестойким щитом. Сдержит удар и ответит очередью из своего Скорпиона.
+ent-MobPirateT3DMR = наёмник стрелок
+    .desc = Быстрая винтовка, точные очереди и прототип стелс-костюма синдиката. Вот что нужно для охоты на дублоны.
+ent-MobPirateT3Infiltrator = наёмник стрелок-ветеран
+    .desc = Опытный стрелок с полноценным бронекостюмом и стелс-режимом. Любит воровать еду, оставаясь невидимым.
+ent-MobPirateT3Rifle = наёмник штурмовик
+    .desc = Быстрый, агрессивный, с приемлемой меткостью. Обычно этого достаточно.
+ent-MobPirateT3Rifle2 = наёмник штурмовик-ветеран
+    .desc = Фрилансер в крепкой броне и с ботинками-прыгунами.
+ent-MobPirateT3L6 = наёмник пулемётчик-ветеран
+    .desc = Вооружен легендарным L6 SAW, должно быть урвал по скидке. Давит огнём всё, что движется.
+ent-MobPirateT3SMG = наёмник рейдер
+    .desc = Входит первым, стреляет быстро, не всегда в мишень. Вооружён старым тяжелым ПП С-40.
+ent-MobPirateT3Sniper = драгун
+    .desc = Фрилансер с винтовкой Драгунов. Раздобыв бронебойные стал опасен против любой брони.
+ent-MobPirateT3RPD = наёмник пулемётчик
+    .desc = Полезен в штурме и опасен везде. Вооружён РПД-Ш. Не так хорош, как SAW, но дешевле.
+ent-MobPirateT3LaserSMG = саламандра
+    .desc = Наёмник, вооружённый лазерным пистолет-пулемётом. Быстро заливает сектор огнём и превращает абордаж в световое шоу.
+ent-MobPirateT3LaserCannon = мамба
+    .desc = Наёмник с тяжёлой плазменной пушкой. Мастерски прожарит вас в собственном соку.
+
+ent-MobPirateT1Boss = Ржавый Кулак
+    .desc = Старый ветеран утилизаторов, больше металла, чем человека.
+ent-MobPirateT2Boss = Капитан Золотой Болт
+    .desc = Легенда космоса, в равных долях пугающая и пьяная.
+ent-MobPirateT3Boss = Красный Черепень
+    .desc = Тяжёлый боевой экзокостюм СССП разновидности «Дюранда». Медленный, но неумолимый. Вооружён старым пулемётом крупного калибра. Может выдать рывок, выпустить огонь или скрыться в дыму, сопровождая всё жутким смехом.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl
@ -12,3 +12,5 @@ ent-AutolathePrisonMetusMachineCircuitboard = тюремный автолат (
    .desc = Потускневшая, с обломанными креплениями и тонкими трещинами, местами ещё теплая от редких импульсов питания.
 ent-SewingPrinterMetusMachineCircuitboard = тюремный швейный принтер (машинная плата)
    .desc = Изрезана следами пайки с закисшими контактами и следами перегораний, изредка мерцают тусклые диоды.
+ent-PirateTechFabCircuitboard = плата пиратского фабрикатора
+    .desc = { ent-BaseMachineCircuitboard.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/pda.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/devices/pda.ftl
@ -70,5 +70,8 @@ ent-PilotPDA = КПК пилота
    .desc = Имеет защиту от космической радиации.
 ent-CommaidPDA = КПК горничной командования
    .desc = { ent-BasePDA.desc }
+ent-PiratePDAMusic = КПК с черепушкой и пианино
+    .suffix = Музыка
+    .desc = 'Чёрный цвет – стильно! Череп и кости – круто! Теперь грабить можно под музыку!'
 ent-SecuritySergeantPDA = КПК сержанта СБ
    .desc = Всё ещё работает. В отличие от владельца, не кричит на вас.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/PirateUplink.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/PirateUplink.ftl
@ -0,0 +1,27 @@
+ent-DoubloonBase = дублон
+    .desc = Грязная монета, используемая для нечестивых пиратских сделок.
+ent-Doubloon = дублоны
+    .desc = { ent-DoubloonBase.desc }
+    .suffix = 100 ДБ
+ent-Doubloon1 = дублоны
+    .desc = { ent-DoubloonBase.desc }
+    .suffix = 1 ДБ
+ent-Doubloon5 = дублоны
+    .desc = { ent-DoubloonBase.desc }
+    .suffix = 5 ДБ
+ent-Doubloon15 = дублоны
+    .desc = { ent-DoubloonBase.desc }
+    .suffix = 15 ДБ
+ent-Doubloon50 = дублоны
+    .desc = { ent-DoubloonBase.desc }
+    .suffix = 50 ДБ
+ent-PirateUplinkDebug = радио черного рынка
+    .desc = Если вы не админ то как можно скорее верните эту штуку ближайшему админу.
+    .suffix = 999, ДЕБАГ
+ent-ComputerPirateUplink = консоль черного рынка
+    .desc = Старый ржавый терминал, едва держащийся на проводах и удаче. Экран мерцает, но сеть черного рынка все еще отвечает.
+ent-ComputerPirateExchanger = обменник черного рынка
+    .desc = Старый ржавый терминал, едва держащийся на проводах и удаче. Экран мерцает, но сеть черного рынка все еще отвечает.
+ent-ComputerPirateExchangerWallmount = обменник черного рынка
+    .desc = Настенная версия ржавого обменника, еле живая, но все еще подключенная к черному рынку.
+
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/weapons/gun/combat.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/weapons/gun/combat.ftl
@ -8,13 +8,16 @@ ent-WeaponMechCombatMG = Устанавливаемый MG
    .desc = Древний тяжёлый пулемёт, получивший новую жизнь в качестве оружия для меха
    .suffix = Оружие мехов, Боевое
 ent-WeaponMechCombatPirateCannon = Устанавливаемая пиратская пушка
-    .desc = Древнее тяжёлое орудие, получившее новую жизнь в качестве оружия для меха
+    .desc = Древняя пушка пиратов, получившая новую жизнь в качестве оружия для меха, стреляет картечным зарядом.
    .suffix = Оружие мехов, Пушка, Боевое, Пиратское
-ent-WeaponMechCombatPirateGrapeshot = Устанавливаемый пиратский картечный выстрел
-    .desc = Древнее тяжёлое орудие, получившее новую жизнь в качестве оружия для меха
+ent-WeaponMechCombatPirateGrapeshot = Устанавливаемая картечница
+    .desc = Древний большой мушкетон, получивший новую жизнь в качестве оружия для меха, стреляет усиленным картечным зарядом.
    .suffix = Оружие мехов, Пушка, Боевое, Пиратское
-ent-WeaponMechCombatPirateGlassshot = Устанавливаемый пиратский стеклянный выстрел
-    .desc = Древнее тяжёлое орудие, получившее новую жизнь в качестве оружия для меха
+ent-WeaponMechCombatPirateGrapeshotMini = Устанавливаемый мушкетон
+    .desc = Древний большой мушкетон, получивший новую жизнь в качестве оружия для меха
+    .suffix = Оружие мехов, Пушка, Боевое, Пиратское
+ent-WeaponMechCombatPirateGlassshot = Устанавливаемая пиратская стеклянная пушка
+    .desc = Древняя пушка пиратов, получившая новую жизнь в качестве оружия для меха, стреляет картечным зарядом.
    .suffix = Оружие мехов, Пушка, Боевое, Пиратское
 ent-WeaponMechCombatUVM31 = UVM-31 "Дрейк"
    .desc = Тяжёлое оружие массового поражения разработанное Cybersun на основе минигана. теперь на прочном штативе позволяющем вести огонь прямо из МЕХа!
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/base_guns.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/base_guns.ftl
@ -6,9 +6,3 @@ ent-GunHeavy = Тяжелое огнестрельное оружие
    .desc = Мощное огнестрельное оружие для серьезного сопротивления.
 ent-GunVeryHeavy = Особо тяжелое огнестрельное оружие
    .desc = Чрезвычайно мощное огнестрельное оружие, способное подавить большинство угроз.
-ent-GunMeleeLight = Легкое оружие ближнего боя
-    .desc = Быстрое и легкое оружие для рукопашной схватки.
-ent-GunMeleeMedium = Среднее оружие ближнего боя
-    .desc = Сбалансированное оружие, подходящее для большинства ситуаций ближнего боя.
-ent-GunMeleeHeavy = Тяжелое оружие ближнего боя
-    .desc = Громоздкое, но разрушительное оружие для ближнего боя.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
@ -1,6 +1,3 @@
-ent-BaseWeaponRifleSunrise = базовая винтовка от санрайза
-    .desc = { ent-BaseWeaponRifle.desc }
-    .suffix = ДЕБАГ
 ent-WeaponRifleAKM = АКM
    .desc = Культовое оружие войны. Заряжается патронами калибра 7,62х39мм.
 ent-WeaponRifleAKMU = АКМ-У
@ -19,7 +16,5 @@ ent-WeaponRifleLecterMk2 = Лектер Мк2
    .desc = Улучшенный вариант армейской штурмовой винтовки. Встроенна новейшая система автоматического сброса пустого магазина. Использует патроны калибра .20 винтовочный.
 ent-WeaponRifleLecterMk2Empty = Лектер Мк2
    .desc = { ent-WeaponRifleLecterMk2.desc }
-ent-WeaponRifleSTG44 = STG 44
-    .desc = Признанная классикой, эта конструкция была воспринята как первая успешная концепция штурмовой винтовки, обычно называемая "штурмовой винтовкой". Имеет более высокую, чем обычно, скорострельность для своего класса.
 ent-WeaponRifleAsh12 = АШ-12
    .desc = Тяжёлая автоматическая винтовка под пули дробовика. Бьёт, как молоток.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/lathe.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/machines/lathe.ftl
@ -2,6 +2,8 @@ ent-ExosuitFabricatorHyperConvection = гиперконвекционный фа
    .desc = Экспериментальный фабрикатор экзокостюмов, использующий технологию экстремального нагрева для замедленного, но гораздо более экономичного создания предметов.
 ent-AutolathePrisonMetus = тюремный автолат
    .desc = Производит базовые изделия из металла и стекла по тюремному стандарту.
+ent-PirateTechFab = пиратский фабрикатор
+    .desc = Производит оружие, патроны и снаряжение для маргиналов. «Оптимизированная по расходу» версия жертвует скоростью и ассортиментом ради экономии ресурсов.
 ent-AmmoLathe = боеприпас-о-лат
    .suffix = Космобитва
    .desc = Печатает боеприпасы и ремонтные детали для обслуживания шаттла. «Оптимизированная по стоимости модель» имеет пониженную скорость производства и ограниченный выбор.
--- a/Resources/Locale/ru-RU/_prototypes/entities/clothing/head/eva-helmets.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/clothing/head/eva-helmets.ftl
@ -10,5 +10,3 @@ ent-ClothingHeadHelmetAncient = пустотный шлем NTSRA
    .desc = Древний космический шлем, разработанный по заказу Центком поразделением NTSRA - агентством космических исследований NanoTrasen.
 ent-ClothingHeadHelmetVoidParamed = пустотный шлем парамедика
    .desc = Пустотный шлем, предназначенный для парамедиков.
-ent-ClothingHeadSoftsuitCBURN = CBURN шлем
-    .desc = Тяжёлый огнеупорный шлем, используемый подразделениями спецзачистки.
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/tools/access_breaker.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/tools/access_breaker.ftl
@ -4,3 +4,6 @@ ent-AccessBreakerUnlimited = дешифратор аутентификации
 ent-AccessBreaker = { ent-AccessBreakerUnlimited }
    .suffix = Ограниченный
    .desc = { ent-AccessBreakerUnlimited.desc }
+ent-AccessBreakerPirate = { ent-AccessBreakerUnlimited }
+    .suffix = Пираты
+    .desc = { ent-AccessBreakerUnlimited.desc }
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl
@ -18,7 +18,7 @@ ent-BoxShotgunPractice = коробка ружейных патронов (уч
    .desc = Полная коробка учебных ружейных патронов.
 ent-BoxShellTranquilizer = коробка ружейных патронов (транквилизаторы)
    .desc = Полная коробка ружейных патронов-транквилизаторов.
-ent-MagazineBoxImprovisedShotgun = iкоробка ружейных патронов (.50 импровизированная картечь)
+ent-MagazineBoxImprovisedShotgun = коробка ружейных патронов (.50 импровизированная картечь)
    .desc = Выглядит как самодельная коробка для патронов .50 дробовика, с нарисованным от руки символом пули сверху. Смешивание калибров не рекомендовано.
 ent-BoxShotgunHoly = коробка освященных ружейных патронов (святой)
    .desc = Полная коробка освящённых ружейных патронов. Благословлены. Заряжены. Готовы очищать. Во имя Света, Святых и 12-калибра.
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@ -21,7 +21,7 @@ ent-MagazineLightRifleMaxim = дисковый магазин (7,62)
    .desc = { ent-BaseMagazineLightRifle.desc }
 ent-MagazineLightRiflePkBox = короб патронов ПК (7,62)
    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazineLightRifleBox = короб патронов L6 SAW (5,56мм)
+ent-MagazineRifleBox = короб патронов L6 SAW (5,56мм)
    .desc = { ent-BaseMagazineLightRifle.desc }
 ent-MagazineLightRifle = магазин (7,62)
    .desc = { ent-BaseMagazineLightRifle.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
@ -1,7 +1,7 @@
 ent-BaseMagazineRifle = магазин (5,56)
    .desc = { ent-BaseItem.desc }
 ent-MagazineRifleEmpty = магазин (5,56 любые)
-    .suffix = Пустой
+    .suffix = пустой
    .desc = { ent-MagazineRifle.desc }
 ent-MagazineRifle = магазин (5,56)
    .desc = { ent-BaseMagazineRifle.desc }
@ -21,26 +21,28 @@ ent-MagazineRifleUranium = магазин (5,56 урановые)
    .desc = { ent-BaseMagazineRifle.desc }
 ##
 ent-MagazineRifleBoxSP = короб магазина L6 SAW (5,56 SP)
-    .desc = Коробка, содержащая ленту из 150 патронов калибра .20, используемая легкими пулеметами, такими как L6. Предназначена для хранения кинетических боеприпасов общего назначения.
+    .desc = Снаряжённый короб на 150 связанных патронов 5,56х45мм, используемый лёгкими пулемётами вроде 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 урановые)
-    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazineRifleM52Empty = магазин М-52 (5,56 любые)
+    .desc = Снаряжённый короб на 150 связанных патронов 5,56х45мм, используемый лёгкими пулемётами вроде L6. Предназначен для FMJ боеприпаса.
+ent-MagazineRifleBoxEmpty = короб магазина L6 SAW (5,56 любые)
+    .desc = { ent-MagazineRifleBox.desc }
+ent-MagazineRifleBoxIncendiary = короб магазина L6 SAW (5,56 зажигательные)
+    .desc = { ent-MagazineRifleBox.desc }
+ent-MagazineRifleBoxUranium = короб магазина L6 SAW (5,56 урановые)
+    .desc = { ent-MagazineRifleBox.desc }
+ent-MagazineRifleM52Empty = магазин M-52 (5,56 любые)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleM52SP = магазин М-52 (5,56 SP)
+ent-MagazineRifleM52SP = магазин M-52 (5,56 SP)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleM52HP = магазин М-52 (5,56 HP)
+ent-MagazineRifleM52HP = магазин M-52 (5,56 HP)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleM52FMJ = магазин М-52 (5,56 FMJ)
+ent-MagazineRifleM52FMJ = магазин M-52 (5,56 FMJ)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleM52AP = магазин М-52 (5,56 AP)
+ent-MagazineRifleM52AP = магазин M-52 (5,56 AP)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleM52Incendiary = магазин М-52 (5,56 зажигательные)
+ent-MagazineRifleM52Incendiary = магазин M-52 (5,56 зажигательные)
    .desc = { ent-MagazineRifle.desc }
-ent-MagazineRifleM52Practice = магазин М-52 (5,56 учебные)
+ent-MagazineRifleM52Practice = магазин M-52 (5,56 учебные)
    .desc = { ent-BaseMagazineRifle.desc }
-ent-MagazineRifleM52Uranium = магазин М-52 (5,56 урановые)
+ent-MagazineRifleM52Uranium = магазин M-52 (5,56 урановые)
    .desc = { ent-BaseMagazineRifle.desc }
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl
@ -1,2 +1,2 @@
 ent-MagazineFoamBox = коробка боеприпасов (пенопласт)
-    .desc = { ent-MagazineLightRifleBox.desc }
+    .desc = { ent-MagazineRifleBox.desc }
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/melee/mining.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/melee/mining.ftl
@ -12,3 +12,7 @@ ent-WeaponCrusherDagger = кинжал-крушитель
    .desc = Уменьшенная версия протокинетического крушителя. Использует кинетическую энергию для высокочастотной вибрации лезвия.
 ent-WeaponCrusherGlaive = глефа-крушитель
    .desc = Ранняя версия протокинетического ускорителя в виде глефы.
+ent-WeaponCrusherBroadAxe = секира-крушитель
+    .desc = Старая версия протокинетического ускорителя в виде широкого топора.
+ent-WeaponGauntletDrill = перчатка-бур К.Р.О.Т.
+    .desc = Прочный экземпляр утилизаторского оборудования. Эта дрель готова пронзить небеса.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/categories.ftl
@ -38,4 +38,6 @@ store-category-ntengineering = Инженерия
 store-category-ntmechs = Мехи
 store-category-ntexplosive = Взрывчатка
 store-category-ntammo = Боеприпасы
-store-category-ntequipment = Экипировка
+store-category-ntequipment = Экипировка
+# PirateUplink
+store-category-exchanger = Обмен
--- a/Resources/Locale/ru-RU/_strings/_sunrise/store/pirate-uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/pirate-uplink-catalog.ftl
@ -0,0 +1,55 @@
+## exchanger
+uplink-exchange-doubloon1-name = Железный дублон
+uplink-exchange-doubloon1-desc = Железная монета номиналом 1 дублон, используется в мелких обменах.
+uplink-exchange-doubloon15-name = Серебрянный дублон
+uplink-exchange-doubloon15-desc = Серебряная монета номиналом 15 дублонов, ценится среди пиратов.
+uplink-exchange-doubloon50-name = Золотой дублон
+uplink-exchange-doubloon50-desc = Золотая монета номиналом 50 дублонов, редкая и дорогая.
+uplink-exchange-doubloon100-name = Алмазный дублон
+uplink-exchange-doubloon100-desc = Дублон с гравировкой на цельном алмазе, номиналом 100 дублонов, чрезвычайно ценная и престижная монета.
+
+## Weapons
+uplink-weapon-scrap-name = Набор СКМ-24 "Мусорщиков"
+uplink-weapon-scrap-desc = Набор штурмовой винтовки, что явно видала виды. В комплекте пара магазинов, попадутся как самодельные патроны, так и бронебойные. Есть шанс, что винтовка взорвётся у вас в руках, но за такую цену это почти как бесплатный фейерверк.
+uplink-weapon-base-name = Набор СКМ-24
+uplink-weapon-base-desc = Набор начинающего наёмника. Оружие прямо со склада, магазины стандартизированы, хотя поставщики меняются чаще, чем носки. Надёжно и точно не взорвётся в руках.
+uplink-weapon-crate-mosin-desc = Большой деревянный ящик прямиком со складов СССП. Внутри четыре оружия бесконечной окопной войны. Кардашёв-Мосин использует патроны калибра 7,62х54R винтовочный.
+## Mech
+uplink-mech-teleporter-pirate-name = Горнодобывающий экзокостюм
+uplink-mech-teleporter-pirate-desc = Тяжелый мех для суровых условий глубокого космоса. Этот Громилла оснащен встроенными ускорителями и промышленным горным буром.
+
+uplink-mech-teleporter-ussp-name = Штурмовой экзокостюм
+uplink-mech-teleporter-ussp-desc = Тяжёлый боевой экзокостюм СССП на базе конструкции «Дюранд». Апогей того, что можно прикупить у вояк из складов СССП. Медленный, но неумолимый. Вооружён старым пулемётом крупного калибра.
+
+
+uplink-piratedeathrattle-implant-desc = Коробка, содержащая достаточное количество имплантов "Предсмертный хрип" на целую команду. Передаёт сообщение с вашими координатами по радиоканалу Фриланса когда вы попадаете в критическое состояние или погибаете.
+# Wearables
+uplink-messenger-random-name = Вместительная сумка
+uplink-messenger-random-desc = Сумка-компромисс между вместимостью и удобством размещения вещей для кражи и военных преступлений!
+uplink-eva-bundle-name = Скафандр EVA "Мусорщиков"
+uplink-eva-bundle-desc = Потрёпанный костюм, весь в скотче но защищает. Самое то за такую цену.
+uplink-eva-armored-bundle-name = Абордажный скафандр EVA "Мусорщиков"
+uplink-eva-armored-bundle-desc = Потрёпанный костюм, весь в скотче и заплатах. Поверх надета мягкая броня, такая же дырявая но всё ещё держит удар.
+uplink-scaf-bundle-name = Скуфандр EVA
+uplink-scaf-bundle-desc = Зелёно-коричневый EVA-костюм, используемый пиратами и наёмниками. Слабо защищает от лазеров, но пули почти не берут. Cоздан для быстрого отхода, когда дело идёт наперекосяк.
+uplink-eva-pirate-bundle-name = Пиратский скафандр EVA
+uplink-eva-pirate-bundle-desc = Культовый пиратский прикид со времен древнего космоса, защита на уровне капитанского скафандра, правда ценой скорости а так же сьемный EVA шлем без какой либо защиты от вспышек
+# Cyber
+uplink-throver-arm = Кистевой гранатомёт "Рамблер"
+uplink-throver-arm-desc = Держите туз в рукаве! Рамблер может стрелять большинством видов гранат кроме артеллерийских а так же использовать патроны дробовика и антиматериальные. При выстреле сильно отталкивает и выводит из равновесия. (Внимание: Требуется помощь хирурга.)
+uplink-hack-arm = Кибер-Рука "НетРаннера"
+uplink-hack-arm-desc = Рука имеющая все инструменты для взлома шлюзов и всего того что можно взломать. Особое устройство на базе мультитула возволяет узнать за что отвечают те или иные провода. От удара током не защитит. (Внимание: Требуется помощь хирурга.)
+uplink-atmos-arm = Кибер-Рука "Атмосианина"
+uplink-atmos-arm-desc = Рука содержащая набор инструментов для ремонта и заделки дыр в обшивке а так же восстанавления атмосферы с нуля. Только для сертифицированных Атмосов! (Внимание: Требуется помощь хирурга.)
+uplink-ripper-arm = Кибер-Рука "Риппера"
+uplink-ripper-arm-desc = Кажется, наличие сертификата хирурга и вопросы санитарии отходят на второй план для пациента, когда вы оперируете его этим имплантом. (Внимание: Требуется помощь хирурга.)
+uplink-mechwright-arm = Кибер-Рука "Механика"
+uplink-mechwright-arm-desc = Набор инструментов встроен в руку. Поздравляем: вы официально стали ближе к киборгу, не забудьте назвать свои законы по первому требованию. (Внимание: Требуется помощь хирурга.)
+# Distruption
+uplink-pirate-fab-name = Пиратский фабрикатор
+uplink-pirate-fab-desc = Сэкономил значит заработал, преобретите свой свообственный фабрикатор для печати базовых боеприпасов и медицины с инструментами. «Оптимизированная по расходу» версия жертвует скоростью ради экономии ресурсов.
+# ally
+uplink-base-scooner-name = Найм Фрилансера
+uplink-base-scooner-desc = Найм и вызов прямиком к вам пирата что согласиться на вашу авантюру, имеет базовое снаряжение.
+uplink-scrapper-scooner-name = Найм Мусорщика
+uplink-scrapper-scooner-desc = Найм и вызов прямиком к вам члена банды мусорщиков что может согласиться на вашу авантюру, имеет базовое снаряжение и немного дублонов с собой.
--- a/Resources/Locale/ru-RU/_strings/store/currency.ftl
+++ b/Resources/Locale/ru-RU/_strings/store/currency.ftl
@ -15,3 +15,5 @@ store-currency-display-stolen-essence = Украденная эссенция
 store-currency-display-silicon-memory = Память
 store-currency-display-wizcoin = Маг₭øин™
 store-currency-display-evolutionpoints = Очки эволюции
+store-currency-display-doubloon = ДБ
+store-currency-display-credit = кредиты
--- a/Resources/Locale/ru-RU/_strings/store/store.ftl
+++ b/Resources/Locale/ru-RU/_strings/store/store.ftl
@ -12,3 +12,5 @@ store-not-account-owner = Этот { $store } не привязан к вам!
 store-preset-name-uplink = Аплинк
 store-preset-name-spellbook = Книга заклинаний
 store-preset-name-ntuplink = Визионер
+store-preset-name-exchanger = Обменник
+store-preset-name-blackmarket = Чёртный рынок
--- a/Resources/Locale/ru-RU/recipes/tags.ftl
+++ b/Resources/Locale/ru-RU/recipes/tags.ftl
@ -201,6 +201,8 @@ construction-graph-tag-dried-cannabis-vita = сушеная каннабис в
 construction-graph-tag-nanopaste = нанопаста
 construction-graph-tag-blue-crystal = синий кристалл
 construction-graph-tag-crystallite = кристаллит
+construction-graph-tag-doubloon = дублон
+construction-graph-tag-credit = кредит
 construction-graph-tag-suntick = сантики
 construction-graph-tag-runic-metal = рунический металл
 # Мебель
--- a/Resources/Maps/_Sunrise/Shuttles/Antag/falcon.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/Antag/falcon.yml
--- a/Resources/Maps/_Sunrise/Shuttles/Antag/rust_brass.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/Antag/rust_brass.yml
--- a/Resources/Maps/_Sunrise/Shuttles/pirate_small.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/pirate_small.yml
--- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
@ -89,6 +89,8 @@
        prob: 0.25
      - id: WeaponSubMachineGunSkorpion
        prob: 0.15
+      - id: WeaponRifleSKM24Scrap
+        prob: 0.15
      - id: WeaponSubMachineGunPPSH
        prob: 0.10
      - id: WeaponIonRifle
@ -105,4 +107,103 @@
        prob: 0.001
      - id: WeaponLightMachineGunRPD
        prob: 0.001
+
+- type: entity
+  id: CratePirateChestCannonBall
+  suffix: Filled
+  parent: CratePirate
+  components:
+  - type: StorageFill
+    contents:
+      - id: CannonBall
+        amount: 6
+
+- type: entity
+  id: CratePirateChestCannonBallFuze
+  suffix: Filled
+  parent: CratePirate
+  components:
+  - type: StorageFill
+    contents:
+      - id: CannonBallFuze
+        amount: 6
+
+- type: entity
+  id: CratePirateChestGrapeshot
+  suffix: Filled
+  parent: CratePirate
+  components:
+  - type: StorageFill
+    contents:
+      - id: CannonBallGrapeshot
+        amount: 6
+
+- type: entity
+  id: CratePirateChestCannonEMP
+  suffix: Filled
+  parent: CratePirate
+  components:
+  - type: StorageFill
+    contents:
+      - id: CannonBallEMPshot
+        amount: 6
+
+- type: entity
+  id: CratePirateChestGlassshot
+  suffix: Filled
+  parent: CratePirate
+  components:
+  - type: StorageFill
+    contents:
+      - id: CannonBallGlassshot
+        amount: 6
+
+- type: entity
+  id: CratePirateChestCannonBallMiniMix
+  suffix: Filled
+  parent: CratePirate
+  components:
+  - type: StorageFill
+    contents:
+      - id: CannonBallGrapeshotMini
+        amount: 8
+      - id: CannonBallMini
+        amount: 8
+
+- type: entity
+  id: CratePiraterEVASuitArmoredBundle
+  suffix: Filled
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetPirate
+        orGroup: HelmetPool
+      - id: ClothingHeadHelmetPirateAlt
+        orGroup: HelmetPool
+      - id: ClothingHeadHelmetPirateAlt2
+        orGroup: HelmetPool
+      - id: ClothingOuterEVASuitPirateArmoredAlt
+        orGroup: HardPool
+      - id: ClothingOuterEVASuitPirateArmored
+        orGroup: HardPool
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: DoubleEmergencyOxygenTankFilled
+
+- type: entity
+  id: CratePiraterEVASuitBundle
+  suffix: Filled
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHelmetPirate
+        orGroup: HelmetPool
+      - id: ClothingHeadHelmetPirateAlt
+        orGroup: HelmetPool
+      - id: ClothingHeadHelmetPirateAlt2
+        orGroup: HelmetPool
+      - id: ClothingOuterEVASuitPirate
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: DoubleEmergencyOxygenTankFilled
 #SUNRISE-End
--- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
@ -107,6 +107,32 @@
      - id: MechPaintMaulerMeowler
        prob: 0.25

+- type: entity
+  id: CratePirateMechYarrkeBundle
+  suffix: Filled
+  parent: CrateLivestock
+  name: Blackmarket salvage mech bundle
+  description: Contains a set of Cybersan light armored mechs.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MechBigYarrkeBattery
+      - id: ToolboxSyndicateMechRepair
+
+- type: entity
+  id: CratePirateMechDollHouseBundle
+  suffix: Filled
+  parent: CrateLivestock
+  name: Blackmarket USSP mech bundle
+  description: Contains a set of Cybersan medium armored mechs.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MechDollHouseFilled
+      - id: ToolboxSyndicateMechRepair
+      - id: MechPaintDollHouseWarboss
+        prob: 0.25
+
 - type: entity
  id: CrateCybersunRipleyBundle
  suffix: Filled
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@ -9,9 +9,20 @@
    ChemistryBottleEpinephrine: 3
    Syringe: 3
    PillCanisterTricordrazine: 2
+    PatchPack: 1 # Sunrise-Edit
+    PatchBrute: 2 # Sunrise-Edit
+    PatchBruteSmall: 3 # Sunrise-Edit
+    PatchBurn: 2 # Sunrise-Edit
+    PatchBurnSmall: 3 # Sunrise-Edit
  contrabandInventory:
    PillCanisterRandom: 1
    PowerCellSmall: 2
+    PatchBurn: 1 # Sunrise-Edit
+    PatchBrute: 1 # Sunrise-Edit
+  emaggedInventory: # Sunrise Edit
+    StimpackMini: 1 # Sunrise Edit
+    PatchOmni: 5 # Sunrise Edit
+    PatchPack: 1 # Sunrise-Edit

 - type: vendingMachineInventory
  id: NanoMedCivilianWallInventory
@ -25,9 +36,19 @@
    ChemistryBottleEpinephrine: 3
    Syringe: 3
    PillCanisterTricordrazine: 2
+    PatchPack: 1 # Sunrise-Edit
+    PatchBrute: 2 # Sunrise-Edit
+    PatchBruteSmall: 3 # Sunrise-Edit
+    PatchBurn: 2 # Sunrise-Edit
+    PatchBurnSmall: 3 # Sunrise-Edit
  contrabandInventory:
    PillCanisterRandom: 1
    PowerCellSmall: 2
+    PatchBurn: 1 # Sunrise-Edit
+    PatchBrute: 1 # Sunrise-Edit
+  emaggedInventory: # Sunrise Edit
+    StimpackMini: 1 # Sunrise Edit
+    PatchOmni: 3 # Sunrise Edit

 - type: vendingMachineInventory
  id: NanoMedPlusInventory
@ -52,16 +73,22 @@
    HyposprayMedical: 2 # Sunrise-Edit
    Dropper: 2 # Sunrise-Edit
    BaseChemistryEmptyVial: 2 # Sunrise-Edit
-    PatchPack: 4 # Sunrise-Edit
-    PatchMedical: 5 # Sunrise-Edit
-    PatchBrute: 5 # Sunrise-Edit
-    PatchBruteSmall: 8 # Sunrise-Edit
-    PatchBurn: 5 # Sunrise-Edit
-    PatchBurnSmall: 8 # Sunrise-Edit
+    PatchPack: 3 # Sunrise-Edit
+    PatchPackBrute: 1 # Sunrise-Edit
+    PatchPackHeat: 1 # Sunrise-Edit
+    PatchBrute: 3 # Sunrise-Edit
+    PatchBruteSmall: 9 # Sunrise-Edit
+    PatchBurn: 3 # Sunrise-Edit
+    PatchBurnSmall: 9 # Sunrise-Edit
  contrabandInventory:
    PillCanisterRandom: 3
    PillSpaceDrugs: 3
    FoodApple: 1
+    PatchMedical: 6 # Sunrise-Edit
+  emaggedInventory: # Sunrise Edit
+    Stimpack: 1 # Sunrise Edit
+    PatchOmni: 5 # Sunrise Edit
+    PatchPack: 1 # Sunrise-Edit

 - type: vendingMachineInventory
  id: NanoMedCivilianInventory
@ -80,11 +107,16 @@
    PillCanisterIron: 1
    PillCanisterCopper: 1
    PillCanisterPotassiumIodide: 1
+    PatchPack: 2 # Sunrise-Edit
+    PatchBrute: 2 # Sunrise-Edit
+    PatchBruteSmall: 3 # Sunrise-Edit
+    PatchBurn: 2 # Sunrise-Edit
+    PatchBurnSmall: 3 # Sunrise-Edit
  contrabandInventory:
    PillCanisterRandom: 1
    PillSpaceDrugs: 3
    FoodApple: 1
-    MiniSyringe: 3 # Sunrise Edit
-  emaggedInventory:
+  emaggedInventory: # Sunrise Edit
    Stimpack: 1 # Sunrise Edit
-    PatchOmni: 2 # Sunrise Edit
+    PatchOmni: 5 # Sunrise Edit
+    PatchPack: 1 # Sunrise-Edit
--- a/Resources/Prototypes/Catalog/discount_categories.yml
+++ b/Resources/Prototypes/Catalog/discount_categories.yml
@ -11,3 +11,19 @@
  id: veryRareDiscounts # Casually used items that are widely used but can be (rarely) discounted for epic lulz.
  weight: 2
  maxItems: 4 #Sunrise-Edit
+
+# sunrise-start
+- type: discountCategory
+  id: rarePirateDiscounts # Dirty-cheap items that are rarely used and can be discounted to 0-ish cost to encourage usage.
+  weight: 18
+  maxItems: 12 #Sunrise-Edit
+
+- type: discountCategory
+  id: usualPirateDiscounts # Cheap items that are used not very often.
+  weight: 80
+
+- type: discountCategory
+  id: veryRarePirateDiscounts # Casually used items that are widely used but can be (rarely) discounted for epic lulz.
+  weight: 2
+  maxItems: 8 #Sunrise-Edit
+# sunrise-end
--- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
@ -117,37 +117,3 @@
    - CorgiWearable
    - HelmetEVA
    - WhitelistChameleon
-
-# Sunrise-start
-#EVA CBURN Helmet
- type: entity
-  parent: ClothingHeadEVAHelmetBase
-  id: ClothingHeadSoftsuitCBURN
-  name: CBURN helmet
-  description: A pressure resistant and fireproof hood worn by special cleanup units.
-  components:
-  - type: Sprite
-    sprite: _Starlight/Clothing/Head/cburn.rsi
-    layers:
-    - state: icon
-    - state: icon-unshaded
-      shader: unshaded
-    - state: light-overlay
-      visible: false
-      shader: unshaded
-      map: [ "light" ]
-  - type: Clothing
-    clothingVisuals:
-      head:
-      - state: equipped-head
-      - state: equipped-head-unshaded
-        shader: unshaded
-      head-vox:
-      - state: equipped-head-vox
-      - state: equipped-head-unshaded-vox
-        shader: unshaded
-    equipSound: /Audio/Mecha/mechmove03.ogg #starlight
-    unequipSound: /Audio/Mecha/mechmove03.ogg #starlight
-    equipDelay: 2 #starlight
-    unequipDelay: 2 #starlight
-# Sunrise-end
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@ -177,45 +177,3 @@
    tags:
    - CorgiWearable
    - WhitelistChameleon
-
-# Sunrise-start
-#CBURN Softsuit
- type: entity
-  parent: [ BaseCentcommContraband, ClothingOuterEVASuitBase ]
-  id: ClothingOuterSoftsuitCBURN
-  name: CBURN insulated EVA suit
-  description: A heavyweight, tough and padded EVA capable biosuit used for special cleanup operations.
-  components:
-  - type: Sprite
-    sprite: _Starlight/Clothing/OuterClothing/Hardsuits/cburn.rsi
-  - type: Clothing
-    sprite: _Starlight/Clothing/OuterClothing/Hardsuits/cburn.rsi
-    equipSound: /Audio/Mecha/mechmove03.ogg #starlight
-    unequipSound: /Audio/Mecha/mechmove03.ogg #starlight
-    equipDelay: 3 #starlight
-    unequipDelay: 3 #starlight
-  - type: ExplosionResistance
-    damageCoefficient: 0.5
-  - type: FireProtection
-    reduction: 0.5
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.5
-        Slash: 0.3
-        Piercing: 0.5
-        Heat: 0.1
-        Cold: 0.1
-        Shock: 0.1
-        Radiation: 0.1
-        Caustic: 0.1
-  - type: ZombificationResistance
-    zombificationResistanceCoefficient: 0.1
-  - type: ClothingSpeedModifier
-    walkModifier: 0.75
-    sprintModifier: 0.75
-  - type: HeldSpeedModifier
-  - type: Tag
-    tags:
-    - SuitEVA
-# Sunrise-end
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@ -1740,10 +1740,17 @@
       pda-pirate
  # Sunrise-Start
  - type: PdaBorderColor
-    borderColor: "#616266"
+    borderColor: "#333333"
  # Sunrise-End
  - type: Icon
    state: pda-pirate
+  - type: CartridgeLoader
+    preinstalled:
+    - NotekeeperCartridge
+    - NanoTaskCartridge
+    - NavigatorCartridge
+    - AstroNavCartridge
+  # Sunrise-end

 - type: entity
  parent: [BasePDA, SelectableLock]
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@ -52,6 +52,11 @@
        mask:
        - ItemMask
  - type: Appearance
+  # Sunrise-start
+  - type: Currency
+    price:
+      Credit: 1
+  # Sunrise-end

 - type: material
  id: Credit
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@ -222,7 +222,7 @@
          Heat: 1
  # Sunrise-Start
    - type: Reflect
-      reflectProb: 0.75
+      reflectProb: 0.25
      reflects:
      - Energy
  # Sunrise-End
@ -247,6 +247,14 @@
          Piercing: 0.5
        flatReductions:
          Piercing: 1
+  # Sunrise-Start
+    - type: Reflect
+      reflectProb: 0.1
+      spread: 180
+      soundOnReflect: /Audio/_Starlight/Armor/Ricochet/ricochet1_1.ogg
+      reflects:
+      - NonEnergy
+  # Sunrise-End

 #Craftable shields

--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml
@ -9,7 +9,8 @@
    sprite: Objects/Specific/Mech/mecha_equipment.rsi
    state: mecha_kineticgun
  - type: Gun
-    fireRate: 0.95
+    fireRate: 0.75
+    projectileSpeed: 20
    selectedMode: SemiAuto
    availableModes:
      - SemiAuto
@ -17,9 +18,16 @@
      path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
  - type: ProjectileBatteryAmmoProvider
    proto: BulletKineticShuttle
-    fireCost: 30
+    fireCost: 25
  - type: Appearance
  - type: AmmoCounter
+  - type: UpgradeableGun
+    whitelist:
+      tags:
+      - PKAUpgrade
+  - type: ContainerContainer
+    containers:
+      upgrades: !type:Container

 - type: entity
  id: WeaponMechIndustrialPlasmaCutter
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@ -471,15 +471,12 @@
    soundOnReflect: /Audio/_Starlight/Armor/Ricochet/ricochet1_1.ogg
    reflects:
    - NonEnergy
-  - type: MeleeThrowOnHit
-    distance: 1
-    speed: 8
  - type: MeleeWeapon
    hidden: true
    attackRate: 1
    damage:
      types:
-        Blunt: 30 #intentionally shit so people realize that going into combat with the ripley is usually a bad idea.
+        Blunt: 22
        Structural: 10
    bluntStaminaDamageFactor: 1.5
  - type: MovementSpeedModifier
@ -1584,3 +1581,82 @@
      - WeaponMechCombatMG
      - WeaponMechCombatShotgun
      - WeaponMechCombatMissileRack6
+
+# Doll House
+- type: entity
+  id: MechDollHouse
+  parent: [ BaseMech, CombatMech, BaseMajorContraband ]
+  name: Doll House
+  description: The Heavy Mech USSP, a communist variant of the Durand, features stronger armor and a powerful machine gun.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    noRot: true
+    sprite: Objects/Specific/Mech/durand.rsi
+    scale: 1.08, 1.08
+    layers:
+    - map: [ "enum.MechVisualLayers.Base" ]
+      state: dollhouse
+  - type: FootstepModifier
+    footstepSoundCollection:
+      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
+  - type: Mech
+    baseState: dollhouse
+    openState: dollhouse-open
+    brokenState: dollhouse-broken
+    mechToPilotDamageMultiplier: 0.15
+    airtight: true
+    maxEquipmentAmount: 2
+    pilotWhitelist:
+      components:
+        - HumanoidAppearance
+  - type: MeleeThrowOnHit
+    distance: 1
+    speed: 8
+  - type: MeleeWeapon
+    hidden: true
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 40
+        Structural: 220
+    bluntStaminaDamageFactor: 1.5
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 1
+    baseSprintSpeed: 1.75
+  - type: Damageable
+    damageModifierSet: HeavyArmorSyndi
+  - type: CanMoveInAir
+  - type: MovementAlwaysTouching
+  - type: Reflect
+    reflectProb: 0.15
+    spread: 180
+    soundOnReflect: /Audio/_Starlight/Armor/Ricochet/ricochet1_1.ogg
+    reflects:
+    - NonEnergy
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+    - DollHouse
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+
+- type: entity
+  id: MechDollHouseBattery
+  parent: MechDollHouse
+  suffix: Battery
+  components:
+  - type: ContainerFill
+    containers:
+      mech-battery-slot:
+      - PowerCageSyndicate
+
+- type: entity
+  id: MechDollHouseFilled
+  parent: MechDollHouseBattery
+  suffix: Battery, Filled
+  components:
+  - type: Mech
+    startingEquipment:
+      - WeaponMechCombatMaxim
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@ -212,4 +212,4 @@
  - type: Construction
    graph: UpgradeCyberGorilla
    node: start
-  #Sunrise-end
+  #Sunrise-end
--- a/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_breaker.yml
@ -23,3 +23,12 @@
  - type: AutoRecharge
  - type: StaticPrice
    price: 2000
+
+- type: entity
+  parent: AccessBreaker
+  id: AccessBreakerPirate
+  suffix: Pirate
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/access_breaker.rsi
+    state: icon-pirate
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@ -55,6 +55,13 @@
  - type: Construction
    graph: FireBomb
    node: firebomb
+  - type: CartridgeAmmo #Sunrise-Start
+    proto: BulletFireBomb
+    deleteOnSpawn: true
+  - type: SpentAmmoVisuals
+  - type: Tag
+    tags:
+    - HandGrenadeAmmo #Sunrise-End

 # has igniter but no fuel or wires
 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@ -35,7 +35,7 @@

 # Magazines
 # - type: entity # Sunrise-edtit #Moved to rifle.yml
-#   id: MagazineLightRifleBoxSP
+#   id: MagazineRifleBoxSP
 #   name: "L6 SAW magazine box (.30 rifle SP)"
 #   parent: BaseMagazineLightRifle
 #   description: Box containing a 100-round belt of linked .30 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition.
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@ -489,17 +489,16 @@
  - 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.
+  id: MagazineRifleBoxEmpty
+  name: "L6 SAW magazine box (.20 rifle any)"
+  parent: MagazineRifleBoxSP
+  description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6.
  components:
  - type: Tag
    tags:
      - MagazineLightRifleBox
  - type: BallisticAmmoProvider
-    proto: CartridgeRifleFMJ
-    capacity: 150
+    proto: null
  - type: Item
  - type: Sprite
    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
@ -510,7 +509,16 @@
  - type: Appearance

 - type: entity
-  id: MagazineLightRifleBoxIncendiary
+  id: MagazineRifleBoxFMJ
+  name: "L6 SAW magazine box (.20 rifle FMJ)"
+  parent: MagazineRifleBoxSP
+  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: BallisticAmmoProvider
+    proto: CartridgeRifleFMJ
+
+- type: entity
+  id: MagazineRifleBoxIncendiary
  name: "L6 SAW magazine box (.20 rifle incendiary)"
  parent: MagazineRifleBoxSP
  components:
@ -524,7 +532,7 @@
      map: ["enum.GunVisualLayers.Mag"]

 - type: entity
-  id: MagazineLightRifleBoxUranium
+  id: MagazineRifleBoxUranium
  name: "L6 SAW magazine box (.20 rifle uranium)"
  parent: MagazineRifleBoxSP
  components:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@ -240,8 +240,11 @@
  - type: Projectile
    damage:
      types:
-        Piercing: 25
-        Structural: 5
+        Piercing: 20 # Sunrise-edit
+        Blunt: 5 # Sunrise-edit
+        Structural: 15 # Sunrise-edit
+  - type: StaminaDamageOnCollide # Sunrise-add
+    damage: 15 # Sunrise-add

 - type: entity
  id: PelletGrapeshotSpread
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@ -84,7 +84,7 @@
        staminaMultiplier: 100
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
-    maxOffset: 4
+    maxOffset: 5
    pvsIncrease: 0.5
  # Sunrise end

@ -109,10 +109,6 @@
  - type: StaticPrice
    price: 10000
  # Sunrise start
-  - type: CursorOffsetRequiresWield
-  - type: EyeCursorOffset
-    maxOffset: 4
-    pvsIncrease: 0.4
  - type: SpeedModifiedOnWield
    walkModifier: 0.85
    sprintModifier: 0.85
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@ -239,8 +239,8 @@
    sprite: Objects/Weapons/Guns/Rifles/XL8.rsi
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
-    maxOffset: 5 # Sunrise-Edit
-    pvsIncrease: 0.5 # Sunrise-Edit
+    maxOffset: 7 # sunrise-edit
+    pvsIncrease: 0.7 # sunrise-edit
  - type: StaticPrice
    price: 1500 #3x lecter
  - type: Gun
@ -307,8 +307,8 @@
    sprintModifier: 0.75
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
-    maxOffset: 5 # Sunrise-Edit
-    pvsIncrease: 0.5 # Sunrise-Edit
+    maxOffset: 7 # Sunrise-Edit
+    pvsIncrease: 0.7 # Sunrise-Edit
  - type: ContainerContainer
    containers:
      gun_magazine: !type:ContainerSlot
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@ -50,8 +50,8 @@
      collection: SnipersDrop
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
-    maxOffset: 4
-    pvsIncrease: 0.4
+    maxOffset: 5
+    pvsIncrease: 0.5
  - type: KnockbackByUserTag
    doestContain:
      Resomi:
@ -227,6 +227,7 @@
    whitelist:
      tags:
        - CartridgeMagnum # changed from Anti-material rifle rounds because it's a flintlock pistol not a Hristov
+        - CartridgeMagnumImprovised # Sunrise-added
    capacity: 1
    proto: CartridgeMagnumAP
  - type: StaticPrice
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@ -260,3 +260,79 @@
        Blunt: 2
        Slash: 6
        Structural: 20
+
+# Sunrise-start
+- type: entity
+  parent: [ WeaponCrusher, BaseSecurityCargoContraband]
+  id: WeaponCrusherBroadAxe
+  name: crusher broad-axe
+  description: An early design of the proto-kinetic accelerator, in broad-axe form. Provides better healing without exchange for less charged damage.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Melee/crusher_broadaxe.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    sprite: _Sunrise/Objects/Weapons/Melee/crusher_broadaxe-inhands.rsi
+  - type: Clothing
+    sprite: _Sunrise/Objects/Weapons/Melee/crusher_broadaxe.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: UseDelay
+    delay: 0.9
+  - type: BasicEntityAmmoProvider
+    proto: BulletCharge
+    capacity: 1
+    count: 1
+  - type: LeechOnMarker
+    leech:
+      groups:
+        Brute: -20
+      types:
+        Heat: -5
+        Bloodloss: -5
+        Mangleness: -5
+  - type: Tag
+    tags:
+      - Pickaxe
+  - type: MeleeWeapon
+    attackRate: 1
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 4
+        Slash: 6
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 4
+        Slash: 6
+        Structural: 30
+
+- type: entity
+  name: M.O.L.E gauntlet
+  parent: BaseItem
+  id: WeaponGauntletDrill
+  description: A robust piece of salvage equipment. The drill is ready to pierce the heavens
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Melee/moledrill.rsi
+    state: icon
+  - type: Item
+    size: Large
+  - type: MeleeWeapon
+    autoAttack: true
+    angle: 0
+    wideAnimationRotation: -90
+    soundHit:
+      path: "/Audio/Items/drill_use.ogg"
+    attackRate: 5
+    damage:
+      groups:
+        Brute: 9
+      types:
+        Structural: 25
+    bluntStaminaDamageFactor: 1.5
+# Sunrise-end
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@ -47,6 +47,11 @@
    shape:
    - 0,0,0,2
  - type: DisarmMalus
+  # sunrise-start
+  - type: Reflect
+    reflectProb: 0.15
+    spread: 90
+  # sunrise-end

 - type: entity
  name: machete
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
@ -247,6 +247,14 @@
      red: RedAlertAccesses
      blue: BlueAlertAccessesHOS
      gamma: GammaAlertAccesses
+
+- type: entity
+  parent: LockableButton
+  id: LockableButtonNukeOps
+  suffix: NukeOps
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
    # Sunrise-end

 - type: entity
--- a/Resources/Prototypes/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@ -178,32 +178,6 @@
  - type: LoadMapRule
    preloadedGrid: NTIncorporation

-#Sunrise-Start
- type: entity
-  id: UnknownShuttlePirateSmall
-  parent: BaseUnknownShuttleRule
-  components:
-  - type: StationEvent
-    startAnnouncement: null
-    weight: 2
-    earliestStart: 35
-    minimumPlayers: 40
-  - type: LoadMapRule
-    preloadedGrid: PirateSmall
-
- type: entity
-  id: UnknownShuttlePirateMedium
-  parent: BaseUnknownShuttleRule
-  components:
-  - type: StationEvent
-    startAnnouncement: null
-    weight: 2
-    earliestStart: 20
-    minimumPlayers: 70
-  - type: LoadMapRule
-    preloadedGrid: PirateMedium
-#Sunrise-end
-
 - type: entity
  id: UnknownShuttleInstigator
  parent: BaseUnknownShuttleRule
@ -347,6 +321,29 @@
  - type: LoadMapRule
    gridPath: "/Maps/_Sunrise/Shuttles/DSO/ERT/ertall_gamma.yml"

+- type: entity
+  id: UnknownShuttlePirateSmall
+  parent: BaseUnknownShuttleRule
+  components:
+  - type: StationEvent
+    startAnnouncement: null
+    weight: 3
+    earliestStart: 10
+    minimumPlayers: 75
+  - type: LoadMapRule
+    gridPath: "/Maps/_Sunrise/Shuttles/Antag/falcon.yml"
+
+- type: entity
+  id: UnknownShuttlePirateMedium
+  parent: BaseUnknownShuttleRule
+  components:
+  - type: StationEvent
+    startAnnouncement: null
+    weight: 2
+    earliestStart: 20
+    minimumPlayers: 75
+  - type: LoadMapRule
+    gridPath: "/Maps/_Sunrise/Shuttles/Antag/rust_brass.yml"

 - type: entity
  id: PirateMedium
@ -358,7 +355,7 @@
    # duration: -0
    # endAudio: /Audio/Ambience/Antag/pirate_start.ogg
  - type: LoadMapRule
-    gridPath: "/Maps/_Sunrise/Shuttles/pirate_medium.yml"
+    gridPath: "/Maps/_Sunrise/Shuttles/Antag/rust_brass.yml"

 - type: entity
  id: PirateSmall
@ -370,7 +367,7 @@
    # duration: -0
    # endAudio: /Audio/Ambience/Antag/pirate_start.ogg
  - type: LoadMapRule
-    gridPath: "/Maps/_Sunrise/Shuttles/pirate_small.yml"
+    gridPath: "/Maps/_Sunrise/Shuttles/Antag/falcon.yml"

 - type: entity
  id: NukeopsInfiltrator
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@ -40,7 +40,7 @@
  - MagazinePistolHighCapacityIncendiary # Sunrise-Add
  - MagazineRifleHeavyIncendiary # Sunrise-Add
  - MagazineBoxHeavyRifleIncendiary # Sunrise-Add
-  - MagazineLightRifleBoxIncendiary # Sunrise-Add
+  - MagazineRifleBoxIncendiary # Sunrise-Add
  radioChannels: # Sunrise-Add
  - Security

@ -108,7 +108,7 @@
  - MagazinePistolHighCapacityUranium # Sunrise-Add
  - MagazineRifleHeavyUranium # Sunrise-Add
  - MagazineBoxHeavyRifleUranium # Sunrise-Add
-  - MagazineLightRifleBoxUranium # Sunrise-Add
+  - MagazineRifleBoxUranium # Sunrise-Add
  - MagazineLightRifleBeltBoxUranium # Sunrise-Add
  radioChannels: # Sunrise-Add
  - Security
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@ -81,11 +81,11 @@
    eyes: ClothingEyesGlassesSecurity
    head: ClothingHeadHelmetSwat
    mask: ClothingMaskGasSwat
-    outerClothing: ClothingOuterArmorBasicSlim
+    outerClothing: ClothingOuterArmorBulletproofHeavy # Sunrise-Edit
    ears: ClothingHeadsetSecurity
    gloves: ClothingHandsGlovesCombat
  inhand:
-   - WeaponSubMachineGunDrozd # Sunrise-Edit
+   - WeaponSubMachineGunWt550 # Sunrise-Edit
  storage:
    back:
    - BoxSurvivalSecurity
--- a/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/visitors_startinggear.yml
@ -1841,9 +1841,12 @@
    belt: ClothingBeltUtility
    ears: ClothingHeadsetFreelance
    pocket1: WeaponPistolFlintlock
-    pocket2: HandheldGPSBasic
+    pocket2: PinpointerPirate # Sunrise-edit
  inhand:
    - Cutlass
+  storage:
+    back:
+    - Doubloon5

 - type: startingGear
  id: PirateScoonerAltB
@ -1864,6 +1867,7 @@
  id: PirateScoonerAltD
  parent: PirateScoonerAltA
  equipment:
+    id: PiratePDAMusic # Sunrise-added
    head: ClothingHeadHatPirateTricord
    pocket1: WeaponRevolverPirate

--- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
+++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
@ -100,13 +100,3 @@
  id: Spacebus
  path: /Maps/Shuttles/ShuttleEvent/spacebus.yml
  copies: 1
-
- type: preloadedGrid
-  id: PirateSmall
-  path: /Maps/_Sunrise/Shuttles/pirate_small.yml
-  copies: 1
-
- type: preloadedGrid
-  id: PirateMedium
-  path: /Maps/_Sunrise/Shuttles/pirate_medium.yml
-  copies: 1
--- a/Resources/Prototypes/Store/currency.yml
+++ b/Resources/Prototypes/Store/currency.yml
@ -19,6 +19,20 @@
    1: Crystallite1
  canWithdraw: true

+- type: currency
+  id: Doubloon
+  displayName: store-currency-display-doubloon
+  cash:
+    1: Doubloon1
+  canWithdraw: true
+
+- type: currency
+  id: Credit
+  displayName: store-currency-display-credit
+  cash:
+    1: SpaceCash
+  canWithdraw: true
+
 - type: currency
  id: StolenEssence
  displayName: store-currency-display-stolen-essence
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@ -65,4 +65,41 @@
    - Crystallite
    balance:
      Telecrystal: 0
+
+- type: entity
+  id: StorePresetPirateUplink
+  abstract: true
+  components:
+  - type: Store
+    name: store-preset-name-blackmarket
+    categories:
+    - UplinkPirateWeaponry
+    - UplinkPirateAmmo
+    - UplinkPirateExplosives
+    - UplinkPirateChemicals
+    - UplinkPirateDeception
+    - UplinkPirateDisruption
+    - UplinkPirateImplants
+    - UplinkPirateCybernetics
+    - UplinkPirateAllies
+    - UplinkPirateWearables
+    - UplinkPiratePointless
+    - UplinkPirateMechs
+    currencyWhitelist:
+    - Doubloon
+    balance:
+      Doubloon: 0
+
+- type: entity
+  id: StorePresetPirateExchanger
+  abstract: true
+  components:
+  - type: Store
+    name: store-preset-name-exchanger
+    categories:
+    - UplinkPirateExchanger
+    currencyWhitelist:
+    - Credit
+    balance:
+      Credit: 0
 # Sunrise-end
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Shields/shields.yml
@ -126,7 +126,7 @@
              acts: [ "Destruction" ]
        - trigger:
            !type:DamageTrigger
-            damage: 250 #Combined with damage resistances, IF raised, can tank 6 lector magdumps before finally breaking. You will STAM CRIT before then. If just held, or a laser is used it'll function like a normal shield more or less.
+            damage: 200 #Combined with damage resistances, IF raised, can tank 5 lector magdumps before finally breaking. You will STAM CRIT before then. If just held, or a laser is used it'll function like a normal shield more or less.
          behaviors:
            - !type:DoActsBehavior
              acts: [ "Destruction" ]
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml
@ -178,6 +178,32 @@
      tags:
      - Patch

+- type: entity
+  name: patch pack
+  parent: PatchPack
+  id: PatchPackBrute
+  suffix: Brute
+  components:
+  - type: Label
+    currentLabel: brute patch
+  - type: StorageFill
+    contents:
+    - id: PatchBrute
+      amount: 5
+
+- type: entity
+  name: patch pack
+  parent: PatchPack
+  id: PatchPackHeat
+  suffix: Heat
+  components:
+  - type: Label
+    currentLabel: Heat patch
+  - type: StorageFill
+    contents:
+    - id: PatchBurn
+      amount: 5
+
 - type: entity
  name: bluespace drug storage
  id: BluespacePillPatchCanister
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@ -16,7 +16,7 @@
        color: "#717171"
  - type: Tag
    tags:
-      - Cartridge
+      - CartridgeMagnum
      - CartridgeMagnumImprovised
      - CartridgeMagnum
  - type: Construction
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Basic/crossbow.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Basic/crossbow.yml
@ -1,7 +1,8 @@
 - type: entity
  name: energy crossbow
-  id: WeaponEnergyCrossbow
+  id: WeaponEnergyCrossbowBase
  parent: [ BaseItem, BaseSecurityContraband ]
+  abstract: true
  description: Fires low-damage kinetic bolts at a short range.
  components:
  - type: Sprite
@ -44,13 +45,11 @@
    count: 1
  - type: UseDelay
    delay: 1
-  # - type: GunRequiresWield # Sunrise-TODO: отдельно сделать, добавить требование держать в две руки и прицел. Придумать как станция может его получить как в ЫЫ13
-

 - type: entity
  name: mini energy crossbow
  id: WeaponMiniEnergyCrossbow
-  parent: [ WeaponEnergyCrossbow, BaseSecurityContraband ]
+  parent: [ WeaponEnergyCrossbowBase, BaseSyndicateContraband ]
  description: Fires low-damage kinetic bolts at a short range.
  components:
  - type: Sprite
@ -62,3 +61,26 @@
    proto: BulletMiniEnergyCrossbow
    capacity: 1
    count: 1
+
+- type: entity
+  name: energy crossbow
+  id: WeaponEnergyCrossbow
+  parent: [ WeaponEnergyCrossbowBase, BaseSecurityContraband ]
+  description: Fires low-damage kinetic bolts at a short range.
+  components:
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/Basic/large_crossbow.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Item
+    sprite: _Starlight/Objects/Weapons/Guns/Basic/large_crossbow_x64.rsi
+    size: Huge
+  - type: Wieldable
+  - type: GunRequiresWield
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 2
+    pvsIncrease: 0.2
+  - type: Gun
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@ -245,7 +245,7 @@
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
    maxOffset: 8
-    pvsIncrease: 0.5
+    pvsIncrease: 0.8

 - type: entity
  parent: [BaseWeaponBattery, BaseSecurityContraband ]
@ -445,7 +445,7 @@
  - type: CursorOffsetRequiresWield
  - type: EyeCursorOffset
    maxOffset: 5
-    pvsIncrease: 0.3
+    pvsIncrease: 0.5

 - type: entity
  name: ANNIHILATOR
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@ -171,7 +171,7 @@
    types:
      Blunt: 3
      Heat: 32
-  pierceChance: 0.69
+  pierceChance: 0.03
  derivation: 0.05
  ricochetChance: 0.48
  bullet:
@ -297,7 +297,7 @@
    types:
      Blunt: 2
      Heat: 14
-  pierceChance: 0.69
+  pierceChance: 0.03
  derivation: 0.2
  ricochetChance: 0.48
  bullet:
@ -542,7 +542,7 @@
    types:
      Blunt: 3
      Heat: 16
-  pierceChance: 0.69
+  pierceChance: 0.03
  derivation: 0.05
  ricochetChance: 0.48
  bullet:
@ -647,7 +647,7 @@
    types:
      Blunt: 2
      Heat: 15
-  pierceChance: 0.69
+  pierceChance: 0.03
  ricochetChance: 0.48
  bullet:
    sprite:
@ -1168,7 +1168,7 @@
  pierceChance: 0.40
  ricochetChance: 0.30
  staminaDamage: 5
-  pierceLevel: Wood
+  pierceLevel: Metal
  bullet:
    sprite:
      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@ -1181,7 +1181,7 @@
    types:
      Piercing: 28 #+ 30%
      Structural: 5
-  armorPenetration: -0.80
+  armorPenetration: -0.7
  staminaDamage: 10
  pierceChance: 0.05
  ricochetChance: 0.15
@ -1197,7 +1197,7 @@
  pierceChance: 0.8
  ricochetChance: 0.80
  staminaDamage: 3
-  pierceLevel: Metal
+  pierceLevel: HardenedMetal
  bullet:
    sprite:
      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@ -1214,7 +1214,7 @@
  pierceChance: 0.9
  ricochetChance: 0.50
  staminaDamage: 1
-  pierceLevel: HardenedMetal
+  pierceLevel: Rock
  bullet:
    sprite:
      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@ -108,7 +108,7 @@
      path: /Audio/Weapons/Guns/Hits/snap.ogg
  - type: StaminaDamageOnCollide
    damage: 12 # 9 hits to stun sounds reasonable
-      
+
 - type: entity
  id: BulletEnergyCrossbow
  parent: BaseBullet
@ -130,9 +130,9 @@
      types:
        Poison: 20
  - type: TimedDespawn
-    lifetime: 0.4
+    lifetime: 0.5
  - type: GatheringProjectile
-  
+
 - type: entity
  id: BulletMiniEnergyCrossbow
  parent: BulletEnergyCrossbow
@ -145,4 +145,6 @@
  - type: Projectile
    damage:
      types:
-        Poison: 10
+        Poison: 10
+  - type: TimedDespawn
+    lifetime: 0.4
--- a/Resources/Prototypes/_Sunrise/BloodCult/ai_faction.yml
+++ b/Resources/Prototypes/_Sunrise/BloodCult/ai_faction.yml
@ -14,3 +14,4 @@
  - FleshHuman
  - Carps
  - AllHostile
+  - Pirate
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/duffelbag.yml
@ -425,4 +425,102 @@
      - id: DoubleEmergencyOxygenTankFilled
      - id: DoubleEmergencyNitrogenTankFilled

+- type: entity
+  parent: ClothingBackpackMessengerPirate
+  id: ClothingBackpackMessengerPirateDecoyKitFilled
+  name: decoy bundle
+  description: "Contains visual distractions. Smell and audio coming soon."
+  components:
+  - type: StorageFill
+    contents:
+      - id: BalloonPirate1
+      - id: BalloonPirate2
+      - id: BalloonPirate3
+      - id: BalloonPirate4
+      - id: BalloonPirate5
+      - id: BalloonPirate6
+      - id: BalloonPirate7
+      - id: BalloonPirate8
+      - id: GrenadeDummy
+        amount: 4
+      - id: SnapPop
+        amount: 2

+- type: entity
+  id: ClothingBackpackDuffelMilitaryBundleScaf
+  parent: ClothingBackpackDuffelMilitary
+  name: Scaf bundle
+  description: "Contains the old combat EVA suit."
+  components:
+    - type: StorageFill
+      contents:
+        - id: ClothingOuterHardsuitScaf
+        - id: ClothingHeadHelmetHardsuitScaf
+        - id: DoubleEmergencyOxygenTankFilled
+        - id: DoubleEmergencyNitrogenTankFilled
+
+- type: entity
+  id: ClothingBackpackDuffelMilitaryBundlePirateEva
+  parent: ClothingBackpackDuffelMilitary
+  name: Pirate EVA bundle
+  description: "Contains the old pirate EVA suit."
+  components:
+    - type: StorageFill
+      contents:
+        - id: ClothingHeadHelmetPirateOld
+        - id: ClothingOuterEVASuitPirateOld
+        - id: DoubleEmergencyOxygenTankFilled
+        - id: DoubleEmergencyNitrogenTankFilled
+
+- type: entity
+  id: ClothingBackpackMessengerMercenaryBundleSKM24
+  parent: ClothingBackpackMessengerMercenary
+  name: SKM-24 bundle
+  description: "Contains the cheap assault rifle."
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleSKM24
+          orGroup: SKM24
+        - id: WeaponRifleSKM24Syndi
+          orGroup: SKM24
+        - id: WeaponRifleSKM24White
+          orGroup: SKM24
+        - id: WeaponRifleSKM24Nano
+          orGroup: SKM24
+        - id: WeaponRifleSKM24Green
+          orGroup: SKM24
+        - id: MagazineLightRifleFMJ
+        - id: MagazineLightRifleSP
+        - id: MagazineLightRifleSP
+        - id: MagazineLightRifleHP
+        - id: CigPackSyndicate
+        - id: CheapLighter
+
+- type: entity
+  id: ClothingBackpackMessengerPirateBundleSKM24Scrap
+  parent: ClothingBackpackMessengerPirate
+  name: SKM-24 bundle
+  description: "Contains the cheapest assault rifle."
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleSKM24Scrap
+        - id: MagazineLightRifleImprovised
+        - id: MagazineLightRifleImprovised
+        - id: MagazineLightRifleImprovised
+        - id: MagazineBoxImprovisedRifle
+          prob: 0.5
+          orGroup: MagRifle
+        - id: MagazineLightRifleFMJ
+          prob: 0.25
+          orGroup: MagRifle
+        - id: MagazineLightRifleAP
+          prob: 0.01
+          orGroup: MagRifle
+        - id: MagazineLightRifleHP
+          prob: 0.4
+          orGroup: MagRifle
+        - id: MagazineLightRifleSP
+          prob: 0.4
+          orGroup: MagRifle
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/nanotrasen.yml
@ -13,7 +13,25 @@
    - 0,0,5,3
  - type: StorageFill
    contents:
-    - id: DeathRattleImplantCentcomm
+    - id: DeathRattleImplanterCentcomm
+      amount: 6
+
+- type: entity
+  name: Freelance death rattle implant box
+  parent: [BoxCardboard, BaseCentcommContraband]
+  id: BoxFreelanceRattleImplants
+  description: Six death rattle implants for the whole freelance team.
+  components:
+  - type: Sprite
+    layers:
+      - state: box_of_doom
+      - state: syringe
+  - type: Storage
+    grid:
+    - 0,0,5,3
+  - type: StorageFill
+    contents:
+    - id: DeathRattleImplanterFreelance
      amount: 6

 - type: entity
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml
@ -246,27 +246,6 @@
 #     - state: box_of_doom_big
 #     - state: shotgun_uranium

- type: entity
-  parent: BaseSyndicateAmmoKit
-  id: LMGKit
-  name: L6 Saw ammo kit
-  components:
-  - type: Storage
-    grid:
-    - 0,0,2,3
-  - type: StorageFill
-    contents:
-    - id: MagazineRifleBoxSP
-    - id: MagazineRifleBoxSP
-    - id: MagazineRifleBoxSP
-    - id: MagazineRifleBoxSP
-    - id: MagazineRifleBoxFMJ
-    - id: MagazineRifleBoxFMJ
-  - type: Sprite
-    layers:
-    - state: box_of_doom_big
-    - state: l6_base
-
 - type: entity
  parent: BaseSyndicateAmmoKit
  id: MMGKit
@ -289,37 +268,51 @@
    - state: box_of_doom_big
    - state: dl6902

-# - type: entity
-#   parent: LMGKit
-#   id: LMGIncendiaryKit
-#   name: L6 Saw Incendiary ammo kit
-#   components:
-#   - type: StorageFill
-#     contents:
-#     - id: MagazineLightRifleBoxIncendiary
-#     - id: MagazineLightRifleBoxIncendiary
-#     - id: MagazineLightRifleBoxIncendiary
-#     - id: MagazineLightRifleBoxIncendiary
-#   - type: Sprite
-#     layers:
-#     - state: box_of_doom_big
-#     - state: l6_red
+- type: entity
+  parent: MMGKit
+  id: LMGKit
+  name: L6 Saw ammo kit
+  components:
+  - type: Storage
+    grid:
+    - 0,0,3,1
+  - type: StorageFill
+    contents:
+    - id: MagazineRifleBoxSP
+      amount: 3
+    - id: MagazineRifleBoxFMJ
+  - type: Sprite
+    layers:
+    - state: box_of_doom_big
+    - state: l6_base

-# - type: entity
-#   parent: LMGKit
-#   id: LMGUraniumKit
-#   name: L6 Saw Uranium ammo kit
-#   components:
-#   - type: StorageFill
-#     contents:
-#     - id: MagazineLightRifleBoxUranium
-#     - id: MagazineLightRifleBoxUranium
-#     - id: MagazineLightRifleBoxUranium
-#     - id: MagazineLightRifleBoxUranium
-#   - type: Sprite
-#     layers:
-#     - state: box_of_doom_big
-#     - state: l6_uranium
+- type: entity
+  parent: LMGKit
+  id: LMGIncendiaryKit
+  name: L6 Saw Incendiary ammo kit
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineRifleBoxIncendiary
+      amount: 4
+  - type: Sprite
+    layers:
+    - state: box_of_doom_big
+    - state: l6_red
+
+- type: entity
+  parent: LMGKit
+  id: LMGUraniumKit
+  name: L6 Saw Uranium ammo kit
+  components:
+  - type: StorageFill
+    contents:
+    - id: MagazineRifleBoxUranium
+      amount: 4
+  - type: Sprite
+    layers:
+    - state: box_of_doom_big
+    - state: l6_uranium


 ###### Implants ######
@ -358,7 +351,7 @@
  # Sunrise edit end

 - type: entity
-  parent: [ CyberEyeThermalBox, BaseSyndicateContraband ]
+  parent: CyberEyeThermalBox
  id: CyberEyeNightVisionBox
  name: Cyber-Eye "Night Vision" box
  components:
@ -366,6 +359,61 @@
    items:
    - id: CyberEyeNightVision

+- type: entity
+  parent: CyberEyeThermalBox
+  id: CyberArmMantisBox
+  name: Cyber-Arm "Mantis" box
+  description: A small box safety containing one Cyber Arm. Packaging disintegrates when opened, leaving no evidence behind.
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: LeftArmCyberMantisBlade
+
+- type: entity
+  parent: CyberArmMantisBox
+  id: CyberArmHackBox
+  name: Cyber-Arm "Hack" box
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: LeftArmCyberHack
+
+- type: entity
+  parent: CyberArmMantisBox
+  id: CyberArmRipperBox
+  name: Cyber-Arm "Ripper" box
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: LeftArmCyberRipper
+
+- type: entity
+  parent: CyberArmMantisBox
+  id: CyberArmAtmosBox
+  name: Cyber-Arm "Atmos" box
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: LeftArmCyberAtmos
+
+- type: entity
+  parent: CyberArmMantisBox
+  id: CyberArmMechwrightBox
+  name: Cyber-Arm "Mechwright" box
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: LeftArmCyberMechwright
+
+- type: entity
+  parent: CyberArmMantisBox
+  id: CyberArmThrowerBox
+  name: Cyber-Arm "Thrower" box
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: RightArmCyberGrenadeThrower
+
 - type: entity
  parent: [BoxCardboard, BaseSyndicateContraband]
  id: MantisBladeArmsKit
--- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Lockers/suit_storage.yml
@ -37,9 +37,34 @@
  - type: StorageFill
    contents:
        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitPirateEVASun
+          orGroup: OxygenTankPool
+        - id: DoubleEmergencyOxygenTankFilled
+          prob: 0.5
+          orGroup: OxygenTankPool
+        - id: NitrogenTankFilled
+          orGroup: NitrogenTankPool
+        - id: DoubleEmergencyNitrogenTankFilled
+          prob: 0.5
+          orGroup: NitrogenTankPool
        - id: ClothingMaskBreath
        - id: ClothingShoesBootsMagPirate
+        - id: CombatMedipen
+          prob: 0.5
+        - id: JetpackMiniFilled
+          prob: 0.3
+        - id: ClothingHeadHelmetPirate
+          orGroup: HelmetPiratePool
+        - id: ClothingHeadHelmetPirateAlt
+          orGroup: HelmetPiratePool
+        - id: ClothingOuterEVASuitPirate
+          prob: 0.5
+          orGroup: SuitPiratePool
+        - id: ClothingOuterEVASuitPirateArmored
+          prob: 0.45
+          orGroup: SuitPiratePool
+        - id: ClothingOuterEVASuitPirateArmoredAlt
+          prob: 0.3
+          orGroup: SuitPiratePool

 #Pirate hardsuit
 - type: entity
@ -50,7 +75,31 @@
  - type: StorageFill
    contents:
        - id: OxygenTankFilled
-        - id: ClothingOuterHardsuitPirateSun
+          orGroup: OxygenTankPool
+        - id: DoubleEmergencyOxygenTankFilled
+          prob: 0.5
+          orGroup: OxygenTankPool
+        - id: NitrogenTankFilled
+          orGroup: NitrogenTankPool
+        - id: DoubleEmergencyNitrogenTankFilled
+          prob: 0.5
+          orGroup: NitrogenTankPool
+        - id: ClothingHeadHelmetPirate
+          orGroup: HelmetPiratePool
+        - id: ClothingHeadHelmetPirateAlt
+          orGroup: HelmetPiratePool
+        - id: ClothingHeadHelmetPirateOld
+          prob: 0.3
+          orGroup: HelmetPiratePool
+        - id: ClothingOuterEVASuitPirateOld
+          prob: 0.3
+          orGroup: SuitPiratePool
+        - id: ClothingOuterEVASuitPirateArmored
+          prob: 0.4
+          orGroup: SuitPiratePool
+        - id: ClothingOuterEVASuitPirateArmoredAlt
+          prob: 0.25
+          orGroup: SuitPiratePool
        - id: ClothingMaskBreath
        - id: WeaponGrapplingGun
          prob: 0.8
@ -71,6 +120,15 @@
  - type: StorageFill
    contents:
        - id: OxygenTankFilled
+          orGroup: OxygenTankPool
+        - id: DoubleEmergencyOxygenTankFilled
+          prob: 0.5
+          orGroup: OxygenTankPool
+        - id: NitrogenTankFilled
+          orGroup: NitrogenTankPool
+        - id: DoubleEmergencyNitrogenTankFilled
+          prob: 0.5
+          orGroup: NitrogenTankPool
        - id: ClothingOuterHardsuitPirateCapSun
        - id: ClothingMaskBreath
        - id: WeaponGrapplingGun
--- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/advertisements.yml
@ -28,6 +28,12 @@
    prefix: advertisement-liberation-
    count: 31

+- type: localizedDataset
+  id: PirateChatterNPC
+  values:
+    prefix: advertisement-piratehumanoid-
+    count: 48
+
 - type: localizedDataset
  id: NarSieAds
  values:
--- a/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml
--- a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
@ -77,3 +77,35 @@
  coefficients:
    Cold: 0.75
    Heat: 1.25
+
+# Pirate
+- type: damageModifierSet
+  id: MobPirateT1
+  coefficients:
+    Blunt: 0.6
+    Slash: 0.7
+    Piercing: 0.5
+    Heat: 0.7
+    Caustic: 0.5
+
+- type: damageModifierSet
+  id: MobPirateT2
+  coefficients:
+    Blunt: 0.5
+    Slash: 0.6
+    Piercing: 0.4
+    Heat: 0.6
+    Caustic: 0.5
+    Bloodloss: 0.7
+    Mangleness: 0.7
+
+- type: damageModifierSet
+  id: MobPirateT3
+  coefficients:
+    Blunt: 0.4
+    Slash: 0.5
+    Piercing: 0.3
+    Heat: 0.5
+    Caustic: 0.5
+    Bloodloss: 0.5
+    Mangleness: 0.5
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/messenger.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/messenger.yml
@ -0,0 +1,338 @@
+# BASE
+- type: entity
+  abstract: true
+  parent: ClothingBackpack
+  id: ClothingMessenger
+  components:
+  ## One 2x6 and 4x5 pocket, two 3x2 pockets
+  - type: Storage
+    grid:
+    - 0,0,1,3
+    - 0,3,1,4
+    - 3,0,6,4
+    - 8,0,10,1
+    - 8,3,10,4
+
+- type: entity
+  parent: ClothingMessenger
+  id: ClothingBackpackMessengerPassenger
+  name: passenger messenger bag
+  description: A trendy looking messenger bag in tasteful colors.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#777b83"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#777b83"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#777b83"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#777b83"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+## Wild cards
+- type: entity
+  parent: ClothingBackpackMessengerPassenger
+  id: ClothingBackpackMessengerPilot
+  name: pilot messenger bag
+  description: A robust messenger bag for shuttle parts.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#3e2516"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#3e2516"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#3e2516"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#3e2516"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerPassenger
+  id: ClothingBackpackMessengerMercenary
+  name: mercenary messenger bag
+  description: A robust messenger bag for war crimes.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#6a6a36"
+    - state: icon-sling
+      color: "#6a6a36"
+    - state: icon-clasp
+      color: "#bbbb7a"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#6a6a36"
+      - state: sling-equipped-BACKPACK
+        color: "#6a6a36"
+      - state: clasp-equipped-BACKPACK
+        color: "#bbbb7a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#6a6a36"
+      - state: clasp-inhand-left
+        color: "#bbbb7a"
+      right:
+      - state: base-inhand-right
+        color: "#6a6a36"
+      - state: clasp-inhand-right
+        color: "#bbbb7a"
+
+- type: entity
+  parent: ClothingBackpackMessengerPassenger
+  id: ClothingBackpackMessengerPrivateSecurity
+  name: private security messenger bag
+  description:  A robust messenger bag for committing war crimes on a payroll.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#2286bd"
+    - state: icon-sling
+      color: "#9d1c1c"
+    - state: icon-clasp
+      color: "#935c3f"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#2286bd"
+      - state: sling-equipped-BACKPACK
+        color: "#9d1c1c"
+      - state: clasp-equipped-BACKPACK
+        color: "#935c3f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#2286bd"
+      - state: clasp-inhand-left
+        color: "#935c3f"
+      right:
+      - state: base-inhand-right
+        color: "#2286bd"
+      - state: clasp-inhand-right
+        color: "#935c3f"
+
+## Antagonists / Contraband
+- type: entity
+  parent:
+  - ClothingBackpackMessengerPassenger
+  id: ClothingBackpackMessengerSyndicate
+  name: syndicate messenger bag
+  description: A robust messenger bag for waging war against oppressors.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#424242"
+    - state: icon-sling
+      color: "#7f0101"
+    - state: icon-clasp
+      color: "#7f0101"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#424242"
+      - state: sling-equipped-BACKPACK
+        color: "#7f0101"
+      - state: clasp-equipped-BACKPACK
+        color: "#7f0101"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#424242"
+      - state: clasp-inhand-left
+        color: "#7f0101"
+      right:
+      - state: base-inhand-right
+        color: "#424242"
+      - state: clasp-inhand-right
+        color: "#7f0101"
+
+- type: entity
+  parent:
+  - ClothingBackpackMessengerPassenger
+  id: ClothingBackpackMessengerBloodCult
+  name: cultist messenger bag
+  description: A watertight messenger bag for loyal Nar'Sie followers.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#562f2f"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#96907c"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#562f2f"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#96907c"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#562f2f"
+      - state: clasp-inhand-left
+        color: "#96907c"
+      right:
+      - state: base-inhand-right
+        color: "#562f2f"
+      - state: clasp-inhand-right
+        color: "#96907c"
+
+- type: entity
+  id: ClothingBackpackMessengerArcadia
+  name: arcadia messenger bag
+  parent: ClothingBackpackMessengerPassenger
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#bab0b0"
+    - state: icon-base-top
+      color: "#ffffff"
+    - state: icon-decor
+      color: "#c12d30"
+    - state: icon-sling
+      color: "#7d282c"
+    - state: icon-clasp
+      color: "#1f1f1f"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#bab0b0"
+      - state: base-top-equipped-BACKPACK
+        color: "#ffffff"
+      - state: decor-equipped-BACKPACK
+        color: "#c12d30"
+      - state: sling-equipped-BACKPACK
+        color: "#7d282c"
+      - state: clasp-equipped-BACKPACK
+        color: "#1f1f1f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#bab0b0"
+      - state: base-top-inhand-left
+        color: "#ffffff"
+      - state: decor-inhand-left
+        color: "#c12d30"
+      - state: clasp-inhand-left
+        color: "#1f1f1f"
+      right:
+      - state: base-inhand-right
+        color: "#bab0b0"
+      - state: base-top-inhand-right
+        color: "#ffffff"
+      - state: decor-inhand-right
+        color: "#c12d30"
+      - state: clasp-inhand-right
+        color: "#1f1f1f"
+
+- type: entity
+  parent:
+  - ClothingBackpackMessengerPassenger
+  id: ClothingBackpackMessengerPirate
+  name: pirate messenger bag
+  description: A robust messenger bag for war crimes. Yarr.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#3e2516"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#96907c"
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#3e2516"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#96907c"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#3e2516"
+      - state: clasp-inhand-left
+        color: "#96907c"
+      right:
+      - state: base-inhand-right
+        color: "#3e2516"
+      - state: clasp-inhand-right
+        color: "#96907c"
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml
@ -1,3 +1,37 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: ClothingHeadsetNokey
+  name: headset
+  description: An updated, modular intercom that fits over the head. Takes encryption keys.
+  components:
+  - type: ContainerContainer
+    containers:
+      key_slots: !type:Container
+  - type: Headset
+  - type: EncryptionKeyHolder
+    keySlots: 4
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: Small
+  - type: Clothing
+    slots:
+    - ears
+    sprite: Clothing/Ears/Headsets/base.rsi
+
+- type: entity
+  abstract: true
+  parent: ClothingHeadsetNokey
+  id: ClothingHeadsetAltNokey
+  name: headset
+  description: An updated, modular intercom that fits over the head. Takes encryption keys.
+  components:
+  - type: Sprite
+    state: icon_alt
+  - type: Clothing
+    equippedPrefix: alt
+
 - type: entity
  parent: ClothingHeadset
  id: ClothingHeadsetIAA
@ -200,3 +234,28 @@
  - type: Clothing
    sprite: _Sunrise/Clothing/Ears/Headsets/centcom.rsi

+- type: entity
+  parent: ClothingHeadsetNokey
+  id: ClothingHeadsetFreelanceNoKey
+  name: freelancer headset
+  suffix: No Key
+  description: This is used by a roaming group of freelancers.
+  components:
+    - type: Sprite
+      sprite: Clothing/Ears/Headsets/freelance.rsi
+    - type: Clothing
+      sprite: Clothing/Ears/Headsets/freelance.rsi
+
+- type: entity
+  parent: [ClothingHeadsetAltNokey, BaseSyndicateContraband]
+  id: ClothingHeadsetAltSyndicateNoKey
+  name: blood-red over-ear headset
+  suffix: No Key
+  description: An updated, modular syndicate intercom that fits over the head and takes encryption keys (there are 5 key slots.).
+  components:
+  - type: EncryptionKeyHolder
+    keySlots: 5
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/syndicate.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/syndicate.rsi
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml
@ -0,0 +1,149 @@
+#EVA CBURN Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadSoftsuitCBURN
+  name: CBURN helmet
+  description: A pressure resistant and fireproof hood worn by special cleanup units.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Head/cburn.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: Clothing
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
+    equipSound: /Audio/Mecha/mechmove03.ogg #starlight
+    unequipSound: /Audio/Mecha/mechmove03.ogg #starlight
+    equipDelay: 2 #starlight
+    unequipDelay: 2 #starlight
+
+#Pirate EVA Helmet
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadHelmetPirateOld
+  name: pirate hardsuit helmet
+  suffix: Pirate, Sunrise
+  description: A special hardsuit helmet, made for Scooner.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_old.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_old.rsi
+    equipDelay: 1.25
+    unequipDelay: 1.25
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.85
+  - type: EyeProtection
+
+- type: entity
+  parent: [ ClothingHeadEVAHelmetBase, PowerCellSlotSmallItem, BaseSyndicateContraband ]
+  id: ClothingHeadHelmetPirate
+  name: boarding EVA helmet
+  description: A simple and stylish EVA helmet. Made for humble space heroics and boarding actions. Has a few serious cracks, but do not worry — duct tape fixes everything.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva.rsi
+    equipDelay: 0.8
+    unequipDelay: 0.8
+  - type: StaticPrice
+    price: 1000
+  - type: Appearance
+  - type: UseDelay
+    delay: 5.0
+  - type: ToggleClothing
+    action: NVDToggleAction
+    mustEquip: true
+    disableOnUnequip: true
+  - type: ComponentToggler
+    parent: true
+    components:
+      - type: NightVision
+        effect: EffectNightVisionPirate
+  - type: PowerCellDraw
+    drawRate: 2
+    useRate: 20
+  - type: ItemToggle
+    predictable: false
+    onUse: false
+    canActivateInhand: false
+    soundActivate:
+      path: /Audio/_Sunrise/Items/Goggles/activate.ogg
+    soundDeactivate:
+      path: /Audio/_Sunrise/Items/Goggles/deactivate.ogg
+    soundFailToActivate:
+      path: /Audio/Machines/button.ogg
+  - type: ToggleCellDraw
+  - type: FireProtection
+    reduction: 0.9
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.85
+        Slash: 0.85
+        Piercing: 0.85
+        Heat: 0.85
+        Radiation: 0.9
+        Caustic: 0.9
+  - type: EyeProtection
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingHeadHelmetPirate
+  id: ClothingHeadHelmetPirateAlt
+  name: boarding EVA helmet
+  description: A simple and stylish EVA helmet with a painted skull — for boarding with style.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_alt.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_alt.rsi
+
+- type: entity
+  parent: ClothingHeadHelmetPirate
+  id: ClothingHeadHelmetPirateAlt2
+  name: boarding EVA helmet
+  description: A simple and stylish EVA helmet. Made for humble space heroics and boarding actions.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_alt2.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_alt2.rsi
+
+- type: entity
+  parent: ClothingHeadHelmetPirate
+  id: ClothingHeadHelmetHardsuitScaf
+  name: scaf hardsuit helmet
+  description: A robust, strong helmet. On the inside smells of pent up anger.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Head/Helmets/scaf.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Head/Helmets/scaf.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.8
+        Radiation: 0.9
+        Caustic: 0.9
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml
@ -256,7 +256,7 @@
  id: ClothingHeadHelmetHardsuitPirateCapSun
  categories: [ HideSpawnMenu ]
  name: pirate captain's hardsuit helmet
-  suffix: Pirate, Sunrise
+  suffix: Pirate
  description: A special hardsuit helmet, made for the captain of a pirate ship.
  components:
  - type: Sprite
@ -277,20 +277,61 @@
  - type: EyeProtection

 - type: entity
-  parent: ClothingHeadHardsuitBase
-  id: ClothingHeadHelmetHardsuitPirateSun
+  parent: ClothingHeadHelmetHardsuitPirateCapSun
+  id: ClothingHeadHelmetHardsuitPirate
  categories: [ HideSpawnMenu ]
  name: pirate hardsuit helmet
-  suffix: Pirate, Sunrise
-  description: A special hardsuit helmet, made for Scooner.
+  suffix: Pirate
+  description: A special hardsuit helmet, made for pirate.
  components:
  - type: Sprite
-    sprite: _Sunrise/Clothing/Head/Hardsuits/piratebasichelm.rsi
+    sprite: _Sunrise/Clothing/Head/Hardsuits/piratecaptainhelm.rsi
  - type: Clothing
-    sprite: _Sunrise/Clothing/Head/Hardsuits/piratebasichelm.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.3
-    lowPressureMultiplier: 1000
+    sprite: _Sunrise/Clothing/Head/Hardsuits/piratecaptainhelm.rsi
+
+- type: entity
+  parent: ClothingHeadHelmetHardsuitPirateCapSun
+  id: ClothingHeadHelmetHardsuitPrivateer
+  categories: [ HideSpawnMenu ]
+  name: freelance hardsuit helmet
+  suffix: Pirate
+  description: A special hardsuit helmet, made for pirate.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/Head/Hardsuits/privateer.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/Head/Hardsuits/privateer.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HELMET
+      - state: on-equipped-HELMET # Always on, cause infitity NVD
+        shader: unshaded
+  - type: StaticPrice
+    price: 1000
+  - type: Appearance
+  - type: UseDelay
+    delay: 3.0
+  - type: ToggleClothing
+    action: NVDToggleAction
+    mustEquip: true
+    disableOnUnequip: true
+  - type: ComponentToggler
+    parent: true
+    components:
+      - type: NightVision
+        effect: EffectNightVisionPirate
+  - type: ItemToggle
+    predictable: false
+    onUse: false
+    canActivateInhand: false
+    soundActivate:
+      path: /Audio/_Sunrise/Items/Goggles/activate.ogg
+    soundDeactivate:
+      path: /Audio/_Sunrise/Items/Goggles/deactivate.ogg
+    soundFailToActivate:
+      path: /Audio/Machines/button.ogg
+  - type: FireProtection
+    reduction: 0.9
  - type: Armor
    modifiers:
      coefficients:
@ -298,8 +339,8 @@
        Slash: 0.85
        Piercing: 0.85
        Heat: 0.85
-  - type: FlashImmunity
-  - type: EyeProtection
+        Radiation: 0.9
+        Caustic: 0.9

 - type: entity
  parent: ClothingHeadHardsuitBase #[ ClothingHeadSuitWithLightBase ]
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml
@ -352,85 +352,48 @@
    clothingPrototype: ClothingHeadHelmetHardsuitUegCap

 #Pirate YARRRR!!
-
-#Pirate EVA Suit (Deep Space EVA Suit)
- type: entity
-  parent:  ClothingOuterHardsuitBase
-  id:  ClothingOuterHardsuitPirateEVASun
-  name: deep space EVA suit
-  suffix: Pirate, Sunrise
-  description: A heavy space suit that provides some basic protection from the cold harsh realities of deep space.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.55
-  - type: FireProtection
-    reduction: 0.5
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.75
-        Piercing: 0.8
-        Heat: 0.4
-        Radiation: 0.55
-        Caustic: 0.55
-  - type: ClothingSpeedModifier
-    walkModifier: 0.75
-    sprintModifier: 0.75
-  - type: HeldSpeedModifier
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitPirateEVA
-  - type: StaticPrice
-    price: 0
-
 #Pirate Hardsuit
 - type: entity
  parent: ClothingOuterHardsuitBase
-  id: ClothingOuterHardsuitPirateSun
-  name: pirate hardsuit
-  suffix: Pirate, Sunrise
+  id: ClothingOuterHardsuitPirate
+  name: ancient hardsuit
+  suffix: Pirate
  description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
  components:
  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
+    sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/pirate.rsi
  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
+    sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/pirate.rsi
  - type: PressureProtection
    highPressureMultiplier: 0.02
    lowPressureMultiplier: 1000
  - type: ExplosionResistance
-    damageCoefficient: 0.5
+    damageCoefficient: 0.4
  - type: FireProtection
    reduction: 0.5
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.55
-        Slash: 0.6
-        Piercing: 0.65
+        Blunt: 0.6
+        Slash: 0.65
+        Piercing: 0.7
        Heat: 0.4
-        Radiation: 0.5
-        Caustic: 0.5
+        Radiation: 0.4
+        Caustic: 0.4
  - type: ClothingSpeedModifier
-    walkModifier: 0.8
-    sprintModifier: 0.8
+    walkModifier: 0.85
+    sprintModifier: 0.85
  - type: HeldSpeedModifier
  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitPirateSun
+    clothingPrototype: ClothingHeadHelmetHardsuitPirateCap
  - type: StaticPrice
    price: 0

-
-#Pirate Captain Hardsuit
 - type: entity
  parent: ClothingOuterHardsuitBase
  id: ClothingOuterHardsuitPirateCapSun
  name: pirate captain's hardsuit
-  suffix: Pirate, Sunrise
+  suffix: Pirate
  description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
  components:
  - type: Sprite
@ -462,6 +425,79 @@
  - type: StaticPrice
    price: 0

+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitPrivateer
+  name: freelance hardsuit
+  suffix: Pirate
+  description: A hardsuit worn by those who roam the stars without a flag, ready to dive into any raid or misadventure for a handful of doubloons. Scratched and dented but still holds air without duct tape.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/privateer.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/privateer.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.02
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.4
+  - type: FireProtection
+    reduction: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.55
+        Slash: 0.6
+        Piercing: 0.65
+        Heat: 0.5
+        Radiation: 0.4
+        Caustic: 0.4
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.85
+  - type: HeldSpeedModifier
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitPrivateer
+  - type: StaticPrice
+    price: 0
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitPrivateerArmored
+  name: armored freelance hardsuit
+  suffix: Pirate
+  description: An upgraded version of the freelance hardsuit, pieced together from honestly acquired ballistic plates and fueled by a few bottles of rum. Heavy as a hangover but perfect for friendly visits with fireworks.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/privateer_armored.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Hardsuits/privateer_armored.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.02
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.4
+  - type: FireProtection
+    reduction: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.55
+        Slash: 0.6
+        Piercing: 0.4
+        Heat: 0.5
+        Radiation: 0.4
+        Caustic: 0.4
+  - type: ClothingSpeedModifier
+    walkModifier: 0.75
+    sprintModifier: 0.75
+  - type: HeldSpeedModifier
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitPrivateer
+  - type: StaticPrice
+    price: 0
+## Pirate end
+
 - type: entity
  parent: ClothingOuterHardsuitEVA
  id: ClothingOuterHardsuitChameleon
--- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/softsuits.yml
@ -0,0 +1,204 @@
+
+#CBURN Softsuit
+- type: entity
+  parent: [ BaseCentcommContraband, ClothingOuterEVASuitBase ]
+  id: ClothingOuterSoftsuitCBURN
+  name: CBURN insulated EVA suit
+  description: A heavyweight, tough and padded EVA capable biosuit used for special cleanup operations.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/OuterClothing/Hardsuits/cburn.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/OuterClothing/Hardsuits/cburn.rsi
+    equipSound: /Audio/Mecha/mechmove03.ogg #starlight
+    unequipSound: /Audio/Mecha/mechmove03.ogg #starlight
+    equipDelay: 3 #starlight
+    unequipDelay: 3 #starlight
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: FireProtection
+    reduction: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.5
+        Slash: 0.3
+        Piercing: 0.5
+        Heat: 0.1
+        Cold: 0.1
+        Shock: 0.1
+        Radiation: 0.1
+        Caustic: 0.1
+  - type: ZombificationResistance
+    zombificationResistanceCoefficient: 0.1
+  - type: ClothingSpeedModifier
+    walkModifier: 0.75
+    sprintModifier: 0.75
+  - type: HeldSpeedModifier
+  - type: Tag
+    tags:
+    - SuitEVA
+
+#Pirate Hardsuit
+- type: entity
+  parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ]
+  id: ClothingOuterEVASuitPirateOld
+  name: pirate hardsuit
+  suffix: Pirate, Sunrise
+  description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
+    equipDelay: 1
+    unequipDelay: 4
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: FireProtection
+    reduction: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.55
+        Slash: 0.6
+        Piercing: 0.65
+        Heat: 0.4
+        Radiation: 0.5
+        Caustic: 0.5
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: HeldSpeedModifier
+  - type: StaticPrice
+    price: 2000
+
+#Pirate EVA
+- type: entity
+  parent: [ ClothingOuterEVASuitBase, ClothingOuterStorageBase, BaseSyndicateContraband ]
+  id: ClothingOuterEVASuitPirate
+  name: boarding EVA suit
+  description: "A battered, duct-taped suit that’s seen more than a few boarding actions. Has a tag on the back that reads: 'Totally not property of an pirate, honest"
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/pirateeva.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/pirateeva.rsi
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
+    equipDelay: 2
+    unequipDelay: 8
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: FireProtection
+    reduction: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.65
+        Slash: 0.75
+        Piercing: 0.8
+        Heat: 0.5
+        Radiation: 0.5
+        Caustic: 0.5
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.85
+  - type: StaminaResistance
+    damageCoefficient: 0.8
+  - type: ClothingSlowOnDamageModifier
+    modifier: 0.75
+  - type: Storage
+    grid:
+    - 0,0,1,2
+    - 0,3,1,2
+    - 3,0,4,2
+  - type: HeldSpeedModifier
+  - type: Tag
+    tags:
+    - SuitEVA
+    - MonkeyWearable
+    - FullBodyOuter
+    - WhitelistChameleon
+  - type: StaticPrice
+    price: 2000
+
+- type: entity
+  parent: ClothingOuterEVASuitPirate
+  id: ClothingOuterEVASuitPirateArmored
+  name: boarding EVA suit
+  description: A battered, duct-taped suit with patches. Worn soft armor on top, but still takes a hit.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/pirateeva_armored.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/pirateeva_armored.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.65
+        Piercing: 0.7
+        Heat: 0.5
+        Radiation: 0.5
+        Caustic: 0.5
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+    sprintModifier: 0.8
+  - type: StaminaResistance
+    damageCoefficient: 0.75
+  - type: ClothingSlowOnDamageModifier
+    modifier: 0.5
+
+- type: entity
+  parent: ClothingOuterEVASuitPirateArmored
+  id: ClothingOuterEVASuitPirateArmoredAlt
+  name: boarding EVA suit
+  description: A battered, duct-taped suit with patches. Worn soft armor on top with a painted skull, so everyone knows the power of the Skellets! Ack! Ack!
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/pirateeva_armored_alt.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/pirateeva_armored_alt.rsi
+
+- type: entity
+  parent: ClothingOuterEVASuitPirateArmored
+  id: ClothingOuterHardsuitScaf
+  name: SCAF EVA suit
+  description: A green-and-brown EVA suit used by freelance raiders and guns-for-hire. Offers little against lasers but shrugs off bullets. Made for quick getaways when the job goes sideways.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/scaf.rsi
+  - type: Clothing
+    sprite: _Sunrise/Clothing/OuterClothing/Suits/scaf.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.4
+        Heat: 0.9
+        Caustic: 0.9
+  - type: Reflect
+    reflectProb: 0.1
+    spread: 360
+    soundOnReflect: /Audio/_Starlight/Armor/Ricochet/ricochet1_1.ogg
+    reflects:
+    - NonEnergy
+  - type: ExplosionResistance
+    damageCoefficient: 0.8
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 1000
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.9
+  - type: StaticPrice
+    price: 4000
+  - type: Tag
+    tags:
+    - SuitEVA
+    - FullBodyOuter
+    - WhitelistChameleon
--- a/Resources/Prototypes/_Sunrise/Entities/Effects/overlays.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Effects/overlays.yml
@ -37,7 +37,7 @@
  name: night vision
  components:
  - type: PointLight
-    color: "#0ee92b"
+    color: "#dae90e"
    energy: 0.1
    radius: 14
    softness: 20
@ -52,3 +52,14 @@
    energy: 0.8
    radius: 20
    softness: 20
+
+- type: entity
+  id: EffectNightVisionPirate
+  categories: [ HideSpawnMenu ]
+  name: night vision
+  components:
+  - type: PointLight
+    color: "#FF9833FF"
+    energy: 0.6
+    radius: 16
+    softness: 20
--- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/contraband.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/Random/contraband.yml
@ -173,3 +173,26 @@
        - BorgModuleSyndicateWeapon
      chance: 0.8
      offset: 0.0
+
+- type: entity
+  name: messenger spawner
+  id: RandomBackpackContrabandMessengerSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Fun/Balloons/syndicate.rsi
+          state: icon
+    - type: RandomSpawner
+      prototypes:
+        - ClothingBackpackMessengerPirate
+      chance: 0.8
+      rarePrototypes:
+        - ClothingBackpackMessengerMercenary
+        - ClothingBackpackMessengerPrivateSecurity
+        - ClothingBackpackMessengerBloodCult
+        - ClothingBackpackMessengerSyndicate
+        - ClothingBackpackMessengerPilot
+      rareChance: 0.2
+      offset: 0.0
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml
@ -422,12 +422,12 @@
  - type: Sprite
    sprite: Mobs/Silicon/chassis.rsi
    layers:
-    - state: synd_sec
-    - state: synd_sec_e
+    - state: synd_sec_derelict
+    - state: synd_sec_derelict_e
      map: ["enum.BorgVisualLayers.Light"]
      shader: unshaded
      visible: false
-    - state: synd_sec_l
+    - state: synd_sec_derelict_l
      shader: unshaded
      map: ["light"]
      visible: false
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ussp.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ussp.yml
@ -248,3 +248,116 @@
      roleLoadout: [ RoleSurvivalSyndicate ]
    - type: RandomMetadata
      nameSegments: [NamesDeathCommando]
+
+# Pirate
+- type: entity
+  name: Scooner spawner
+  id: ScoonerReinforcementSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Structures/Decoration/banner.rsi
+        state: banner_syndicate
+  - type: RandomSpawner
+    prototypes:
+    - RandomHumanoidScoonerReinforcement
+
+- type: entity
+  id: RandomHumanoidScoonerReinforcement
+  name: Scooner
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner_syndicate
+    - type: RandomHumanoidSpawner
+      settings: ScoonerReinforcementSettings
+
+- type: randomHumanoidSettings
+  id: ScoonerReinforcementSettings
+  speciesBlacklist:
+  - Diona
+  - Felinid
+  - Moth
+  - Arachnid
+  - Demon
+  - SlimePerson
+  - HumanoidXeno
+  - Predator
+  - Resomi
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+      - Pirate
+    - type: GhostRole
+      name: ghost-role-information-pirate-name
+      description: ghost-role-information-pirate-description
+      rules: ghost-role-information-rules-team-antagonist
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ PirateScoonerEVAGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
+    - type: RandomMetadata
+      nameSegments: [NamesDeathCommando]
+
+- type: entity
+  name: Scooner spawner
+  id: OldScoonerReinforcementSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Structures/Decoration/banner.rsi
+        state: banner_syndicate
+  - type: RandomSpawner
+    prototypes:
+    - RandomHumanoidOldScoonerReinforcement
+
+- type: entity
+  id: RandomHumanoidOldScoonerReinforcement
+  name: Scooner
+  components:
+    - type: Sprite
+      sprite: Structures/Decoration/banner.rsi
+      state: banner_syndicate
+    - type: RandomHumanoidSpawner
+      settings: OldScoonerReinforcementSettings
+
+- type: randomHumanoidSettings
+  id: OldScoonerReinforcementSettings
+  speciesBlacklist:
+  - Diona
+  - Felinid
+  - Moth
+  - Arachnid
+  - Demon
+  - SlimePerson
+  - HumanoidXeno
+  - Predator
+  - Resomi
+  parent: EventHumanoid
+  components:
+    - type: NpcFactionMember
+      factions:
+      - Syndicate
+      - Pirate
+    - type: GhostRole
+      name: ghost-role-information-pirate-name
+      description: ghost-role-information-pirate-description
+      rules: ghost-role-information-rules-team-antagonist
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonist
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ PirateScoonerOldEVAGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
+    - type: RandomMetadata
+      nameSegments: [NamesDeathCommando]
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@ -100,6 +100,22 @@
        Glass: 2
        Cable: 4

+- type: entity
+  id: PirateTechFabCircuitboard
+  parent: BaseMachineCircuitboard
+  name: pirate techfab machine board
+  description: A machine printed circuit board for an pirate techfab.
+  components:
+    - type: Sprite
+      sprite: _Sunrise/Objects/Misc/module.rsi
+      state: pirate_stitcher
+    - type: Item
+      storedRotation: -90
+    - type: MachineBoard
+      prototype: PirateTechFab
+      stackRequirements:
+        Manipulator: 2
+
 - type: entity
  id: ThrusterSyndicateMachineCircuitboard
  parent: BaseMachineCircuitboard
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/encryption_keys.yml
@ -43,8 +43,8 @@
    defaultChannel: USSP
  - type: Sprite
    layers:
-    - state: crypt_red
-    - state: synd_label
+    - state: crypt_ussp
+    - state: eng_label

 - type: entity
  parent: EncryptionKey
@ -59,8 +59,8 @@
    defaultChannel: USSPSec
  - type: Sprite
    layers:
-    - state: crypt_red
-    - state: synd_label
+    - state: crypt_ussp
+    - state: sec_label

 - type: entity
  parent: EncryptionKey
@ -75,8 +75,8 @@
    defaultChannel: USSPCom
  - type: Sprite
    layers:
-    - state: crypt_red
-    - state: synd_label
+    - state: crypt_ussp
+    - state: cap_label

 - type: entity
  parent: EncryptionKeySyndie
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml
@ -689,6 +689,32 @@
    sprite: _Sunrise/Objects/Devices/pda.rsi
    state: pda-commaid

+- type: entity
+  parent: PiratePDA
+  id: PiratePDAMusic
+  name: Shantyman PDA
+  description: Yargh! but now with shanties.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Devices/pda.rsi
+  - type: Pda
+    id: PirateIDCard
+  - type: Appearance
+    appearanceDataInit:
+     enum.PdaVisuals.PdaType:
+       !type:String
+       pda-pirate-music
+  - type: PdaBorderColor
+    borderColor: "#333333"
+  - type: Icon
+    sprite: _Sunrise/Objects/Devices/pda.rsi
+    state: pda-pirate-music
+  - type: Instrument
+    allowPercussion: false
+    handheld: true
+    bank: 1
+    program: 2
+
 - type: entity
  parent: SeniorOfficerPDA
  id: SecuritySergeantPDA
--- a/Show more
+++ b/Show more