Респрайт некоторых рудокрабов, добавлены остальные виды пород (#3771)

Resources/Locale/en-US/_prototypes/entities/effects/mobspawn.ftl

@@ -12,5 +12,11 @@ ent-MobSpawnCrabUranium = mobspawner uraniumcrab
     .desc = { ent-MobSpawnCrabQuartz.desc }
 ent-MobSpawnCrabBananium = mobspawner bananiumcrab
     .desc = { ent-MobSpawnCrabQuartz.desc }
+ent-MobSpawnCrabSalt = mobspawner saltcrab
+    .desc = { ent-MobSpawnCrabQuartz.desc }
+ent-MobSpawnCrabPlasma = mobspawner plasmacrab
+    .desc = { ent-MobSpawnCrabQuartz.desc }
+ent-MobSpawnCrabDiamond = mobspawner diamondcrab
+    .desc = { ent-MobSpawnCrabQuartz.desc }
 ent-EffectAnomalyFloraBulb = { "" }
     .desc = { "" }

Resources/Locale/en-US/_prototypes/entities/mobs/npcs/elemental.ftl

@@ -23,6 +23,15 @@ ent-MobSilverCrab = { ent-MobOreCrab }
 ent-MobGoldCrab = { ent-MobOreCrab }
     .desc = An ore crab made from gold.
     .suffix = Gold
+ent-MobSaltCrab = { ent-MobOreCrab }
+    .desc = An ore crab made from salt.
+    .suffix = Salt
+ent-MobPlasmaCrab = { ent-MobOreCrab }
+    .desc = An ore crab made from plasma.
+    .suffix = Plasma
+ent-MobDiamondCrab = { ent-MobOreCrab }
+    .desc = An ore crab made from diamond.
+    .suffix = Diamond
 ent-ReagentSlime = reagent slime
     .desc = It consists of a liquid, and it wants to dissolve you in itself.
     .suffix = Water

Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/misc.ftl

@@ -7,6 +7,6 @@ ent-ClothingBeltBlueShieldWebbingFilled = { ent-ClothingBeltBlueShieldWebbing }
 ent-ClothingShoesBootsBlueShieldFilled = { ent-ClothingShoesBootsBlueShield }
     .suffix = Заполнен
     .desc = { ent-ClothingShoesBootsBlueShield.desc }
-ent-ClothingBeltSecurityFilledERT = { ent-ClothingBeltSecurity }
+ent-ClothingBeltSecurityFilledERT = { ent-ClothingBeltMilitaryWebbingERT }
     .suffix = Filled, ERT
-    .desc = { ent-ClothingBeltSecurity.desc }
+    .desc = { ent-ClothingBeltMilitaryWebbingERT.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/outerclothing/vests.ftl

@@ -6,3 +6,5 @@ ent-ClothingOuterVestSecurityMedic = жилет бригмедика
     .desc = Лёгкий жилет, который носят бригмедики.
 ent-ClothingOuterVestWebSec = тактический жилет СБ
     .desc = Высококачественный бронежилет типа I из прочного синтетического материала. Несмотря на серьёзные бронепластины, он остаётся удивительно гибким и лёгким. Оснащён дополнительными подсумками для снаряжения.
+ent-ClothingOuterVestWebBlue = тактический жилет ОСЩ
+    .desc = { ent-ClothingOuterVestWebSec.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/smgs/smgs.ftl

@@ -15,7 +15,7 @@ ent-WeaponSubMachineGunPPSH = PPSH 59 SMG
 ent-WeaponAMS-42 = AMS-42
     .desc = Более совершенная версия Лектера.
 ent-WeaponAJ100 = AJ-100
-    .desc = Высокоскорострельный ПП, оборудован универсальным разъёмом для других типов пистолетных магазинов.
+    .desc = Высокоскорострельный ПП, оборудован универсальным разъёмом для других типов магазинов. Может стрелять .25 безгильзовыми, .35 авто, .40, 5,56 а так же 7,62.
 ent-WeaponSIAR52 = пистолет-пулемёт SIAR-52
     .desc = Высокоскорострельный ПП, оборудован интегрированым глушителем.
 ent-WeaponSubMachineGunDrozdMk2 = Дрозд Мк2

Resources/Locale/ru-RU/_prototypes/_sunrise/misc.ftl

@@ -90,3 +90,6 @@ ent-CartridgeHeavyRifleRFMJMech = { ent-CartridgeHeavyRifleRFMJ }
 ent-CartridgeXrayBeam = патрон (рентген-луч)
     .desc = { ent-BaseCartridge.desc }
 
+
+ent-EmptyDetonator = детонатор
+    .desc = Детонирующий капсюль. Требуются триггер и провод.

Resources/Locale/ru-RU/_prototypes/entities/effects/mobspawn.ftl

@@ -1,16 +1,22 @@
-ent-MobSpawnCrabQuartz = спавнер моб рудокраб кварц
+ent-MobSpawnCrabQuartz = мобспавнер кварцевого рудокраба
     .desc = { "" }
-ent-MobSpawnCrabIron = спавнер моб рудокраб железо
+ent-MobSpawnCrabIron = мобспавнер железного рудокраба
     .desc = { ent-MobSpawnCrabQuartz.desc }
-ent-MobSpawnCrabCoal = спавнер моб рудокраб уголь
+ent-MobSpawnCrabCoal = мобспавнер угольного рудокраба
     .desc = { ent-MobSpawnCrabQuartz.desc }
-ent-MobSpawnCrabSilver = спавнер моб рудокраб серебро
+ent-MobSpawnCrabSilver = мобспавнер серебряного рудокраба
     .desc = { ent-MobSpawnCrabQuartz.desc }
-ent-MobSpawnCrabGold = спавнер моб рудокраб золото
+ent-MobSpawnCrabGold = мобспавнер золотого рудокраба
     .desc = { ent-MobSpawnCrabQuartz.desc }
-ent-MobSpawnCrabUranium = спавнер моб рудокраб уран
+ent-MobSpawnCrabUranium = мобспавнер уранового рудокраба
     .desc = { ent-MobSpawnCrabQuartz.desc }
-ent-MobSpawnCrabBananium = спавнер моб бананиумовый краб
+ent-MobSpawnCrabBananium = мобспавнер бананиумного рудокраба
+    .desc = { ent-MobSpawnCrabQuartz.desc }
+ent-MobSpawnCrabSalt = мобспавнер соляного рудокраба
+    .desc = { ent-MobSpawnCrabQuartz.desc }
+ent-MobSpawnCrabPlasma = мобспавнер плазмового рудокраба
+    .desc = { ent-MobSpawnCrabQuartz.desc }
+ent-MobSpawnCrabDiamond = мобспавнер алмазного рудокраба
     .desc = { ent-MobSpawnCrabQuartz.desc }
 ent-EffectAnomalyFloraBulb = { "" }
     .desc = { "" }

Resources/Locale/ru-RU/_prototypes/entities/mobs/npcs/elemental.ftl

@@ -3,30 +3,39 @@ ent-MobElementalBase = { "" }
 ent-MobOreCrab = рудокраб
     .desc = { ent-MobElementalBase.desc }
 ent-MobQuartzCrab = { ent-MobOreCrab }
-    .desc = Рудный краб, состоящий из кварца.
+    .desc = Рудокраб из кварца.
     .suffix = Кварц
 ent-MobIronCrab = { ent-MobOreCrab }
-    .desc = Рудный краб, состоящий из железа.
+    .desc = Рудокраб из железа.
     .suffix = Железо
 ent-MobCoalCrab = { ent-MobOreCrab }
-    .desc = Рудный краб, состоящий из угля.
+    .desc = Рудокраб из угля.
     .suffix = Уголь
 ent-MobUraniumCrab = { ent-MobOreCrab }
-    .desc = Рудный краб, состоящий из урана.
+    .desc = Рудокраб из урана.
     .suffix = Уран
 ent-MobBananiumCrab = { ent-MobOreCrab }
-    .desc = Рудный краб, состоящий из бананиума.
+    .desc = Рудокраб из бананиума.
     .suffix = Бананиум
 ent-MobSilverCrab = { ent-MobOreCrab }
-    .desc = Рудный краб, состоящий из серебра.
+    .desc = Рудокраб из серебра.
     .suffix = Серебро
-ent-MobGoldCrab = рудокраб
-    .desc = Рудный краб, состоящий из золота.
+ent-MobGoldCrab = { ent-MobOreCrab }
+    .desc = Рудокраб из золота.
     .suffix = Золото
-ent-ReagentSlime = химический слайм
-    .desc = Состоит из жидкости, и хочет растворить вас в себе.
+ent-MobSaltCrab = { ent-MobOreCrab }
+    .desc = Рудокраб из соли.
+    .suffix = Соль
+ent-MobPlasmaCrab = { ent-MobOreCrab }
+    .desc = Рудокраб из плазмы.
+    .suffix = Плазма
+ent-MobDiamondCrab = { ent-MobOreCrab }
+    .desc = Рудокраб из алмаза.
+    .suffix = Алмаз
+ent-ReagentSlime = реагентный слизень
+    .desc = Состоит из жидкости и пытается растворить вас в себе.
     .suffix = Вода
-ent-ReagentSlimeSpawner = спавнер химический слайм
+ent-ReagentSlimeSpawner = спавнер реагентного слизня
     .desc = { ent-MarkerBase.desc }
 ent-ReagentSlimeBeer = { ent-ReagentSlime }
     .suffix = Пиво
@@ -53,7 +62,7 @@ ent-ReagentSlimeOmnizine = { ent-ReagentSlime }
     .suffix = Омнизин
     .desc = { ent-ReagentSlime.desc }
 ent-ReagentSlimeMuteToxin = { ent-ReagentSlime }
-    .suffix = Токсин немоты
+    .suffix = Немой токсин
     .desc = { ent-ReagentSlime.desc }
 ent-ReagentSlimeNorepinephricAcid = { ent-ReagentSlime }
     .suffix = Норэпинефриновая кислота
@@ -62,5 +71,5 @@ ent-ReagentSlimeEphedrine = { ent-ReagentSlime }
     .suffix = Эфедрин
     .desc = { ent-ReagentSlime.desc }
 ent-ReagentSlimeRobustHarvest = { ent-ReagentSlime }
-    .suffix = Робаст харвест
+    .suffix = Урожайный
     .desc = { ent-ReagentSlime.desc }

Resources/Locale/ru-RU/_prototypes/entities/structures/walls/asteroid.ftl

@@ -1,340 +1,537 @@
 ent-AsteroidRock = астероидная порода
-    .desc = Каменистый астероид.
+    .desc = Камнистый астероид.
 ent-BaseRockGibtonite = { "" }
     .suffix = Гибтонит
     .desc = { "" }
 ent-AsteroidRockCoal = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая углем.
+    .desc = Жила с углем.
     .suffix = Уголь
 ent-AsteroidRockCoalCrab = { ent-AsteroidRockCoal }
     .suffix = Уголь, рудокраб
     .desc = { ent-AsteroidRockCoal.desc }
 ent-AsteroidRockGold = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая золотом.
+    .desc = Жила с золотом.
     .suffix = Золото
 ent-AsteroidRockGoldCrab = { ent-AsteroidRockGold }
-    .suffix = Золото, Рудокраб
+    .suffix = Золото, рудокраб
     .desc = { ent-AsteroidRockGold.desc }
 ent-AsteroidRockDiamond = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая алмазами.
+    .desc = Жила с алмазами.
     .suffix = Алмаз
+ent-AsteroidRockDiamondCrab = { ent-AsteroidRockDiamond }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-AsteroidRockDiamond.desc }
 ent-AsteroidRockPlasma = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая плазмой.
+    .desc = Жила с плазмой.
     .suffix = Плазма
+ent-AsteroidRockPlasmaCrab = { ent-AsteroidRockPlasma }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-AsteroidRockPlasma.desc }
 ent-AsteroidRockQuartz = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая кварцем.
+    .desc = Жила с кварцем.
     .suffix = Кварц
 ent-AsteroidRockQuartzCrab = { ent-AsteroidRockQuartz }
-    .suffix = Кварц, Рудокраб
+    .suffix = Кварц, рудокраб
     .desc = { ent-AsteroidRockQuartz.desc }
 ent-AsteroidRockSilver = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая серебром.
+    .desc = Жила с серебром.
     .suffix = Серебро
 ent-AsteroidRockSilverCrab = { ent-AsteroidRockSilver }
-    .suffix = Серебро, Рудокраб
+    .suffix = Серебро, рудокраб
     .desc = { ent-AsteroidRockSilver.desc }
 ent-AsteroidRockTin = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая железом.
+    .desc = Жила с железом.
     .suffix = Железо
 ent-AsteroidRockTinCrab = { ent-AsteroidRockTin }
-    .suffix = Железо, Рудокраб
+    .suffix = Железо, рудокраб
     .desc = { ent-AsteroidRockTin.desc }
 ent-AsteroidRockUranium = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая ураном.
+    .desc = Жила с ураном.
     .suffix = Уран
 ent-AsteroidRockUraniumCrab = { ent-AsteroidRockUranium }
-    .suffix = Уран, Рудокраб
+    .suffix = Уран, рудокраб
     .desc = { ent-AsteroidRockUranium.desc }
 ent-AsteroidRockBananium = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая бананиумом.
+    .desc = Жила с бананиумом.
     .suffix = Бананиум
 ent-AsteroidRockBananiumCrab = { ent-AsteroidRockBananium }
-    .suffix = Бананиумовый краб
+    .suffix = Бананиум, рудокраб
     .desc = { ent-AsteroidRockBananium.desc }
 ent-AsteroidRockSalt = { ent-AsteroidRock }
-    .desc = Рудная жила, богатая солью.
+    .desc = Жила с солью.
     .suffix = Соль
+ent-AsteroidRockSaltCrab = { ent-AsteroidRockSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-AsteroidRockSalt.desc }
 ent-AsteroidRockArtifactFragment = { ent-AsteroidRock }
-    .desc = Каменная стена. Что это торчит из нее?
+    .desc = Скальная стена. Что-то торчит?
     .suffix = Фрагмент артефакта
 ent-AsteroidRockGibtonite = { ent-AsteroidRock }
     .suffix = { ent-BaseRockGibtonite.suffix }
     .desc = { ent-AsteroidRock.desc }
 ent-AsteroidRockMining = астероидная порода
     .desc = Астероид.
-    .suffix = ысокое содержание руды 0.33
+    .suffix = повышенная добыча руды 0.33
 ent-IronRock = железная порода
-    .desc = Каменистый астероид.
+    .desc = Камнистый астероид.
     .suffix = Низкая добыча руды
 ent-IronRockMining = железная порода
     .desc = Астероид.
-    .suffix = более высокая добыча руды
+    .suffix = повышенная добыча руды
 ent-IronRockCoal = { ent-IronRock }
-    .desc = Рудная жила, богатая углем.
+    .desc = Жила с углем.
     .suffix = Уголь
 ent-IronRockGold = { ent-IronRock }
-    .desc = Рудная жила, богатая золотом.
+    .desc = Жила с золотом.
     .suffix = Золото
 ent-IronRockPlasma = { ent-IronRock }
-    .desc = Рудная жила, богатая плазмой.
+    .desc = Жила с плазмой.
     .suffix = Плазма
 ent-IronRockQuartz = { ent-IronRock }
-    .desc = Рудная жила, богатая кварцем.
+    .desc = Жила с кварцем.
     .suffix = Кварц
 ent-IronRockSilver = { ent-IronRock }
-    .desc = Рудная жила, богатая серебром.
+    .desc = Жила с серебром.
     .suffix = Серебро
 ent-IronRockIron = { ent-IronRock }
-    .desc = Рудная жила, богатая железом.
+    .desc = Жила с железом.
     .suffix = Железо
 ent-IronRockUranium = { ent-IronRock }
-    .desc = Рудная жила, богатая ураном.
+    .desc = Жила с ураном.
     .suffix = Уран
 ent-IronRockBananium = { ent-IronRock }
-    .desc = Рудная жила, богатая бананиумом.
+    .desc = Жила с бананиумом.
     .suffix = Бананиум
 ent-IronRockSalt = { ent-IronRock }
-    .desc = Рудная жила, богатая солью.
+    .desc = Жила с солью.
     .suffix = Соль
 ent-IronRockArtifactFragment = { ent-IronRock }
-    .desc = Каменная стена. Что это торчит из нее?
+    .desc = Скальная стена. Что-то торчит?
     .suffix = Фрагмент артефакта
 ent-IronRockGibtonite = { ent-IronRock }
     .suffix = { ent-BaseRockGibtonite.suffix }
     .desc = { ent-IronRock.desc }
 ent-IronRockDiamond = { ent-IronRock }
-    .desc = Рудная жила, богатая алмазами.
+    .desc = Жила с алмазами.
     .suffix = Алмаз
-ent-WallRock = скала
-    .suffix = планета
-    .desc = { ent-AsteroidRock.desc }
-ent-WallRockCoal = { ent-WallRock }
-    .desc = Рудная жила, богатая углём.
-    .suffix = Уголь
-ent-WallRockGold = { ent-WallRock }
-    .desc = Рудная жила, богатая золотом.
-    .suffix = Золото
-ent-WallRockDiamond = { ent-WallRock }
-    .desc = Рудная жила, богатая алмазами.
-    .suffix = Алмазы
-ent-WallRockPlasma = { ent-WallRock }
-    .desc = Рудная жила, богатая плазмой.
-    .suffix = Плазма
-ent-WallRockQuartz = { ent-WallRock }
-    .desc = Рудная жила, богатая кварцем.
-    .suffix = Кварц
-ent-WallRockSilver = { ent-WallRock }
-    .desc = Рудная жила, богатая серебром.
-    .suffix = Серебро
-ent-WallRockTin = { ent-WallRock }
-    .desc = Рудная жила, богатая железом.
-    .suffix = Железо
-ent-WallRockUranium = { ent-WallRock }
-    .desc = Рудная жила, богатая ураном.
-    .suffix = Уран
-ent-WallRockBananium = { ent-WallRock }
-    .desc = Рудная жила, богатая бананиумом.
-    .suffix = Бананиум
-ent-WallRockArtifactFragment = { ent-WallRock }
-    .desc = Каменная стена. Что это торчит из неё?
-    .suffix = Фрагмент артефакта
-ent-WallRockSalt = { ent-WallRock }
-    .desc = Рудная жила, богатая солью.
-    .suffix = Соль
-ent-WallRockBasalt = базальт
-    .desc = { ent-WallRock.desc }
-ent-WallRockBasaltCoal = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая углём.
-    .suffix = Уголь
-ent-WallRockBasaltGold = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая золотом.
-    .suffix = Золото
-ent-WallRockBasaltDiamond = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая алмазами.
-    .suffix = Алмазы
-ent-WallRockBasaltPlasma = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая плазмой.
-    .suffix = Плазма
-ent-WallRockBasaltQuartz = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая кварцем.
-    .suffix = Кварц
-ent-WallRockBasaltSilver = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая серебром.
-    .suffix = Серебро
-ent-WallRockBasaltTin = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая железом.
-    .suffix = Железо
-ent-WallRockBasaltUranium = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая ураном.
-    .suffix = Уран
-ent-WallRockBasaltBananium = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая бананиумом.
-    .suffix = Бананиум
-ent-WallRockBasaltArtifactFragment = { ent-WallRockBasalt }
-    .desc = Каменная стена. Что это торчит из неё?
-    .suffix = Фрагмент артефакта
-ent-WallRockBasaltSalt = { ent-WallRockBasalt }
-    .desc = Рудная жила, богатая солью.
-    .suffix = Соль
-ent-WallRockSnow = сугроб
-    .desc = { ent-WallRock.desc }
-ent-WallRockSnowCoal = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая углём.
-    .suffix = Уголь
-ent-WallRockSnowGold = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая золотом.
-    .suffix = Золото
-ent-WallRockSnowDiamond = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая алмазами.
-    .suffix = Алмазы
-ent-WallRockSnowPlasma = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая плазмой.
-    .suffix = Плазма
-ent-WallRockSnowQuartz = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая кварцем.
-    .suffix = Кварц
-ent-WallRockSnowSilver = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая серебром.
-    .suffix = Серебро
-ent-WallRockSnowTin = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая железом.
-    .suffix = Железо
-ent-WallRockSnowUranium = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая ураном.
-    .suffix = Уран
-ent-WallRockSnowBananium = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая бананиумом.
-    .suffix = Бананиум
-ent-WallRockSnowArtifactFragment = { ent-WallRockSnow }
-    .desc = Каменная стена. Что это торчит из неё?
-    .suffix = Фрагмент артефакта
-ent-WallRockSnowSalt = { ent-WallRockSnow }
-    .desc = Рудная жила, богатая солью.
-    .suffix = Соль
-ent-WallRockSand = песчаник
-    .desc = { ent-WallRock.desc }
-ent-WallRockSandCoal = { ent-WallRockSand }
-    .desc = Рудная жила, богатая углём.
-    .suffix = Уголь
-ent-WallRockSandGold = { ent-WallRockSand }
-    .desc = Рудная жила, богатая золотом.
-    .suffix = Золото
-ent-WallRockSandDiamond = { ent-WallRockSand }
-    .desc = Рудная жила, богатая алмазами.
-    .suffix = Алмазы
-ent-WallRockSandPlasma = { ent-WallRockSand }
-    .desc = Рудная жила, богатая плазмой.
-    .suffix = Плазма
-ent-WallRockSandQuartz = { ent-WallRockSand }
-    .desc = Рудная жила, богатая кварцем.
-    .suffix = Кварц
-ent-WallRockSandSilver = { ent-WallRockSand }
-    .desc = Рудная жила, богатая серебром.
-    .suffix = Серебро
-ent-WallRockSandTin = { ent-WallRockSand }
-    .desc = Рудная жила, богатая железом.
-    .suffix = Железо
-ent-WallRockSandUranium = { ent-WallRockSand }
-    .desc = Рудная жила, богатая ураном.
-    .suffix = Уран
-ent-WallRockSandBananium = { ent-WallRockSand }
-    .desc = Рудная жила, богатая бананиумом.
-    .suffix = Бананиум
-ent-WallRockSandArtifactFragment = { ent-WallRockSand }
-    .desc = Каменная стена. Что это торчит из неё?
-    .suffix = Фрагмент артефакта
-ent-WallRockSandSalt = { ent-WallRockSand }
-    .desc = Рудная жила, богатая солью.
-    .suffix = Соль
-ent-WallRockChromite = хромит
-    .desc = { ent-WallRock.desc }
-ent-WallRockChromiteCoal = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая углём.
-    .suffix = Уголь
-ent-WallRockChromiteGold = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая золотом.
-    .suffix = Золото
-ent-WallRockChromiteDiamond = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая алмазами.
-    .suffix = Алмазы
-ent-WallRockChromitePlasma = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая плазмой.
-    .suffix = Плазма
-ent-WallRockChromiteQuartz = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая кварцем.
-    .suffix = Кварц
-ent-WallRockChromiteSilver = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая серебром.
-    .suffix = Серебро
-ent-WallRockChromiteTin = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая железом.
-    .suffix = Железо
-ent-WallRockChromiteUranium = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая ураном.
-    .suffix = Уран
-ent-WallRockChromiteBananium = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая бананиумом.
-    .suffix = Бананиум
-ent-WallRockChromiteArtifactFragment = { ent-WallRockChromite }
-    .desc = Каменная стена. Что это торчит из неё?
-    .suffix = Фрагмент артефакта
-ent-WallRockChromiteSalt = { ent-WallRockChromite }
-    .desc = Рудная жила, богатая солью.
-    .suffix = Соль
-ent-WallRockAndesite = андезит
-    .desc = { ent-WallRock.desc }
-ent-WallRockAndesiteCoal = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая углём.
-    .suffix = Уголь
-ent-WallRockAndesiteGold = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая золотом.
-    .suffix = Золото
-ent-WallRockAndesiteDiamond = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая алмазами.
-    .suffix = Алмазы
-ent-WallRockAndesitePlasma = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая плазмой.
-    .suffix = Плазма
-ent-WallRockAndesiteQuartz = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая кварцем.
-    .suffix = Кварц
-ent-WallRockAndesiteSilver = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая серебром.
-    .suffix = Серебро
-ent-WallRockAndesiteTin = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая железом.
-    .suffix = Железо
-ent-WallRockAndesiteUranium = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая ураном.
-    .suffix = Уран
-ent-WallRockAndesiteBananium = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая бананиумом.
-    .suffix = Бананиум
-ent-WallRockAndesiteArtifactFragment = { ent-WallRockAndesite }
-    .desc = Каменная стена. Что это торчит из неё?
-    .suffix = Фрагмент артефакта
-ent-WallRockAndesiteSalt = { ent-WallRockAndesite }
-    .desc = Рудная жила, богатая солью.
-    .suffix = Соль
-# #
 ent-IronRockCoalCrab = { ent-IronRock }
     .suffix = Уголь, рудокраб
     .desc = { ent-IronRockCoal.desc }
 ent-IronRockGoldCrab = { ent-IronRock }
-    .suffix = Золото, Рудокраб
+    .suffix = Золото, рудокраб
     .desc = { ent-IronRockGold.desc }
 ent-IronRockQuartzCrab = { ent-IronRock }
-    .suffix = Кварц, Рудокраб
+    .suffix = Кварц, рудокраб
     .desc = { ent-IronRockQuartz.desc }
 ent-IronRockSilverCrab = { ent-IronRock }
-    .suffix = Серебро, Рудокраб
+    .suffix = Серебро, рудокраб
     .desc = { ent-IronRockSilver.desc }
 ent-IronRockIronCrab = { ent-IronRock }
-    .suffix = Железо, Рудокраб
+    .suffix = Железо, рудокраб
     .desc = { ent-IronRockIron.desc }
 ent-IronRockUraniumCrab = { ent-IronRock }
-    .suffix = Уран, Рудокраб
+    .suffix = Уран, рудокраб
     .desc = { ent-IronRockUranium.desc }
 ent-IronRockBananiumCrab = { ent-IronRock }
-    .suffix = Бананиумовый краб
+    .suffix = Бананиум, рудокраб
     .desc = { ent-IronRockBananium.desc }
+ent-IronRockSaltCrab = { ent-IronRockSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-IronRockSalt.desc }
+ent-IronRockPlasmaCrab = { ent-IronRockPlasma }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-IronRockPlasma.desc }
+ent-IronRockDiamondCrab = { ent-IronRockDiamond }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-IronRockDiamond.desc }
+ent-WallRock = порода
+    .suffix = планетная карта
+    .desc = { ent-AsteroidRock.desc }
+ent-WallRockCoal = { ent-WallRock }
+    .desc = Жила с углем.
+    .suffix = Уголь
+ent-WallRockCoalCrab = { ent-WallRock }
+    .suffix = Уголь, рудокраб
+    .desc = { ent-WallRockCoal.desc }
+ent-WallRockGold = { ent-WallRock }
+    .desc = Жила с золотом.
+    .suffix = Золото
+ent-WallRockGoldCrab = { ent-WallRock }
+    .suffix = Золото, рудокраб
+    .desc = { ent-WallRockGold.desc }
+ent-WallRockDiamond = { ent-WallRock }
+    .desc = Жила с алмазами.
+    .suffix = Алмаз
+ent-WallRockDiamondCrab = { ent-WallRock }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-WallRockDiamond.desc }
+ent-WallRockPlasma = { ent-WallRock }
+    .desc = Жила с плазмой.
+    .suffix = Плазма
+ent-WallRockPlasmaCrab = { ent-WallRock }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-WallRockPlasma.desc }
+ent-WallRockQuartz = { ent-WallRock }
+    .desc = Жила с кварцем.
+    .suffix = Кварц
+ent-WallRockQuartzCrab = { ent-WallRock }
+    .suffix = Кварц, рудокраб
+    .desc = { ent-WallRockQuartz.desc }
+ent-WallRockSilver = { ent-WallRock }
+    .desc = Жила с серебром.
+    .suffix = Серебро
+ent-WallRockSilverCrab = { ent-WallRock }
+    .suffix = Серебро, рудокраб
+    .desc = { ent-WallRockSilver.desc }
+ent-WallRockTin = { ent-WallRock }
+    .desc = Жила с железом.
+    .suffix = Железо
+ent-WallRockTinCrab = { ent-WallRock }
+    .suffix = Железо, рудокраб
+    .desc = { ent-WallRockTin.desc }
+ent-WallRockUranium = { ent-WallRock }
+    .desc = Жила с ураном.
+    .suffix = Уран
+ent-WallRockUraniumCrab = { ent-WallRock }
+    .suffix = Уран, рудокраб
+    .desc = { ent-WallRockUranium.desc }
+ent-WallRockBananium = { ent-WallRock }
+    .desc = Жила с бананиумом.
+    .suffix = Бананиум
+ent-WallRockBananiumCrab = { ent-WallRock }
+    .suffix = Бананиум, рудокраб
+    .desc = { ent-WallRockBananium.desc }
+ent-WallRockArtifactFragment = { ent-WallRock }
+    .desc = Скальная стена. Что-то торчит?
+    .suffix = Фрагмент артефакта
+ent-WallRockSalt = { ent-WallRock }
+    .desc = Жила с солью.
+    .suffix = Соль
+ent-WallRockSaltCrab = { ent-WallRockSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-WallRockSalt.desc }
+ent-WallRockBasalt = базальт
+    .desc = { ent-WallRock.desc }
+ent-WallRockBasaltCoal = { ent-WallRockBasalt }
+    .desc = Жила с углем.
+    .suffix = Уголь
+ent-WallRockBasaltGold = { ent-WallRockBasalt }
+    .desc = Жила с золотом.
+    .suffix = Золото
+ent-WallRockBasaltDiamond = { ent-WallRockBasalt }
+    .desc = Жила с алмазами.
+    .suffix = Алмаз
+ent-WallRockBasaltPlasma = { ent-WallRockBasalt }
+    .desc = Жила с плазмой.
+    .suffix = Плазма
+ent-WallRockBasaltQuartz = { ent-WallRockBasalt }
+    .desc = Жила с кварцем.
+    .suffix = Кварц
+ent-WallRockBasaltSilver = { ent-WallRockBasalt }
+    .desc = Жила с серебром.
+    .suffix = Серебро
+ent-WallRockBasaltTin = { ent-WallRockBasalt }
+    .desc = Жила с железом.
+    .suffix = Железо
+ent-WallRockBasaltUranium = { ent-WallRockBasalt }
+    .desc = Жила с ураном.
+    .suffix = Уран
+ent-WallRockBasaltBananium = { ent-WallRockBasalt }
+    .desc = Жила с бананиумом.
+    .suffix = Бананиум
+ent-WallRockBasaltArtifactFragment = { ent-WallRockBasalt }
+    .desc = Скальная стена. Что-то торчит?
+    .suffix = Фрагмент артефакта
+ent-WallRockBasaltSalt = { ent-WallRockBasalt }
+    .desc = Жила с солью.
+    .suffix = Соль
+ent-WallRockBasaltCoalCrab = { ent-WallRockBasalt }
+    .suffix = Уголь, рудокраб
+    .desc = { ent-WallRockBasaltCoal.desc }
+ent-WallRockBasaltGoldCrab = { ent-WallRockBasalt }
+    .suffix = Золото, рудокраб
+    .desc = { ent-WallRockBasaltGold.desc }
+ent-WallRockBasaltDiamondCrab = { ent-WallRockBasalt }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-WallRockBasaltDiamond.desc }
+ent-WallRockBasaltPlasmaCrab = { ent-WallRockBasalt }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-WallRockBasaltPlasma.desc }
+ent-WallRockBasaltQuartzCrab = { ent-WallRockBasalt }
+    .suffix = Кварц, рудокраб
+    .desc = { ent-WallRockBasaltQuartz.desc }
+ent-WallRockBasaltSilverCrab = { ent-WallRockBasalt }
+    .suffix = Серебро, рудокраб
+    .desc = { ent-WallRockBasaltSilver.desc }
+ent-WallRockBasaltTinCrab = { ent-WallRockBasalt }
+    .suffix = Железо, рудокраб
+    .desc = { ent-WallRockBasaltTin.desc }
+ent-WallRockBasaltUraniumCrab = { ent-WallRockBasalt }
+    .suffix = Уран, рудокраб
+    .desc = { ent-WallRockBasaltUranium.desc }
+ent-WallRockBasaltBananiumCrab = { ent-WallRockBasalt }
+    .suffix = Бананиум, рудокраб
+    .desc = { ent-WallRockBasaltBananium.desc }
+ent-WallRockBasaltSaltCrab = { ent-WallRockBasaltSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-WallRockBasaltSalt.desc }
+ent-WallRockSnow = сугроб
+    .desc = { ent-WallRock.desc }
+ent-WallRockSnowCoal = { ent-WallRockSnow }
+    .desc = Жила с углем.
+    .suffix = Уголь
+ent-WallRockSnowGold = { ent-WallRockSnow }
+    .desc = Жила с золотом.
+    .suffix = Золото
+ent-WallRockSnowDiamond = { ent-WallRockSnow }
+    .desc = Жила с алмазами.
+    .suffix = Алмаз
+ent-WallRockSnowPlasma = { ent-WallRockSnow }
+    .desc = Жила с плазмой.
+    .suffix = Плазма
+ent-WallRockSnowQuartz = { ent-WallRockSnow }
+    .desc = Жила с кварцем.
+    .suffix = Кварц
+ent-WallRockSnowSilver = { ent-WallRockSnow }
+    .desc = Жила с серебром.
+    .suffix = Серебро
+ent-WallRockSnowTin = { ent-WallRockSnow }
+    .desc = Жила с железом.
+    .suffix = Железо
+ent-WallRockSnowUranium = { ent-WallRockSnow }
+    .desc = Жила с ураном.
+    .suffix = Уран
+ent-WallRockSnowBananium = { ent-WallRockSnow }
+    .desc = Жила с бананиумом.
+    .suffix = Бананиум
+ent-WallRockSnowArtifactFragment = { ent-WallRockSnow }
+    .desc = Скальная стена. Что-то торчит?
+    .suffix = Фрагмент артефакта
+ent-WallRockSnowSalt = { ent-WallRockSnow }
+    .desc = Жила с солью.
+    .suffix = Соль
+ent-WallRockSnowCoalCrab = { ent-WallRockSnow }
+    .suffix = Уголь, рудокраб
+    .desc = { ent-WallRockSnowCoal.desc }
+ent-WallRockSnowGoldCrab = { ent-WallRockSnow }
+    .suffix = Золото, рудокраб
+    .desc = { ent-WallRockSnowGold.desc }
+ent-WallRockSnowDiamondCrab = { ent-WallRockSnow }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-WallRockSnowDiamond.desc }
+ent-WallRockSnowPlasmaCrab = { ent-WallRockSnow }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-WallRockSnowPlasma.desc }
+ent-WallRockSnowQuartzCrab = { ent-WallRockSnow }
+    .suffix = Кварц, рудокраб
+    .desc = { ent-WallRockSnowQuartz.desc }
+ent-WallRockSnowSilverCrab = { ent-WallRockSnow }
+    .suffix = Серебро, рудокраб
+    .desc = { ent-WallRockSnowSilver.desc }
+ent-WallRockSnowTinCrab = { ent-WallRockSnow }
+    .suffix = Железо, рудокраб
+    .desc = { ent-WallRockSnowTin.desc }
+ent-WallRockSnowUraniumCrab = { ent-WallRockSnow }
+    .suffix = Уран, рудокраб
+    .desc = { ent-WallRockSnowUranium.desc }
+ent-WallRockSnowBananiumCrab = { ent-WallRockSnow }
+    .suffix = Бананиум, рудокраб
+    .desc = { ent-WallRockSnowBananium.desc }
+ent-WallRockSnowSaltCrab = { ent-WallRockSnowSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-WallRockSnowSalt.desc }
+ent-WallRockSand = песчаник
+    .desc = { ent-WallRock.desc }
+ent-WallRockSandCoal = { ent-WallRockSand }
+    .desc = Жила с углем.
+    .suffix = Уголь
+ent-WallRockSandGold = { ent-WallRockSand }
+    .desc = Жила с золотом.
+    .suffix = Золото
+ent-WallRockSandDiamond = { ent-WallRockSand }
+    .desc = Жила с алмазами.
+    .suffix = Алмаз
+ent-WallRockSandPlasma = { ent-WallRockSand }
+    .desc = Жила с плазмой.
+    .suffix = Плазма
+ent-WallRockSandQuartz = { ent-WallRockSand }
+    .desc = Жила с кварцем.
+    .suffix = Кварц
+ent-WallRockSandSilver = { ent-WallRockSand }
+    .desc = Жила с серебром.
+    .suffix = Серебро
+ent-WallRockSandTin = { ent-WallRockSand }
+    .desc = Жила с железом.
+    .suffix = Железо
+ent-WallRockSandUranium = { ent-WallRockSand }
+    .desc = Жила с ураном.
+    .suffix = Уран
+ent-WallRockSandBananium = { ent-WallRockSand }
+    .desc = Жила с бананиумом.
+    .suffix = Бананиум
+ent-WallRockSandArtifactFragment = { ent-WallRockSand }
+    .desc = Скальная стена. Что-то торчит?
+    .suffix = Фрагмент артефакта
+ent-WallRockSandSalt = { ent-WallRockSand }
+    .desc = Жила с солью.
+    .suffix = Соль
+ent-WallRockSandCoalCrab = { ent-WallRockSand }
+    .suffix = Уголь, рудокраб
+    .desc = { ent-WallRockSandCoal.desc }
+ent-WallRockSandGoldCrab = { ent-WallRockSand }
+    .suffix = Золото, рудокраб
+    .desc = { ent-WallRockSandGold.desc }
+ent-WallRockSandDiamondCrab = { ent-WallRockSand }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-WallRockSandDiamond.desc }
+ent-WallRockSandPlasmaCrab = { ent-WallRockSand }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-WallRockSandPlasma.desc }
+ent-WallRockSandQuartzCrab = { ent-WallRockSand }
+    .suffix = Кварц, рудокраб
+    .desc = { ent-WallRockSandQuartz.desc }
+ent-WallRockSandSilverCrab = { ent-WallRockSand }
+    .suffix = Серебро, рудокраб
+    .desc = { ent-WallRockSandSilver.desc }
+ent-WallRockSandTinCrab = { ent-WallRockSand }
+    .suffix = Железо, рудокраб
+    .desc = { ent-WallRockSandTin.desc }
+ent-WallRockSandUraniumCrab = { ent-WallRockSand }
+    .suffix = Уран, рудокраб
+    .desc = { ent-WallRockSandUranium.desc }
+ent-WallRockSandBananiumCrab = { ent-WallRockSand }
+    .suffix = Бананиум, рудокраб
+    .desc = { ent-WallRockSandBananium.desc }
+ent-WallRockSandSaltCrab = { ent-WallRockSandSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-WallRockSandSalt.desc }
+ent-WallRockChromite = хромит
+    .desc = { ent-WallRock.desc }
+ent-WallRockChromiteCoal = { ent-WallRockChromite }
+    .desc = Жила с углем.
+    .suffix = Уголь
+ent-WallRockChromiteGold = { ent-WallRockChromite }
+    .desc = Жила с золотом.
+    .suffix = Золото
+ent-WallRockChromiteDiamond = { ent-WallRockChromite }
+    .desc = Жила с алмазами.
+    .suffix = Алмаз
+ent-WallRockChromitePlasma = { ent-WallRockChromite }
+    .desc = Жила с плазмой.
+    .suffix = Плазма
+ent-WallRockChromiteQuartz = { ent-WallRockChromite }
+    .desc = Жила с кварцем.
+    .suffix = Кварц
+ent-WallRockChromiteSilver = { ent-WallRockChromite }
+    .desc = Жила с серебром.
+    .suffix = Серебро
+ent-WallRockChromiteTin = { ent-WallRockChromite }
+    .desc = Жила с железом.
+    .suffix = Железо
+ent-WallRockChromiteUranium = { ent-WallRockChromite }
+    .desc = Жила с ураном.
+    .suffix = Уран
+ent-WallRockChromiteBananium = { ent-WallRockChromite }
+    .desc = Жила с бананиумом.
+    .suffix = Бананиум
+ent-WallRockChromiteArtifactFragment = { ent-WallRockChromite }
+    .desc = Скальная стена. Что-то торчит?
+    .suffix = Фрагмент артефакта
+ent-WallRockChromiteSalt = { ent-WallRockChromite }
+    .desc = Жила с солью.
+    .suffix = Соль
+ent-WallRockChromiteCoalCrab = { ent-WallRockChromite }
+    .suffix = Уголь, рудокраб
+    .desc = { ent-WallRockChromiteCoal.desc }
+ent-WallRockChromiteGoldCrab = { ent-WallRockChromite }
+    .suffix = Золото, рудокраб
+    .desc = { ent-WallRockChromiteGold.desc }
+ent-WallRockChromiteDiamondCrab = { ent-WallRockChromite }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-WallRockChromiteDiamond.desc }
+ent-WallRockChromitePlasmaCrab = { ent-WallRockChromite }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-WallRockChromitePlasma.desc }
+ent-WallRockChromiteQuartzCrab = { ent-WallRockChromite }
+    .suffix = Кварц, рудокраб
+    .desc = { ent-WallRockChromiteQuartz.desc }
+ent-WallRockChromiteSilverCrab = { ent-WallRockChromite }
+    .suffix = Серебро, рудокраб
+    .desc = { ent-WallRockChromiteSilver.desc }
+ent-WallRockChromiteTinCrab = { ent-WallRockChromite }
+    .suffix = Железо, рудокраб
+    .desc = { ent-WallRockChromiteTin.desc }
+ent-WallRockChromiteUraniumCrab = { ent-WallRockChromite }
+    .suffix = Уран, рудокраб
+    .desc = { ent-WallRockChromiteUranium.desc }
+ent-WallRockChromiteBananiumCrab = { ent-WallRockChromite }
+    .suffix = Бананиум, рудокраб
+    .desc = { ent-WallRockChromiteBananium.desc }
+ent-WallRockChromiteSaltCrab = { ent-WallRockChromiteSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-WallRockChromiteSalt.desc }
+ent-WallRockAndesite = андезит
+    .desc = { ent-WallRock.desc }
+ent-WallRockAndesiteCoal = { ent-WallRockAndesite }
+    .desc = Жила с углем.
+    .suffix = Уголь
+ent-WallRockAndesiteGold = { ent-WallRockAndesite }
+    .desc = Жила с золотом.
+    .suffix = Золото
+ent-WallRockAndesiteDiamond = { ent-WallRockAndesite }
+    .desc = Жила с алмазами.
+    .suffix = Алмаз
+ent-WallRockAndesitePlasma = { ent-WallRockAndesite }
+    .desc = Жила с плазмой.
+    .suffix = Плазма
+ent-WallRockAndesiteQuartz = { ent-WallRockAndesite }
+    .desc = Жила с кварцем.
+    .suffix = Кварц
+ent-WallRockAndesiteSilver = { ent-WallRockAndesite }
+    .desc = Жила с серебром.
+    .suffix = Серебро
+ent-WallRockAndesiteTin = { ent-WallRockAndesite }
+    .desc = Жила с железом.
+    .suffix = Железо
+ent-WallRockAndesiteUranium = { ent-WallRockAndesite }
+    .desc = Жила с ураном.
+    .suffix = Уран
+ent-WallRockAndesiteBananium = { ent-WallRockAndesite }
+    .desc = Жила с бананиумом.
+    .suffix = Бананиум
+ent-WallRockAndesiteArtifactFragment = { ent-WallRockAndesite }
+    .desc = Скальная стена. Что-то торчит?
+    .suffix = Фрагмент артефакта
+ent-WallRockAndesiteSalt = { ent-WallRockAndesite }
+    .desc = Жила с солью.
+    .suffix = Соль
+ent-WallRockAndesiteCoalCrab = { ent-WallRockAndesite }
+    .suffix = Уголь, рудокраб
+    .desc = { ent-WallRockAndesiteCoal.desc }
+ent-WallRockAndesiteGoldCrab = { ent-WallRockAndesite }
+    .suffix = Золото, рудокраб
+    .desc = { ent-WallRockAndesiteGold.desc }
+ent-WallRockAndesiteDiamondCrab = { ent-WallRockAndesite }
+    .suffix = Алмаз, рудокраб
+    .desc = { ent-WallRockAndesiteDiamond.desc }
+ent-WallRockAndesitePlasmaCrab = { ent-WallRockAndesite }
+    .suffix = Плазма, рудокраб
+    .desc = { ent-WallRockAndesitePlasma.desc }
+ent-WallRockAndesiteQuartzCrab = { ent-WallRockAndesite }
+    .suffix = Кварц, рудокраб
+    .desc = { ent-WallRockAndesiteQuartz.desc }
+ent-WallRockAndesiteSilverCrab = { ent-WallRockAndesite }
+    .suffix = Серебро, рудокраб
+    .desc = { ent-WallRockAndesiteSilver.desc }
+ent-WallRockAndesiteTinCrab = { ent-WallRockAndesite }
+    .suffix = Железо, рудокраб
+    .desc = { ent-WallRockAndesiteTin.desc }
+ent-WallRockAndesiteUraniumCrab = { ent-WallRockAndesite }
+    .suffix = Уран, рудокраб
+    .desc = { ent-WallRockAndesiteUranium.desc }
+ent-WallRockAndesiteBananiumCrab = { ent-WallRockAndesite }
+    .suffix = Бананиум, рудокраб
+    .desc = { ent-WallRockAndesiteBananium.desc }
+ent-WallRockAndesiteSaltCrab = { ent-WallRockAndesiteSalt }
+    .suffix = Соль, рудокраб
+    .desc = { ent-WallRockAndesiteSalt.desc }

Resources/Locale/ru-RU/datasets/names/scurret_first.ftl

@@ -0,0 +1,52 @@
+# У скерретов с планеты Вава имя состоит из двух частей: выбранная и качественная.
+
+names-scurret-first-dataset-1 = Ва
+names-scurret-first-dataset-2 = Спокойный
+names-scurret-first-dataset-3 = Довольный
+names-scurret-first-dataset-4 = Терпеливый
+names-scurret-first-dataset-5 = Расслабленный
+names-scurret-first-dataset-6 = Безмятежный
+names-scurret-first-dataset-7 = Блаженный
+names-scurret-first-dataset-8 = Пылкий
+names-scurret-first-dataset-9 = Счастливый
+names-scurret-first-dataset-10 = Вдохновенный
+names-scurret-first-dataset-11 = Живой
+names-scurret-first-dataset-12 = Игривый
+names-scurret-first-dataset-13 = Лучезарный
+names-scurret-first-dataset-14 = Яркий
+names-scurret-first-dataset-15 = Храбрый
+names-scurret-first-dataset-16 = Умелый
+names-scurret-first-dataset-17 = Уверенный
+names-scurret-first-dataset-18 = Отчаянный
+names-scurret-first-dataset-19 = Гордый
+names-scurret-first-dataset-20 = Доблестный
+names-scurret-first-dataset-21 = Заботливый
+names-scurret-first-dataset-22 = Сострадательный
+names-scurret-first-dataset-23 = Эмпатичный
+names-scurret-first-dataset-24 = Сильный
+names-scurret-first-dataset-25 = Свободный
+names-scurret-first-dataset-26 = Везучий
+names-scurret-first-dataset-27 = Достойный
+names-scurret-first-dataset-28 = Благословенный
+names-scurret-first-dataset-29 = Удачливый
+names-scurret-first-dataset-30 = Доверчивый
+names-scurret-first-dataset-31 = Быстрый
+names-scurret-first-dataset-32 = Энергичный
+names-scurret-first-dataset-33 = Мудрый
+names-scurret-first-dataset-34 = Бдительный
+names-scurret-first-dataset-35 = Воодушевляющий
+names-scurret-first-dataset-36 = Внимательный
+names-scurret-first-dataset-37 = Живучий
+names-scurret-first-dataset-38 = Медитирующий
+names-scurret-first-dataset-39 = Охотящийся
+names-scurret-first-dataset-40 = Наблюдающий
+names-scurret-first-dataset-41 = Отдыхающий
+names-scurret-first-dataset-42 = Доставляющий
+names-scurret-first-dataset-43 = Плавающий
+names-scurret-first-dataset-44 = Раскачивающийся
+names-scurret-first-dataset-45 = Взрывающийся
+names-scurret-first-dataset-46 = Романтичный
+names-scurret-first-dataset-47 = Дальновидный
+names-scurret-first-dataset-48 = Верный
+names-scurret-first-dataset-49 = Любознательный
+names-scurret-first-dataset-50 = Юридически Отличный

Resources/Locale/ru-RU/datasets/names/scurret_last.ftl

@@ -0,0 +1,52 @@
+# У скерретов с планеты Вава имя состоит из двух частей: выбранная и качественная.
+
+names-scurret-last-dataset-1 = Ва
+names-scurret-last-dataset-2 = Деревья
+names-scurret-last-dataset-3 = Растения
+names-scurret-last-dataset-4 = Скалы
+names-scurret-last-dataset-5 = Реки
+names-scurret-last-dataset-6 = Рощи
+names-scurret-last-dataset-7 = Озёра
+names-scurret-last-dataset-8 = Болота
+names-scurret-last-dataset-9 = Родники
+names-scurret-last-dataset-10 = Камыши
+names-scurret-last-dataset-11 = Солнце
+names-scurret-last-dataset-12 = Дожди
+names-scurret-last-dataset-13 = Облака
+names-scurret-last-dataset-14 = Снегопады
+names-scurret-last-dataset-15 = Камни
+names-scurret-last-dataset-16 = Галька
+names-scurret-last-dataset-17 = Рыбы
+names-scurret-last-dataset-18 = Насекомые
+names-scurret-last-dataset-19 = Фрукты
+names-scurret-last-dataset-20 = Цветы
+names-scurret-last-dataset-21 = Бутоны
+names-scurret-last-dataset-22 = Туманы
+names-scurret-last-dataset-23 = Ивы
+names-scurret-last-dataset-24 = Ольхи
+names-scurret-last-dataset-25 = Берёзы
+names-scurret-last-dataset-26 = Тополя
+names-scurret-last-dataset-27 = Бархатцы
+names-scurret-last-dataset-28 = Рябины
+names-scurret-last-dataset-29 = Орхидеи
+names-scurret-last-dataset-30 = Осоки
+names-scurret-last-dataset-31 = Лилии
+names-scurret-last-dataset-32 = Фиалки
+names-scurret-last-dataset-33 = Клёны
+names-scurret-last-dataset-34 = Дубы
+names-scurret-last-dataset-35 = Лещины
+names-scurret-last-dataset-36 = Всеведущий
+names-scurret-last-dataset-37 = Горные Озёра
+names-scurret-last-dataset-38 = Воды
+names-scurret-last-dataset-39 = Водохранилища
+names-scurret-last-dataset-40 = Плотины
+names-scurret-last-dataset-41 = Пустоши
+names-scurret-last-dataset-42 = Торфяники
+names-scurret-last-dataset-43 = Храмы
+names-scurret-last-dataset-44 = Холмы
+names-scurret-last-dataset-45 = Перелески
+names-scurret-last-dataset-46 = Поля
+names-scurret-last-dataset-47 = Предки
+names-scurret-last-dataset-48 = Леса
+names-scurret-last-dataset-49 = Тайны
+names-scurret-last-dataset-50 = Космический Хорёк

Resources/Maps/_Sunrise/Shuttles/Antag/infiltrator.yml

@@ -4750,7 +4750,7 @@ entities:
     - type: Transform
       pos: 1.5,-19.5
       parent: 1
-- proto: StationAnchorOff
+- proto: ShuttleAnchorOff
   entities:
   - uid: 604
     components:

Resources/Prototypes/Entities/Effects/mobspawn.yml

@@ -46,7 +46,7 @@
   categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
+    sprite: /Textures/_Sunrise/Effects/mobspawn.rsi # Sunrise-Edit
     state: crab_coal
   - type: SpawnOnDespawn
     prototype: MobCoalCrab
@@ -70,7 +70,7 @@
   categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
+    sprite: /Textures/_Sunrise/Effects/mobspawn.rsi # Sunrise-Edit
     state: crab_gold
   - type: SpawnOnDespawn
     prototype: MobGoldCrab
@@ -94,7 +94,7 @@
   categories: [ HideSpawnMenu, Spawner ]
   components:
   - type: Sprite
-    sprite: /Textures/Effects/mobspawn.rsi
+    sprite: /Textures/_Sunrise/Effects/mobspawn.rsi # Sunrise-Edit
     state: crab_bananium
   - type: SpawnOnDespawn
     prototype: MobBananiumCrab

Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml

@@ -133,6 +133,7 @@
   suffix: Coal
   components:
   - type: Sprite
+    sprite: _Sunrise/Mobs/Elemental/orecrab.rsi # Sunrise-Add
     state: coal_crab
   - type: MeleeWeapon
     damage:
@@ -201,6 +202,7 @@
   suffix: Bananium
   components:
   - type: Sprite
+    sprite: _Sunrise/Mobs/Elemental/orecrab.rsi # Sunrise-Add
     state: bananium_crab
   - type: FactionException
   - type: NPCRetaliation
@@ -286,6 +288,7 @@
   suffix: Gold
   components:
   - type: Sprite
+    sprite: _Sunrise/Mobs/Elemental/orecrab.rsi # Sunrise-Add
     state: gold_crab
   - type: MeleeWeapon
     damage:

Resources/Prototypes/Entities/Structures/Walls/asteroid.yml

@@ -48,10 +48,12 @@
           path: /Audio/Effects/break_stone.ogg
           params:
             volume: -6
+#Sunrise-Start
   - type: Gatherable
     toolWhitelist:
       tags:
       - Pickaxe
+#Sunrise-End
   - type: Fixtures
     fixtures:
       fix1:
@@ -98,11 +100,11 @@
     intensitySlope: 2.5
     maxIntensity: 10
     canCreateVacuum: false
-  # Sunrise-start
+  #Sunrise-Start
   - type: Gatherable # nasty hack to cover the fact that this needs to not be single-hit destruction.
     toolWhitelist:
       tags: [ ]
-  # Sunrise-end
+  #Sunrise-End
   - type: Destructible
     thresholds:
     - trigger:
@@ -208,6 +210,16 @@
     - state: rock_diamond
       map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
+#Sunrise-Start
+- type: entity
+  id: AsteroidRockDiamondCrab
+  parent: AsteroidRockDiamond
+  suffix: Diamond Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab
+#Sunrise-End
+
 - type: entity
   id: AsteroidRockPlasma
   parent: AsteroidRock
@@ -230,6 +242,15 @@
     - state: rock_phoron
       map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
+#Sunrise-Start
+- type: entity
+  id: AsteroidRockPlasmaCrab
+  parent: AsteroidRockPlasma
+  suffix: Plasma Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+#Sunrise-End
 - type: entity
   id: AsteroidRockQuartz
   parent: AsteroidRock
@@ -409,6 +430,15 @@
     - state: rock_salt
       map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
+#Sunrise-Start
+- type: entity
+  id: AsteroidRockSaltCrab
+  parent: AsteroidRockSalt
+  suffix: Salt Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+#Sunrise-End
 - type: entity
   id: AsteroidRockArtifactFragment
   parent: AsteroidRock
@@ -773,66 +803,10 @@
     - state: rock_diamond
       map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
-- type: entity
-  id: IronRockCoalCrab
-  parent: IronRockCoal
-  suffix: Coal Crab
-  components:
-  - type: OreVein
-    currentOre: OreCoalCrab
-
-- type: entity
-  id: IronRockGoldCrab
-  parent: IronRockGold
-  suffix: Gold Crab
-  components:
-  - type: OreVein
-    currentOre: OreGoldCrab
-
-- type: entity
-  id: IronRockQuartzCrab
-  parent: IronRockQuartz
-  suffix: Quartz Crab
-  components:
-  - type: OreVein
-    currentOre: OreQuartzCrab
-
-- type: entity
-  id: IronRockSilverCrab
-  parent: IronRockSilver
-  suffix: Silver Crab
-  components:
-  - type: OreVein
-    currentOre: OreSilverCrab
-
-- type: entity
-  id: IronRockIronCrab
-  parent: IronRockIron
-  suffix: Iron Crab
-  components:
-  - type: OreVein
-    currentOre: OreIronCrab
-
-- type: entity
-  id: IronRockUraniumCrab
-  parent: IronRockUranium
-  suffix: Uranium Crab
-  components:
-  - type: OreVein
-    currentOre: OreUraniumCrab
-
-- type: entity
-  id: IronRockBananiumCrab
-  parent: IronRockBananium
-  suffix: Bananium Crab
-  components:
-  - type: OreVein
-    currentOre: OreBananiumCrab
-
 # Rocks and ore veins
 - type: entity
   id: WallRock
-  parent: AsteroidRock
+  parent: AsteroidRock #Sunrise-Edit
   name: rock
   suffix: planetmap
   components:
@@ -845,12 +819,12 @@
       - Pickaxe
   - type: Damageable
     damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
+    damageModifierSet: Rock #Sunrise-Edit
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 120 #Sunrise-Edit
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]

Resources/Prototypes/Entities/Structures/Walls/asteroid_crab.yml

@@ -0,0 +1,498 @@
+# Crab variants of wall ore veins used for expedition ore-crab spawning.
+
+# Coal
+- type: entity
+  id: WallRockCoalCrab
+  parent: WallRockCoal
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockCoalCrab
+      WallRockBasalt: WallRockBasaltCoalCrab
+      WallRockChromite: WallRockChromiteCoalCrab
+      WallRockSand: WallRockSandCoalCrab
+      WallRockSnow: WallRockSnowCoalCrab
+  - type: OreVein
+    currentOre: OreCoalCrab
+
+- type: entity
+  id: WallRockBasaltCoalCrab
+  parent: WallRockBasaltCoal
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreCoalCrab
+
+- type: entity
+  id: WallRockChromiteCoalCrab
+  parent: WallRockChromiteCoal
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreCoalCrab
+
+- type: entity
+  id: WallRockSandCoalCrab
+  parent: WallRockSandCoal
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreCoalCrab
+
+- type: entity
+  id: WallRockSnowCoalCrab
+  parent: WallRockSnowCoal
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreCoalCrab
+
+# Gold
+- type: entity
+  id: WallRockGoldCrab
+  parent: WallRockGold
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockGoldCrab
+      WallRockBasalt: WallRockBasaltGoldCrab
+      WallRockChromite: WallRockChromiteGoldCrab
+      WallRockSand: WallRockSandGoldCrab
+      WallRockSnow: WallRockSnowGoldCrab
+  - type: OreVein
+    currentOre: OreGoldCrab
+
+- type: entity
+  id: WallRockBasaltGoldCrab
+  parent: WallRockBasaltGold
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreGoldCrab
+
+- type: entity
+  id: WallRockChromiteGoldCrab
+  parent: WallRockChromiteGold
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreGoldCrab
+
+- type: entity
+  id: WallRockSandGoldCrab
+  parent: WallRockSandGold
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreGoldCrab
+
+- type: entity
+  id: WallRockSnowGoldCrab
+  parent: WallRockSnowGold
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreGoldCrab
+
+# Quartz
+- type: entity
+  id: WallRockQuartzCrab
+  parent: WallRockQuartz
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockQuartzCrab
+      WallRockBasalt: WallRockBasaltQuartzCrab
+      WallRockChromite: WallRockChromiteQuartzCrab
+      WallRockSnow: WallRockSnowQuartzCrab
+  - type: OreVein
+    currentOre: OreQuartzCrab
+
+- type: entity
+  id: WallRockBasaltQuartzCrab
+  parent: WallRockBasaltQuartz
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreQuartzCrab
+
+- type: entity
+  id: WallRockChromiteQuartzCrab
+  parent: WallRockChromiteQuartz
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreQuartzCrab
+
+- type: entity
+  id: WallRockSnowQuartzCrab
+  parent: WallRockSnowQuartz
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreQuartzCrab
+
+# Silver
+- type: entity
+  id: WallRockSilverCrab
+  parent: WallRockSilver
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockSilverCrab
+      WallRockBasalt: WallRockBasaltSilverCrab
+      WallRockChromite: WallRockChromiteSilverCrab
+      WallRockSand: WallRockSandSilverCrab
+      WallRockSnow: WallRockSnowSilverCrab
+  - type: OreVein
+    currentOre: OreSilverCrab
+
+- type: entity
+  id: WallRockBasaltSilverCrab
+  parent: WallRockBasaltSilver
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSilverCrab
+
+- type: entity
+  id: WallRockChromiteSilverCrab
+  parent: WallRockChromiteSilver
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSilverCrab
+
+- type: entity
+  id: WallRockSandSilverCrab
+  parent: WallRockSandSilver
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSilverCrab
+
+- type: entity
+  id: WallRockSnowSilverCrab
+  parent: WallRockSnowSilver
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSilverCrab
+
+# Iron
+- type: entity
+  id: WallRockTinCrab
+  parent: WallRockTin
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockTinCrab
+      WallRockBasalt: WallRockBasaltTinCrab
+      WallRockChromite: WallRockChromiteTinCrab
+      WallRockSand: WallRockSandTinCrab
+      WallRockSnow: WallRockSnowTinCrab
+  - type: OreVein
+    currentOre: OreIronCrab
+
+- type: entity
+  id: WallRockBasaltTinCrab
+  parent: WallRockBasaltTin
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreIronCrab
+
+- type: entity
+  id: WallRockChromiteTinCrab
+  parent: WallRockChromiteTin
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreIronCrab
+
+- type: entity
+  id: WallRockSandTinCrab
+  parent: WallRockSandTin
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreIronCrab
+
+- type: entity
+  id: WallRockSnowTinCrab
+  parent: WallRockSnowTin
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreIronCrab
+
+# Uranium
+- type: entity
+  id: WallRockUraniumCrab
+  parent: WallRockUranium
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockUraniumCrab
+      WallRockBasalt: WallRockBasaltUraniumCrab
+      WallRockChromite: WallRockChromiteUraniumCrab
+      WallRockSand: WallRockSandUraniumCrab
+      WallRockSnow: WallRockSnowUraniumCrab
+  - type: OreVein
+    currentOre: OreUraniumCrab
+
+- type: entity
+  id: WallRockBasaltUraniumCrab
+  parent: WallRockBasaltUranium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreUraniumCrab
+
+- type: entity
+  id: WallRockChromiteUraniumCrab
+  parent: WallRockChromiteUranium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreUraniumCrab
+
+- type: entity
+  id: WallRockSandUraniumCrab
+  parent: WallRockSandUranium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreUraniumCrab
+
+- type: entity
+  id: WallRockSnowUraniumCrab
+  parent: WallRockSnowUranium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreUraniumCrab
+
+# Bananium
+- type: entity
+  id: WallRockBananiumCrab
+  parent: WallRockBananium
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockBananiumCrab
+      WallRockBasalt: WallRockBasaltBananiumCrab
+      WallRockChromite: WallRockChromiteBananiumCrab
+      WallRockSand: WallRockSandBananiumCrab
+      WallRockSnow: WallRockSnowBananiumCrab
+  - type: OreVein
+    currentOre: OreBananiumCrab
+
+- type: entity
+  id: WallRockBasaltBananiumCrab
+  parent: WallRockBasaltBananium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreBananiumCrab
+
+#Sunrise-Start
+- type: entity
+  id: WallRockSaltCrab
+  parent: WallRockSalt
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockSaltCrab
+      WallRockBasalt: WallRockBasaltSaltCrab
+      WallRockChromite: WallRockChromiteSaltCrab
+      WallRockSand: WallRockSandSaltCrab
+      WallRockSnow: WallRockSnowSaltCrab
+      WallRockAndesite: WallRockAndesiteSaltCrab
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: WallRockBasaltSaltCrab
+  parent: WallRockBasaltSalt
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: WallRockChromiteSaltCrab
+  parent: WallRockChromiteSalt
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: WallRockSandSaltCrab
+  parent: WallRockSandSalt
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: WallRockSnowSaltCrab
+  parent: WallRockSnowSalt
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: WallRockAndesiteSaltCrab
+  parent: WallRockAndesiteSalt
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: WallRockPlasmaCrab
+  parent: WallRockPlasma
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockPlasmaCrab
+      WallRockBasalt: WallRockBasaltPlasmaCrab
+      WallRockChromite: WallRockChromitePlasmaCrab
+      WallRockSand: WallRockSandPlasmaCrab
+      WallRockSnow: WallRockSnowPlasmaCrab
+      WallRockAndesite: WallRockAndesitePlasmaCrab
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: WallRockBasaltPlasmaCrab
+  parent: WallRockBasaltPlasma
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: WallRockChromitePlasmaCrab
+  parent: WallRockChromitePlasma
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: WallRockSandPlasmaCrab
+  parent: WallRockSandPlasma
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: WallRockSnowPlasmaCrab
+  parent: WallRockSnowPlasma
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: WallRockAndesitePlasmaCrab
+  parent: WallRockAndesitePlasma
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: WallRockDiamondCrab
+  parent: WallRockDiamond
+  suffix: Crab
+  components:
+  - type: EntityRemap
+    mask:
+      AsteroidRock: AsteroidRockDiamondCrab
+      WallRockBasalt: WallRockBasaltDiamondCrab
+      WallRockChromite: WallRockChromiteDiamondCrab
+      WallRockSand: WallRockSandDiamondCrab
+      WallRockSnow: WallRockSnowDiamondCrab
+      WallRockAndesite: WallRockAndesiteDiamondCrab
+  - type: OreVein
+    currentOre: OreDiamondCrab
+
+- type: entity
+  id: WallRockBasaltDiamondCrab
+  parent: WallRockBasaltDiamond
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab
+
+- type: entity
+  id: WallRockChromiteDiamondCrab
+  parent: WallRockChromiteDiamond
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab
+
+- type: entity
+  id: WallRockSandDiamondCrab
+  parent: WallRockSandDiamond
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab
+
+- type: entity
+  id: WallRockSnowDiamondCrab
+  parent: WallRockSnowDiamond
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab
+
+- type: entity
+  id: WallRockAndesiteDiamondCrab
+  parent: WallRockAndesiteDiamond
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab
+#Sunrise-End
+
+- type: entity
+  id: WallRockChromiteBananiumCrab
+  parent: WallRockChromiteBananium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreBananiumCrab
+
+- type: entity
+  id: WallRockSandBananiumCrab
+  parent: WallRockSandBananium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreBananiumCrab
+
+- type: entity
+  id: WallRockSnowBananiumCrab
+  parent: WallRockSnowBananium
+  suffix: Crab
+  components:
+  - type: OreVein
+    currentOre: OreBananiumCrab

Resources/Prototypes/Procedural/biome_ore_templates.yml

@@ -8,7 +8,7 @@
     WallRockChromite: WallRockChromiteTin
     WallRockSand: WallRockSandTin
     WallRockSnow: WallRockSnowTin
-  maxCount: 30
+  maxCount: 15 #Sunrise-Edit
   minGroupSize: 10
   maxGroupSize: 15
   radius: 4
@@ -21,7 +21,7 @@
     WallRockBasalt: WallRockBasaltQuartz
     WallRockChromite: WallRockChromiteQuartz
     WallRockSnow: WallRockSnowQuartz
-  maxCount: 30
+  maxCount: 15 #Sunrise-Edit
   minGroupSize: 10
   maxGroupSize: 15
   radius: 4
@@ -35,7 +35,7 @@
     WallRockChromite: WallRockChromiteCoal
     WallRockSand: WallRockSandCoal
     WallRockSnow: WallRockSnowCoal
-  maxCount: 30
+  maxCount: 15 #Sunrise-Edit
   minGroupSize: 8
   maxGroupSize: 12
   radius: 4
@@ -49,7 +49,7 @@
     WallRockChromite: WallRockChromiteSalt
     WallRockSand: WallRockSandSalt
     WallRockSnow: WallRockSnowSalt
-  maxCount: 30
+  maxCount: 15 #Sunrise-Edit
   minGroupSize: 8
   maxGroupSize: 12
   radius: 4
@@ -65,7 +65,7 @@
     WallRockChromite: WallRockChromiteGold
     WallRockSand: WallRockSandGold
     WallRockSnow: WallRockSnowGold
-  maxCount: 20
+  maxCount: 10 #Sunrise-Edit
   minGroupSize: 5
   maxGroupSize: 10
   radius: 4
@@ -80,7 +80,7 @@
     WallRockChromite: WallRockChromiteSilver
     WallRockSand: WallRockSandSilver
     WallRockSnow: WallRockSnowSilver
-  maxCount: 20
+  maxCount: 10 #Sunrise-Edit
   minGroupSize: 5
   maxGroupSize: 10
   radius: 4
@@ -96,7 +96,7 @@
     WallRockChromite: WallRockChromitePlasma
     WallRockSand: WallRockSandPlasma
     WallRockSnow: WallRockSnowPlasma
-  maxCount: 12
+  maxCount: 6 #Sunrise-Edit
   minGroupSize: 4
   maxGroupSize: 8
   radius: 4
@@ -111,7 +111,7 @@
     WallRockChromite: WallRockChromiteUranium
     WallRockSand: WallRockSandUranium
     WallRockSnow: WallRockSnowUranium
-  maxCount: 15
+  maxCount: 8 #Sunrise-Edit
   minGroupSize: 4
   maxGroupSize: 8
   radius: 4
@@ -125,7 +125,7 @@
     WallRockChromite: WallRockChromiteDiamond
     WallRockSand: WallRockSandDiamond
     WallRockSnow: WallRockSnowDiamond
-  maxCount: 6
+  maxCount: 3 #Sunrise-Edit
   minGroupSize: 1
   maxGroupSize: 2
   radius: 4

Resources/Prototypes/Procedural/biome_ore_templates_low.yml

@@ -8,11 +8,27 @@
     WallRockChromite: WallRockChromiteTin
     WallRockSand: WallRockSandTin
     WallRockSnow: WallRockSnowTin
-  maxCount: 20
+  maxCount: 10 #Sunrise-Edit
   minGroupSize: 4
   maxGroupSize: 8
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreIronLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockTinCrab
+    WallRock: WallRockTinCrab
+    WallRockBasalt: WallRockBasaltTinCrab
+    WallRockChromite: WallRockChromiteTinCrab
+    WallRockSand: WallRockSandTinCrab
+    WallRockSnow: WallRockSnowTinCrab
+  maxCount: 10
+  minGroupSize: 4
+  maxGroupSize: 8
+  radius: 4
+#Sunrise-End
+
 - type: biomeMarkerLayer
   id: OreQuartzLow
   entityMask:
@@ -21,11 +37,26 @@
     WallRockBasalt: WallRockBasaltQuartz
     WallRockChromite: WallRockChromiteQuartz
     WallRockSnow: WallRockSnowQuartz
-  maxCount: 20
+  maxCount: 10 #Sunrise-Edit
   minGroupSize: 4
   maxGroupSize: 8
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreQuartzLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockQuartzCrab
+    WallRock: WallRockQuartzCrab
+    WallRockBasalt: WallRockBasaltQuartzCrab
+    WallRockChromite: WallRockChromiteQuartzCrab
+    WallRockSnow: WallRockSnowQuartzCrab
+  maxCount: 10
+  minGroupSize: 4
+  maxGroupSize: 8
+  radius: 4
+#Sunrise-End
+
 - type: biomeMarkerLayer
   id: OreCoalLow
   entityMask:
@@ -35,11 +66,27 @@
     WallRockChromite: WallRockChromiteCoal
     WallRockSand: WallRockSandCoal
     WallRockSnow: WallRockSnowCoal
-  maxCount: 20
+  maxCount: 10 #Sunrise-Edit
   minGroupSize: 4
   maxGroupSize: 6
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreCoalLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockCoalCrab
+    WallRock: WallRockCoalCrab
+    WallRockBasalt: WallRockBasaltCoalCrab
+    WallRockChromite: WallRockChromiteCoalCrab
+    WallRockSand: WallRockSandCoalCrab
+    WallRockSnow: WallRockSnowCoalCrab
+  maxCount: 10
+  minGroupSize: 4
+  maxGroupSize: 6
+  radius: 4
+#Sunrise-End
+
 - type: biomeMarkerLayer
   id: OreSaltLow
   entityMask:
@@ -49,11 +96,27 @@
     WallRockChromite: WallRockChromiteSalt
     WallRockSand: WallRockSandSalt
     WallRockSnow: WallRockSnowSalt
-  maxCount: 15
+  maxCount: 8 #Sunrise-Edit
   minGroupSize: 4
   maxGroupSize: 6
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreSaltLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockSaltCrab
+    WallRock: WallRockSaltCrab
+    WallRockBasalt: WallRockBasaltSaltCrab
+    WallRockChromite: WallRockChromiteSaltCrab
+    WallRockSand: WallRockSandSaltCrab
+    WallRockSnow: WallRockSnowSaltCrab
+  maxCount: 7
+  minGroupSize: 4
+  maxGroupSize: 6
+  radius: 4
+#Sunrise-End
+
 # Medium value
 # Gold
 - type: biomeMarkerLayer
@@ -65,11 +128,27 @@
     WallRockChromite: WallRockChromiteGold
     WallRockSand: WallRockSandGold
     WallRockSnow: WallRockSnowGold
-  maxCount: 10
+  maxCount: 5 #Sunrise-Edit
   minGroupSize: 2
   maxGroupSize: 5
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreGoldLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockGoldCrab
+    WallRock: WallRockGoldCrab
+    WallRockBasalt: WallRockBasaltGoldCrab
+    WallRockChromite: WallRockChromiteGoldCrab
+    WallRockSand: WallRockSandGoldCrab
+    WallRockSnow: WallRockSnowGoldCrab
+  maxCount: 5
+  minGroupSize: 2
+  maxGroupSize: 5
+  radius: 4
+#Sunrise-End
+
 # Silver
 - type: biomeMarkerLayer
   id: OreSilverLow
@@ -80,11 +159,27 @@
     WallRockChromite: WallRockChromiteSilver
     WallRockSand: WallRockSandSilver
     WallRockSnow: WallRockSnowSilver
-  maxCount: 10
+  maxCount: 5 #Sunrise-Edit
   minGroupSize: 2
   maxGroupSize: 5
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreSilverLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockSilverCrab
+    WallRock: WallRockSilverCrab
+    WallRockBasalt: WallRockBasaltSilverCrab
+    WallRockChromite: WallRockChromiteSilverCrab
+    WallRockSand: WallRockSandSilverCrab
+    WallRockSnow: WallRockSnowSilverCrab
+  maxCount: 5
+  minGroupSize: 2
+  maxGroupSize: 5
+  radius: 4
+#Sunrise-End
+
 # High value
 # Plasma
 - type: biomeMarkerLayer
@@ -96,11 +191,27 @@
     WallRockChromite: WallRockChromitePlasma
     WallRockSand: WallRockSandPlasma
     WallRockSnow: WallRockSnowPlasma
-  maxCount: 6
+  maxCount: 3 #Sunrise-Edit
   minGroupSize: 2
   maxGroupSize: 4
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OrePlasmaLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockPlasmaCrab
+    WallRock: WallRockPlasmaCrab
+    WallRockBasalt: WallRockBasaltPlasmaCrab
+    WallRockChromite: WallRockChromitePlasmaCrab
+    WallRockSand: WallRockSandPlasmaCrab
+    WallRockSnow: WallRockSnowPlasmaCrab
+  maxCount: 3
+  minGroupSize: 2
+  maxGroupSize: 4
+  radius: 4
+#Sunrise-End
+
 # Uranium
 - type: biomeMarkerLayer
   id: OreUraniumLow
@@ -111,11 +222,57 @@
     WallRockChromite: WallRockChromiteUranium
     WallRockSand: WallRockSandUranium
     WallRockSnow: WallRockSnowUranium
-  maxCount: 7
+  maxCount: 4 #Sunrise-Edit
   minGroupSize: 2
   maxGroupSize: 4
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreUraniumLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockUraniumCrab
+    WallRock: WallRockUraniumCrab
+    WallRockBasalt: WallRockBasaltUraniumCrab
+    WallRockChromite: WallRockChromiteUraniumCrab
+    WallRockSand: WallRockSandUraniumCrab
+    WallRockSnow: WallRockSnowUraniumCrab
+  maxCount: 3
+  minGroupSize: 2
+  maxGroupSize: 4
+  radius: 4
+#Sunrise-End
+
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreBananiumLow
+  entityMask:
+    AsteroidRock: AsteroidRockBananium
+    WallRock: WallRockBananium
+    WallRockBasalt: WallRockBasaltBananium
+    WallRockChromite: WallRockChromiteBananium
+    WallRockSand: WallRockSandBananium
+    WallRockSnow: WallRockSnowBananium
+  maxCount: 3
+  minGroupSize: 2
+  maxGroupSize: 4
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreBananiumLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockBananiumCrab
+    WallRock: WallRockBananiumCrab
+    WallRockBasalt: WallRockBasaltBananiumCrab
+    WallRockChromite: WallRockChromiteBananiumCrab
+    WallRockSand: WallRockSandBananiumCrab
+    WallRockSnow: WallRockSnowBananiumCrab
+  maxCount: 3
+  minGroupSize: 2
+  maxGroupSize: 4
+  radius: 4
+#Sunrise-End
+
 - type: biomeMarkerLayer
   id: OreDiamondLow
   entityMask:
@@ -125,11 +282,27 @@
     WallRockChromite: WallRockChromiteDiamond
     WallRockSand: WallRockSandDiamond
     WallRockSnow: WallRockSnowDiamond
-  maxCount: 3
+  maxCount: 2 #Sunrise-Edit
   minGroupSize: 1
   maxGroupSize: 2
   radius: 4
 
+#Sunrise-Start
+- type: biomeMarkerLayer
+  id: OreDiamondLowCrab
+  entityMask:
+    AsteroidRock: AsteroidRockDiamondCrab
+    WallRock: WallRockDiamondCrab
+    WallRockBasalt: WallRockBasaltDiamondCrab
+    WallRockChromite: WallRockChromiteDiamondCrab
+    WallRockSand: WallRockSandDiamondCrab
+    WallRockSnow: WallRockSnowDiamondCrab
+  maxCount: 1
+  minGroupSize: 1
+  maxGroupSize: 2
+  radius: 4
+#Sunrise-End
+
 # Artifact Fragment
 - type: biomeMarkerLayer
   id: OreArtifactFragmentLow

Resources/Prototypes/Procedural/salvage_loot.yml

@@ -171,16 +171,16 @@
     - !type:BiomeMarkerLoot
       proto: OreUranium
 
+- type: salvageLoot
+  id: OreBananium
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreBananium
+
 - type: salvageLoot
   id: OreDiamond
   guaranteed: true
   loots:
     - !type:BiomeMarkerLoot
       proto: OreDiamond
-
-- type: salvageLoot
-  id: OreArtifactFragment
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto: OreArtifactFragment

Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml

@@ -8,7 +8,9 @@
     contents:
     - id: WeaponAJ100Biocode
     - id: MagazinePistolSubMachineGun
-      amount: 2
+    - id: MagazinePistol40SubMachineGunSP
+    - id: MagazineRifleSP
+    - id: MagazineLightRifleSP
 
 - type: entity
   parent: ClothingBackpackSyndie

Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml

@@ -20,7 +20,7 @@
     - id: Handcuffs
     - id: Stunbaton
     - id: GrenadeFlashBang
-    - id: TearGasGrenade
+    - id: HandheldHealthAnalyzer
 
 - type: entity
   id: ClothingShoesBootsBlueShieldFilled
@@ -36,14 +36,13 @@
 
 - type: entity
   id: ClothingBeltSecurityFilledERT
-  parent: ClothingBeltSecurity
+  parent: ClothingBeltMilitaryWebbingERT
   suffix: Filled, ERT
   components:
   - type: StorageFill
     contents:
-    - id: Stunbaton
+    - id: Telebaton
+    - id: Whistle
+    - id: Handcuffs
     - id: Handcuffs
     - id: HoloprojectorSecurity
-    - id: GrenadeFlashBang
-    - id: TearGasGrenade
-    - id: Truncheon

Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml

@@ -264,9 +264,15 @@
   discountDownTo:
     Telecrystal: 3
   cost:
-    Telecrystal: 4
+    Telecrystal: 5
   categories:
   - UplinkAmmo
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+      - LoneOpsUplink
 
 # For the SIAR52
 - type: listing

Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml

@@ -1,17 +1,11 @@
 - type: entity
-  parent: ClothingBackpack
+  parent: ClothingBackpackSyndicate
   id: ClothingBackpackSyndie
   name: syndie backpack
   description: An operative's backpack with increased capacity.
   components:
   - type: Sprite
     sprite: _Sunrise/Clothing/Back/Backpacks/syndiebackpack.rsi
-  - type: Storage
-    maxItemSize: Huge
-    grid:
-    - 0,0,7,4
-  - type: ExplosionResistance
-    damageCoefficient: 0.1
 
 - type: entity
   parent: ClothingBackpack

Resources/Prototypes/_Sunrise/Entities/Clothing/Masks/masks.yml

@@ -12,7 +12,7 @@
     sprite: _Sunrise/Clothing/Mask/pilotmask.rsi
 
 - type: entity
-  parent: ClothingMaskGas
+  parent: ClothingMaskGasAtmos
   id: ClothingMaskGasAtmosian
   name: atmosian's gas mask
   description: An improved gas mask used by the Atmosians. Fireproof!
@@ -89,7 +89,7 @@
   - type: IngestionBlocker
 
 - type: entity
-  parent: ClothingMaskGasAtmos
+  parent: ClothingMaskGasSecurity
   id: ClothingMaskIAA
   name: elite gas mask
   description: Black gas mask with gold-plated element above the visor made of durable glass. You do not have to breathe the same air as the defendants. Protects against flares.
@@ -98,9 +98,6 @@
     sprite: _Sunrise/Clothing/Mask/iaamask.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/Mask/iaamask.rsi
-  - type: BreathMask
-  - type: IngestionBlocker
-  - type: FlashImmunity
 
 - type: entity
   parent: ClothingMaskGasAtmos

Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml

@@ -19,26 +19,13 @@
     sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi
   - type: Clothing
     sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi
-  - type: Pierceable
-    level: Metal
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.65
-        Heat: 0.8
-  - type: ExplosionResistance
-    damageCoefficient: 0.85
-  - type: Item
-    size: Huge
   - type: Tag
     tags:
     - Vest
     - NudeBottom
     - WhitelistChameleon
   - type: Construction
-    graph: UpgradeArmorVest
+    graph: UpgradeArmorVestBlueshield
     node: start
 
 - type: entity

Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/vests.yml

@@ -61,3 +61,16 @@
     - type: Construction
       graph: UpgradeArmorVest
       node: webvest
+
+- type: entity
+  parent: ClothingOuterVestWebSec
+  id: ClothingOuterVestWebBlue
+  name: blueshild web vest
+  components:
+    - type: Sprite
+      sprite: _Sunrise/Clothing/OuterClothing/Vests/web_armor_blue.rsi
+    - type: Clothing
+      sprite: _Sunrise/Clothing/OuterClothing/Vests/web_armor_blue.rsi
+    - type: Construction
+      graph: UpgradeArmorVestBlueshield
+      node: webvest

Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/elemental.yml

@@ -0,0 +1,101 @@
+- type: entity
+  parent: MobOreCrab
+  id: MobPlasmaCrab
+  description: An ore crab made from plasma.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Mobs/Elemental/orecrab.rsi
+    state: plasma_crab
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 7
+  - type: Explosive
+    explosionType: FireBomb
+    totalIntensity: 20
+    maxIntensity: 3
+    intensitySlope: 5
+    canCreateVacuum: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          PlasmaOre1:
+            min: 2
+            max: 4
+      - !type:ExplodeBehavior
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PointLight
+    radius: 2
+    energy: 3
+    color: "#E592E7FF" # Same as plasma ore
+
+- type: entity
+  parent: MobOreCrab
+  id: MobSaltCrab
+  description: An ore crab made from salt. # delicious, don't try to lick this
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Mobs/Elemental/orecrab.rsi
+    state: salt_crab
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 80
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          Salt1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+# Region spawner
+- type: entity
+  id: MobSpawnCrabDiamond
+  parent: MobSpawnCrabQuartz
+  name: mobspawner diamondcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/_Sunrise/Effects/mobspawn.rsi
+    state: crab_diamond
+  - type: SpawnOnDespawn
+    prototype: MobBasilisk
+
+- type: entity
+  id: MobSpawnCrabSalt
+  parent: MobSpawnCrabQuartz
+  name: mobspawner saltcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/_Sunrise/Effects/mobspawn.rsi
+    state: crab_salt
+  - type: SpawnOnDespawn
+    prototype: MobSaltCrab
+
+- type: entity
+  id: MobSpawnCrabPlasma
+  parent: MobSpawnCrabQuartz
+  name: mobspawner plasmacrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/_Sunrise/Effects/mobspawn.rsi
+    state: crab_plasma
+  - type: SpawnOnDespawn
+    prototype: MobPlasmaCrab

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Basic/plasma_cutter.yml

@@ -24,6 +24,7 @@
     angleDecay: 25
     minAngle: 24
     maxAngle: 25
+    projectileSpeed: 25
     availableModes:
     - SemiAuto
     soundGunshot:

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -489,13 +489,13 @@
     unwieldOnUse: false
   - type: GunWieldBonus
     minAngle: -2.5
-    maxAngle: -23
+    maxAngle: -25
   - type: Gun
     minAngle: 5.5
     maxAngle: 45
-    angleIncrease: 2.5
-    angleDecay: 18
-    fireRate: 7.5
+    angleIncrease: 2.75
+    angleDecay: 20
+    fireRate: 7
     selectedMode: FullAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
@@ -518,6 +518,9 @@
           - MagazinePistol
           - MagazinePistolHighCapacity
           - MagazinePistolCaselessRifle
+          - MagazineRifle
+          - MagazineLightRifle
+          - MagazinePistolDPSubMachineGun
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistolSP
@@ -526,6 +529,9 @@
           tags:
           - CartridgeCaselessRifle
           - CartridgePistol
+          - CartridgePistolDP
+          - CartridgeRifle
+          - CartridgeLightRifle
   - type: MagazineVisuals
     magState: mag
     steps: 1

Resources/Prototypes/_Sunrise/Entities/Structures/Walls/asteroid.yml

@@ -1,56 +1,79 @@
-#для Пленетарной Тюрьмы
 - type: entity
-  id: WallRockUraniumCrab
-  parent: WallRockUranium
-  suffix: Uranium Crab
-  components:
-  - type: OreVein
-    currentOre: OreUraniumCrab
-
-- type: entity
-  id: WallRockCoalCrab
-  parent: WallRockCoal
+  id: IronRockCoalCrab
+  parent: IronRockCoal
   suffix: Coal Crab
   components:
   - type: OreVein
     currentOre: OreCoalCrab
 
 - type: entity
-  id: WallRockSilverCrab
-  parent: WallRockSilver
-  suffix: Silver Crab
-  components:
-  - type: OreVein
-    currentOre: OreSilverCrab
-
-- type: entity
-  id: WallRockQuartzCrab
-  parent: WallRockQuartz
-  suffix: Quartz Crab
-  components:
-  - type: OreVein
-    currentOre: OreQuartzCrab
-
-- type: entity
-  id: WallRockGoldCrab
-  parent: WallRockGold
+  id: IronRockGoldCrab
+  parent: IronRockGold
   suffix: Gold Crab
   components:
   - type: OreVein
     currentOre: OreGoldCrab
 
 - type: entity
-  id: WallRockTinCrab
-  parent: WallRockTin
+  id: IronRockQuartzCrab
+  parent: IronRockQuartz
+  suffix: Quartz Crab
+  components:
+  - type: OreVein
+    currentOre: OreQuartzCrab
+
+- type: entity
+  id: IronRockSilverCrab
+  parent: IronRockSilver
+  suffix: Silver Crab
+  components:
+  - type: OreVein
+    currentOre: OreSilverCrab
+
+- type: entity
+  id: IronRockIronCrab
+  parent: IronRockIron
   suffix: Iron Crab
   components:
   - type: OreVein
     currentOre: OreIronCrab
 
 - type: entity
-  id: WallRockBananiumCrab
-  parent: WallRockBananium
+  id: IronRockUraniumCrab
+  parent: IronRockUranium
+  suffix: Uranium Crab
+  components:
+  - type: OreVein
+    currentOre: OreUraniumCrab
+
+- type: entity
+  id: IronRockBananiumCrab
+  parent: IronRockBananium
   suffix: Bananium Crab
   components:
   - type: OreVein
     currentOre: OreBananiumCrab
+
+- type: entity
+  id: IronRockSaltCrab
+  parent: IronRockSalt
+  suffix: Salt Crab
+  components:
+  - type: OreVein
+    currentOre: OreSaltCrab
+
+- type: entity
+  id: IronRockPlasmaCrab
+  parent: IronRockPlasma
+  suffix: Plasma Crab
+  components:
+  - type: OreVein
+    currentOre: OrePlasmaCrab
+
+- type: entity
+  id: IronRockDiamondCrab
+  parent: IronRockDiamond
+  suffix: Diamond Crab
+  components:
+  - type: OreVein
+    currentOre: OreDiamondCrab

Resources/Prototypes/_Sunrise/NPCs/pirates.yml

@@ -231,6 +231,8 @@
     - MobsExpeditionGuidePirates
   - type: GhostOnMove
     mustBeDead: true
+  - type: TimedDespawn
+    lifetime: 1200
 
 - type: entity
   abstract: true

Resources/Prototypes/_Sunrise/Procedural/biome_ore_templates.yml

@@ -0,0 +1,152 @@
+- type: biomeMarkerLayer
+  id: OreIronCrab
+  entityMask:
+    AsteroidRock: AsteroidRockTinCrab
+    WallRock: WallRockTinCrab
+    WallRockBasalt: WallRockBasaltTinCrab
+    WallRockChromite: WallRockChromiteTinCrab
+    WallRockSand: WallRockSandTinCrab
+    WallRockSnow: WallRockSnowTinCrab
+  maxCount: 15
+  minGroupSize: 5
+  maxGroupSize: 10
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreQuartzCrab
+  entityMask:
+    AsteroidRock: AsteroidRockQuartzCrab
+    WallRock: WallRockQuartzCrab
+    WallRockBasalt: WallRockBasaltQuartzCrab
+    WallRockChromite: WallRockChromiteQuartzCrab
+    WallRockSnow: WallRockSnowQuartzCrab
+  maxCount: 15
+  minGroupSize: 5
+  maxGroupSize: 10
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreCoalCrab
+  entityMask:
+    AsteroidRock: AsteroidRockCoalCrab
+    WallRock: WallRockCoalCrab
+    WallRockBasalt: WallRockBasaltCoalCrab
+    WallRockChromite: WallRockChromiteCoalCrab
+    WallRockSand: WallRockSandCoalCrab
+    WallRockSnow: WallRockSnowCoalCrab
+  maxCount: 15
+  minGroupSize: 4
+  maxGroupSize: 9
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreSaltCrab
+  entityMask:
+    AsteroidRock: AsteroidRockSaltCrab
+    WallRock: WallRockSaltCrab
+    WallRockBasalt: WallRockBasaltSaltCrab
+    WallRockChromite: WallRockChromiteSaltCrab
+    WallRockSand: WallRockSandSaltCrab
+    WallRockSnow: WallRockSnowSaltCrab
+  maxCount: 15
+  minGroupSize: 4
+  maxGroupSize: 9
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreGoldCrab
+  entityMask:
+    AsteroidRock: AsteroidRockGoldCrab
+    WallRock: WallRockGoldCrab
+    WallRockBasalt: WallRockBasaltGoldCrab
+    WallRockChromite: WallRockChromiteGoldCrab
+    WallRockSand: WallRockSandGoldCrab
+    WallRockSnow: WallRockSnowGoldCrab
+  maxCount: 10
+  minGroupSize: 3
+  maxGroupSize: 8
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreSilverCrab
+  entityMask:
+    AsteroidRock: AsteroidRockSilverCrab
+    WallRock: WallRockSilverCrab
+    WallRockBasalt: WallRockBasaltSilverCrab
+    WallRockChromite: WallRockChromiteSilverCrab
+    WallRockSand: WallRockSandSilverCrab
+    WallRockSnow: WallRockSnowSilverCrab
+  maxCount: 10
+  minGroupSize: 3
+  maxGroupSize: 8
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OrePlasmaCrab
+  entityMask:
+    AsteroidRock: AsteroidRockPlasmaCrab
+    WallRock: WallRockPlasmaCrab
+    WallRockBasalt: WallRockBasaltPlasmaCrab
+    WallRockChromite: WallRockChromitePlasmaCrab
+    WallRockSand: WallRockSandPlasmaCrab
+    WallRockSnow: WallRockSnowPlasmaCrab
+  maxCount: 6
+  minGroupSize: 2
+  maxGroupSize: 5
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreUraniumCrab
+  entityMask:
+    AsteroidRock: AsteroidRockUraniumCrab
+    WallRock: WallRockUraniumCrab
+    WallRockBasalt: WallRockBasaltUraniumCrab
+    WallRockChromite: WallRockChromiteUraniumCrab
+    WallRockSand: WallRockSandUraniumCrab
+    WallRockSnow: WallRockSnowUraniumCrab
+  maxCount: 7
+  minGroupSize: 2
+  maxGroupSize: 5
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreBananium
+  entityMask:
+    AsteroidRock: AsteroidRockBananium
+    WallRock: WallRockBananium
+    WallRockBasalt: WallRockBasaltBananium
+    WallRockChromite: WallRockChromiteBananium
+    WallRockSand: WallRockSandBananium
+    WallRockSnow: WallRockSnowBananium
+  maxCount: 6
+  minGroupSize: 2
+  maxGroupSize: 5
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreBananiumCrab
+  entityMask:
+    AsteroidRock: AsteroidRockBananiumCrab
+    WallRock: WallRockBananiumCrab
+    WallRockBasalt: WallRockBasaltBananiumCrab
+    WallRockChromite: WallRockChromiteBananiumCrab
+    WallRockSand: WallRockSandBananiumCrab
+    WallRockSnow: WallRockSnowBananiumCrab
+  maxCount: 6
+  minGroupSize: 2
+  maxGroupSize: 5
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreDiamondCrab
+  entityMask:
+    AsteroidRock: AsteroidRockDiamondCrab
+    WallRock: WallRockDiamondCrab
+    WallRockBasalt: WallRockBasaltDiamondCrab
+    WallRockChromite: WallRockChromiteDiamondCrab
+    WallRockSand: WallRockSandDiamondCrab
+    WallRockSnow: WallRockSnowDiamondCrab
+  maxCount: 3
+  minGroupSize: 1
+  maxGroupSize: 2
+  radius: 4

Resources/Prototypes/_Sunrise/Procedural/salvage_loot.yml

@@ -0,0 +1,74 @@
+# Sunrise-specific salvage loot
+
+# - Low value
+- type: salvageLoot
+  id: OreIronCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreIronCrab
+
+- type: salvageLoot
+  id: OreCoalCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreCoalCrab
+
+- type: salvageLoot
+  id: OreQuartzCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreQuartzCrab
+
+- type: salvageLoot
+  id: OreSaltCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreSaltCrab
+
+# - Medium value
+- type: salvageLoot
+  id: OreGoldCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreGoldCrab
+
+- type: salvageLoot
+  id: OreSilverCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreSilverCrab
+
+# - High value
+- type: salvageLoot
+  id: OrePlasmaCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OrePlasmaCrab
+
+- type: salvageLoot
+  id: OreUraniumCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreUraniumCrab
+
+- type: salvageLoot
+  id: OreBananiumCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreBananiumCrab
+
+- type: salvageLoot
+  id: OreDiamondCrab
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreDiamondCrab

Resources/Prototypes/_Sunrise/Recipes/Construction/Graphs/weapons/gundupgrades.yml

@@ -179,3 +179,72 @@
           steps:
             - tool: Prying
               doAfter: 2
+
+# region BlueShit
+- type: constructionGraph
+  id: UpgradeArmorVestBlueshield
+  start: start
+  graph:
+    - node: start
+      entity: ClothingOuterArmorBlueShield
+      edges:
+        - to: plate
+          steps:
+            - tag: UpgradeKitPlate
+              name: construction-graph-tag-pltvest
+              doAfter: 5
+        - to: stab
+          steps:
+            - tag: UpgradeKitStab
+              name: construction-graph-tag-stbvest
+              doAfter: 5
+        - to: heat
+          steps:
+            - tag: UpgradeKitHeat
+              name: construction-graph-tag-absrbvest
+              doAfter: 5
+        - to: webvest
+          steps:
+            - tag: UpgradeWebVest
+              name: construction-graph-tag-webvest
+              doAfter: 15
+    - node: webvest
+      entity: ClothingOuterVestWebBlue
+    - node: plate
+      entity: ClothingOuterArmorPlate
+      edges:
+        - to: bullet
+          steps:
+            - tag: UpgradeKitBullet
+              name: construction-graph-tag-blltvest
+              doAfter: 8
+    - node: bullet
+      entity: ClothingOuterArmorBulletproof
+      edges:
+        - to: bullet_heavy
+          steps:
+            - tag: UpgradeKitBulletHeavy
+              name: construction-graph-tag-hblltvest
+              doAfter: 12
+    - node: bullet_heavy
+      entity: ClothingOuterArmorBulletproofHeavy
+    - node: stab
+      entity: ClothingOuterArmorStab
+      edges:
+        - to: riot
+          steps:
+            - tag: UpgradeKitRiot
+              name: construction-graph-tag-riotvest
+              doAfter: 8
+    - node: riot
+      entity: ClothingOuterArmorRiot
+    - node: heat
+      entity: ClothingOuterArmorHeatAbsorb
+      edges:
+        - to: reflective
+          steps:
+            - tag: UpgradeKitReflective
+              name: construction-graph-tag-rflctvest
+              doAfter: 8
+    - node: reflective
+      entity: ClothingOuterArmorReflective

Resources/Prototypes/ore.yml

@@ -92,6 +92,20 @@
   id: OreUraniumCrab
   oreEntity: MobSpawnCrabUranium
 
+#Sunrise-Start
+- type: ore
+  id: OreSaltCrab
+  oreEntity: MobSpawnCrabSalt
+
+- type: ore
+  id: OrePlasmaCrab
+  oreEntity: MobSpawnCrabPlasma
+
+- type: ore
+  id: OreDiamondCrab
+  oreEntity: MobSpawnCrabDiamond
+#Sunrise-End
+
 - type: ore
   id: OreArtifactFragment
   oreEntity: ArtifactFragment1
@@ -121,3 +135,8 @@
     OreBananiumCrab: 1
     OreCoalCrab: 5
     OreGoldCrab: 2
+    #Sunrise-Start
+    OreSaltCrab: 5
+    OrePlasmaCrab: 2
+    OreDiamondCrab: 1
+    #Sunrise-End

Resources/ServerInfo/Guidebook/_Sunrise/ImprovisedGrenadeCasing.xml

@@ -1,4 +1,4 @@
-  # Самодельная граната: пустой корпус
+  # Самодельная граната: пустой корпус
 
   Пустая гильза — основа для самодельных гранат. Заполните её и выберите ветку в графе, чтобы получить один из вариантов.
 
@@ -6,9 +6,9 @@
     ### Для создания Трубчатой бомбы
       - Трубчатая бомба с контактным тригером и дополнительными осколочными частями.
       <GuideEntityEmbed Entity="PipeBomb" Caption="Трубчатая бомба" Scale="1"/><GuideEntityEmbed Entity="ImprovisedGrenadeCasingEmpty" Caption="пустая самодельная гильза" Scale="1"/>
-    ### Для создания Зажигательная бомбы
+    ### Для создания Зажигательной бомбы
       - Зажигательная бомба с контактным тригером и дополнительными зажигательными частями.
       <GuideEntityEmbed Entity="FireBomb" Caption="Зажигательная бомба" Scale="1"/><GuideEntityEmbed Entity="ImprovisedGrenadeCasingEmpty" Caption="пустая самодельная гильза" Scale="1"/>
     ### Для создания Стеклянной картечи
-      - Стеклянная картечь: много мелких поражений в месте попадании.
-      5 единиц <GuideEntityEmbed Entity="CrushedPhosphorus" Caption="5ед Фосфорного порошока" Scale="1.1"/><GuideEntityEmbed Entity="ShardGlass" Caption="5 осколоков стекла" Scale="1"/><GuideEntityEmbed Entity="ImprovisedGrenadeCasingEmpty" Caption="пустая самодельная гильза" Scale="1"/>
+      - Стеклянная картечь: много мелких поражений в месте попадания.
+      5 единиц <GuideEntityEmbed Entity="CrushedPhosphorus" Caption="5 ед. Фосфорного порошка" Scale="1.1"/><GuideEntityEmbed Entity="ShardGlass" Caption="5 осколков стекла" Scale="1"/><GuideEntityEmbed Entity="ImprovisedGrenadeCasingEmpty" Caption="пустая самодельная гильза" Scale="1"/>

Resources/Textures/_Sunrise/Clothing/OuterClothing/Vests/web_armor_blue.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and modified by KaiserMaus",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Sunrise/Effects/mobspawn.rsi/meta.json

@@ -0,0 +1,175 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by belay5 (discord), scrap bot sprite made by erhardsteinhauer (discord/github) using robot sprites taken from goonstation https://github.com/goonstation/goonstation/blob/master/icons/mob/robots.dmi Diamond crab sprite made by KaiserMaus (discord/github) ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "crab_bananium",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+
+        {
+            "name": "crab_coal",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+
+        {
+            "name": "crab_gold",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+
+        {
+            "name": "crab_plasma",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+
+        {
+            "name": "crab_salt",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+
+            "name": "golem",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+
+            "name": "scrapbot",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+
+            "name": "scrapbot_laser",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+
+            "name": "scrapbot_threads",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+
+            "name": "scrapbot_thrusters",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+
+        {
+            "name": "crab_diamond",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}

Resources/Textures/_Sunrise/Mobs/Elemental/orecrab.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by belay5 (discord 677967153139548202)",
+  "states": [
+    {
+      "name": "bananium_crab",
+      "directions": 4
+    },
+    {
+      "name": "coal_crab",
+      "directions": 4
+    },
+    {
+      "name": "gold_crab",
+      "directions": 4
+    },
+    {
+      "name": "plasma_crab",
+      "directions": 4
+    },
+    {
+      "name": "salt_crab",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json

@@ -30,6 +30,18 @@
         },
         {
             "name": "breaching"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
         }
     ]
 }