Merge branch 'master' into melon

2026-02-15 03:31:44 +01:00 · 2025-12-29 02:47:01 +03:00
parent 6743537d8b 7b3b4beee2
commit 1fccf045b0
163 changed files with 58586 additions and 780 deletions
--- a/Content.Shared/Storage/Components/MagnetPickupComponent.cs
+++ b/Content.Shared/Storage/Components/MagnetPickupComponent.cs
@@ -24,4 +24,9 @@ public sealed partial class MagnetPickupComponent : Component

    [ViewVariables(VVAccess.ReadWrite), DataField("range")]
    public float Range = 1f;
+	
+	/// Corvax-Wega-Start
+     [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool NeedForSlotFlag = true;
+	/// Corvax-Wega-End
 }
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -49,12 +49,16 @@ public sealed class MagnetPickupSystem : EntitySystem
            comp.NextScan += ScanDelay;
            Dirty(uid, comp);

-            if (!_inventory.TryGetContainingSlot((uid, xform, meta), out var slotDef))
-                continue;
-
-            if ((slotDef.SlotFlags & comp.SlotFlags) == 0x0)
-                continue;
+			// Corvax-Wega-Start
+			if (comp.NeedForSlotFlag)
+			{
+				if (!_inventory.TryGetContainingSlot((uid, xform, meta), out var slotDef))
+					continue;

+				if ((slotDef.SlotFlags & comp.SlotFlags) == 0x0)
+					continue;
+			}
+			// Corvax-Wega-End
            // No space
            if (!_storage.HasSpace((uid, storage)))
                continue;
--- a/Content.Shared/_Wega/Botany/SharedPlantAnalyzerSystem.cs
+++ b/Content.Shared/_Wega/Botany/SharedPlantAnalyzerSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Chemistry.Reagent;
@@ -17,14 +18,22 @@ public abstract partial class SharedPlantAnalyzerSystem : EntitySystem
        if (gases.Count == 0)
            return "";

-        List<int> gasIds = [];
-        foreach (var gas in gases)
-            gasIds.Add((int)gas);
-
        List<string> gasesLoc = [];
-        foreach (var gas in _prototypeManager.EnumeratePrototypes<GasPrototype>())
-            if (gasIds.Contains(int.Parse(gas.ID)))
-                gasesLoc.Add(Loc.GetString(gas.Name));
+        var gasPrototypes = _prototypeManager.EnumeratePrototypes<GasPrototype>().ToArray();
+        foreach (var gas in gases)
+        {
+            var gasProto = gasPrototypes.FirstOrDefault(g =>
+                g.ID.Equals(gas.ToString(), StringComparison.OrdinalIgnoreCase));
+
+            if (gasProto != null)
+            {
+                gasesLoc.Add(Loc.GetString(gasProto.Name));
+            }
+            else
+            {
+                gasesLoc.Add(Loc.GetString($"gases-{gas.ToString().ToLower()}"));
+            }
+        }

        return ContentLocalizationManager.FormatList(gasesLoc);
    }
--- a/Resources/Audio/_Wega/Weapons/Guns/Gunshots/attributions.yml
+++ b/Resources/Audio/_Wega/Weapons/Guns/Gunshots/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["plasma_cutter.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8175bd91e05d0324c1c3876bf0a18c033e020d52"
+  source: "https://github.com/tgstation"
--- a/Resources/Audio/_Wega/Weapons/Guns/Gunshots/plasma_cutter.ogg
+++ b/Resources/Audio/_Wega/Weapons/Guns/Gunshots/plasma_cutter.ogg
--- a/Resources/Locale/ru-RU/_wega/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/ru-RU/_wega/flavors/flavor-profiles.ftl
@@ -63,3 +63,4 @@ flavor-base-chaotic = как хаос
 flavor-base-money = как ваша зарплата
 flavor-base-shrimp = как креветка
 flavor-base-melon = как дыня
+flavor-base-tangerine = как мандарин
--- a/Resources/Locale/ru-RU/_wega/lathe/lathe-categories.ftl
+++ b/Resources/Locale/ru-RU/_wega/lathe/lathe-categories.ftl
@@ -0,0 +1,2 @@
+# Science
+lathe-category-android = Части андройда
--- a/Resources/Locale/ru-RU/_wega/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/ru-RU/_wega/reagents/meta/consumable/drink/drinks.ftl
@@ -14,6 +14,7 @@ reagent-name-milkshakebanana = банановый милкшейк
 reagent-name-milkshakeberry = ягодный милкшейк
 reagent-name-melonjuice = сок дыни
 reagent-name-catmelonjuice = сок кошкодыни
+reagent-name-juicetangerine = мандариновый сок

 reagent-desc-cafe-mocha = Изысканный кофейный напиток с шоколадом и молоком, идеальный для любителей сладкого.
 reagent-desc-chocolate-milk = Прохладное молоко с насыщенным шоколадным вкусом, любимый напиток детей и взрослых.
@@ -31,3 +32,4 @@ reagent-desc-milkshakebanana = Взбитый молочный коктейль,
 reagent-desc-milkshakeberry = Взбитый молочный коктейль, идеальный для освежения со вкусом ягод.
 reagent-desc-melonjuice = Свежевыжатый сок дыни.
 reagent-desc-catmelonjuice = Свежевыжатый сок кошкодыни. Вызывает симптомы патологического мяуканья.
+reagent-desc-juicetangerine = Свежевыжатый мандариновый сок, идеально скрасит ваши праздники!
--- a/Resources/Locale/ru-RU/_wega/seeds/seeds.ftl
+++ b/Resources/Locale/ru-RU/_wega/seeds/seeds.ftl
@@ -28,3 +28,7 @@ seeds-melon-name = дыня
 seeds-melon-display-name = дыня
 seeds-catmelon-name = кошкодыня
 seeds-catmelon-display-name = кошкодыня
+seeds-tangerine-name = мандарин
+seeds-tangerine-display-name = мандариновое дерево
+seeds-festivetangerine-name = подарин
+seeds-festivetangerine-display-name = подариновая ёлка
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/head/hats.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/head/hats.ftl
@@ -18,3 +18,13 @@ ent-ClothingHeadHatCapcapSheriff = фуражка шерифа
   .desc = Стильная фуражка шерифа.
 ent-ClothingHeadHatCatEarsMelon = кошкодынные ушки
   .desc = НЯ?!
+ent-ClothingHeadHatNewYearRed = красная новогодняя шапочка
+   .desc = Паздник к нам приходит, праздник к нам приходит!
+ent-ClothingHeadHatNewYearBlue = синяя новогодняя шапочка
+   .desc = { ent-ClothingHeadHatNewYearRed.desc }
+ent-ClothingHeadHatNewYearCyan = голубая новогодняя шапочка
+   .desc = { ent-ClothingHeadHatNewYearRed.desc }
+ent-ClothingHeadHatNewYearWega = фуксиновая новогодняя шапочка
+   .desc = { ent-ClothingHeadHatNewYearRed.desc }
+ent-ClothingHeadHatNewYearCentComm = новогодняя шапочка Центком
+   .desc = { ent-ClothingHeadHatNewYearRed.desc }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/markers/spawners/random/misc.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/markers/spawners/random/misc.ftl
@@ -0,0 +1,4 @@
+ent-RareBorgModuleSpawner = спавнер редких модулей
+    .desc = { ent-MarkerBase.desc }
+ent-RandomXenoSlimeExtract = спавнер слаймовых экстрактов
+    .desc = { ent-MarkerBase.desc }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/consumable/food/produce.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/consumable/food/produce.ftl
@@ -39,4 +39,33 @@ ent-FoodMelonSlice = кусочек дыни
 ent-FoodCatMelon = кошкодыня
    .desc = ЧТО?! Дыня с кошачьими ушками?! КАК ЭТО МИЛО!
 ent-FoodCatMelonSlice = кусочек кошкодыни
-    .desc = Малеькний кусочек милоты :3
+    .desc = Маленький кусочек милоты :3
+ent-FoodProduceLollipop = завёрнутая конфетка
+    .desc = "Открой и получи самые вкусные на свете леденцы!"
+ent-FoodProduceLollipopRandom = завёрнутая конфетка
+    .desc = "Открой и получи самые вкусные на свете леденцы и не только!"
+    .suffix = Случайный вещества
+ent-FoodProduceLollipopMedical = завёрнутая конфетка
+    .desc = "Открой и получи самые вкусные на свете леденцы и не только!"
+    .suffix = Мед
+ent-FoodProduceLollipopMedRandom = завёрнутая конфетка
+    .desc = "Открой и получи самые вкусные на свете леденцы и не только!"
+    .suffix = Из коробки
+ent-FoodProduceLollipopBar = леденец
+    .desc = "Так и хочется его пососать!"
+ent-FoodProduceLollipopRandomBar = леденец
+    .desc = "Так и хочется его пососать!"
+    .suffix = Случайный вещества
+ent-FoodProduceLollipopMedicalBar = леденец
+    .desc = "Так и хочется его пососать!"
+    .suffix = Мед
+ent-FoodProduceTangerine = мандарин
+    .desc = "Небольшой фрукт, овальной формы и ярко-оранжевого цвета.Покрыт тонкой, легко очищающейся кожурой."
+ent-FoodProduceTangerineOpen = очищенный мандарин
+    .desc = "Очищенный мандарин разделён на дольки, каждая из которых наполнена сочной, сладкой и ароматной мякотью."
+ent-FoodProduceTangerineTrash = мандариновая кожурка
+    .desc = "Мусорная часть мандарина. Имеет яркий запах цитруса."
+ent-FoodProduceFestiveTangerine = подарин
+    .desc = "Небольшой фрукт в форме новогоднего подарка."
+ent-FoodProduceFestiveTangerineTrash = упаковка подарина
+    .desc = "Пластиковая упаковка подарина. Упаковать обратно не выйдет."
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/hydroponics/seeds.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/hydroponics/seeds.ftl
@@ -27,4 +27,7 @@ ent-CandyTreeRandomSeeds = пакет семян (необычное конфе
 ent-MelonSeeds = пакет семян (дыня)
    .desc = { ent-SeedBase.desc }
 ent-CatMelonSeeds = пакет семян (кошкодыня)
+ent-TangerineSeeds = пакет семян (мандарин)
+    .desc = { ent-SeedBase.desc }
+ent-FestiveTangerineSeeds = пакет семян (подарин)
    .desc = { ent-SeedBase.desc }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl
@@ -22,10 +22,34 @@ ent-BorgModuleDisabler = охранный модуль киборга
    .desc = Модуль для охраны объектов НТ, этот модуль не обладает каким либо вооружением.
 ent-BorgModuleDetective = детективный модуль киборга
    .desc = Модуль для расследований криминальных дел, теперь детектив точно может спиться.
-ent-BorgModuleSecLethal = летальный модуль киборга
+ent-BorgModuleSecRare = летальный модуль киборга
    .desc = Модуль для борьбы с фауной ( или клоуном ).
+    .suffix = Редкое
 ent-BorgModuleSheild = защитный модуль киборга
    .desc = Модуль для поглащения урона, имеет режим ресиверов, позволяя получать ещё меньше урона засчет лишения функций передвижения.
+ent-BorgModuleCommonSpeed = ускоряющий модуль киборга
+    .desc = Модуль для ускорения киборга на время, пицца будет доставлена вовремя!
+ent-BorgModuleCommonMagBoots = магнитный модуль киборга
+    .desc = Модуль для примагничивания к земле, в случае отсуствия гравитации.
+ent-BorgModuleCommonCandy = конфетный модуль киборга
+    .desc = Модуль для генерации вкусных конфеток.
+ent-BorgModuleCommonRepeir = модуль саморемонта киборга
+    .desc = Модуль для восстановления корпуса при помощи наноботов, теперь можно выжить и без лююдей.
+ent-BorgModuleCargoRare = модуль плазменого резака киборга
+    .desc = Модуль для добычи руды через забытые технологии плазменных резаков и повышенную перевозку руды.
+    .suffix = Редкое
+ent-BorgModuleCleanerRare = гидра модуль киборга
+    .desc = Модуль со встроенной гранатометной системой "Гидра" и большим складом ламп. Время вычистить всю эту грязь!
+    .suffix = Редкое
+ent-BorgModuleEngenerRare = модуль боевого РСУ киборга
+    .desc = Модуль со встроенным боевым РСУ и генератором ресурсов. Строй, твори, созидай!
+    .suffix = Редкое
+ent-BorgModuleServiceRare = продуктовый модуль киборга
+    .desc = Модуль для производства и приготовления продуктов для людей и мясоедов, также способен генерировать напитки.
+    .suffix = Редкое
+ent-BorgModuleMedicalRare = модуль генерации реагентов киборга
+    .desc = Модуль для генерации основных лекарств для лечения пациентов. Переносная аптечка теперь может оскоблять экипаж!
+    .suffix = Редкое
 ent-BorgModuleGranader = гренадерский модуль киборга
    .desc = Модуль для использования гранат, покажи всем мощь CHINA Lake!
 ent-WeaponProtoKineticAcceleratorBorg = протокинетический ускоритель
@@ -33,13 +57,13 @@ ent-WeaponProtoKineticAcceleratorBorg = протокинетический ус
 ent-WeaponMeleeNeedleBorg = стальная палка
    .desc = Заостренная палка, которая раньше лопала шарики, а теперь будет и лопать головы недругов.
 ent-PickaxeBorg =  кирка
-    .desc =  { ent-Pickaxe.desc }
+    .desc = { ent-Pickaxe.desc }
 ent-StunprodBorg = дубинка-шокер
    .desc = { ent-Stunbaton.desc }
 ent-HoloprojectorSecurityMicrowave = { ent-HoloprojectorSecurity }
    .suffix = Микрореакторная
    .desc = { ent-HoloprojectorSecurity.desc }
-ent-DetectivePDABorg =  кпк для расследований
+ent-DetectivePDABorg =  КПК для расследований
    .desc = Пахнет дождём... и маслом....
 ent-WeaponBorgDisabler = режим "Станнер"
    .desc = Режим стрельбы ствола настроенный на поражение выносливости противника.
@@ -55,6 +79,68 @@ ent-RiotLaserShieldBorg = встроенная броня от тепловых
    .desc = Наномашины, сынок...
 ent-RiotBulletShieldBorg = встроенная броня от пуль
    .desc = Наномашины, сынок...
+ent-SpeedModeDevice = устройство ускорения
+    .desc = Устройство, которое позволяет ускорить модель киборга на 25 секунд.
+ent-MagbootsModeDevice = устройство примагничивания
+    .desc = Устройство для передвижения киборга в среде без гравитации.
+ent-RepeirModeDevice = устройство самовосстановления
+    .desc = Устройство для поддержки корпуса в целом состоянии.
+ent-MicrowaveForBorg = встроенная микроволновка
+    .desc = Это магия.
+ent-WeaponHandGranadeGun = режим "Гранатомет"
+    .desc = Режим стрельбы ствола настроенный на выпуск гранат на более далекое расстояние.
+ent-BorgGeneratorPocket = генератор покетов
+    .desc = Генератор материи, настроенный на генерацию различных покетов.
+ent-BorgGeneratorDrink = генератор напитков
+    .desc = Генератор материи, настроенный на генерацию различных напитков.
+ent-BorgGeneratorMeat = генератор мяса
+    .desc = Генератор материи, настроенный на генерацию различных кусочков мяса.
+ent-BoxFreezer = коробка-холодильник
+    .desc = Переносной холодильник, который позволяет таскать с собой сырое мясо.
+ent-LightReplacerBorg = { ent-LightReplacer }
+    .desc = { ent-LightReplacer.desc }
+    .suffix = Киборг
+ent-WeaponHydraBorg = встроенный гранатомет "Гидра"
+    .desc = Очистительная система "Гидра", теперь вместе с зарядами самовосстановления.
+ent-RCDCombatRecharging = экспериментальное боевое РСУ
+    .desc = Ручное строительное устройство боевого аналога, установленное в киборга, которое на лету производит сжатую материю, используя внутренний фабрикатор.
+    .suffix = Автозарядка
+ent-BorgGeneratorMaterialRod = генератор стержней
+    .desc = Генератор материи, настроенный на генерацию стержней.
+ent-BorgGeneratorTile = генератор плиток
+    .desc = Генератор материи, настроенный на генерацию плиток.
+ent-BorgGeneratorMaterialSteal = генератор пачек стали
+    .desc = Генератор материи, настроенный на генерацию пачек стали.
+ent-BorgGeneratorMaterialPlasteel = генератор пачек пластали
+    .desc = Генератор материи, настроенный на генерацию пачек пластали.
+ent-BorgHypoTricordrazine = борг-гипоспрей трикордразина
+    .desc = Стерильный инъектор для быстрого введения и генерации трикордразина пациентам. Удешевлённый и более специализированный вариант для медицинских боргов.
+    .suffix = Трикордразин
+ent-BorgHypoBicaridine = борг-гипоспрей бикаридина
+    .desc = Стерильный инъектор для быстрого введения и генерации бикаридина пациентам. Удешевлённый и более специализированный вариант для медицинских боргов.
+    .suffix = Бикаридин
+ent-BorgHypoDermaline = борг-гипоспрей дермалина
+    .desc = Стерильный инъектор для быстрого введения и генерации дермалина пациентам. Удешевлённый и более специализированный вариант для медицинских боргов.
+    .suffix = Дермалин
+ent-BorgHypoDylovene = борг-гипоспрей диловаена
+    .desc = Стерильный инъектор для быстрого введения и генерации диловена пациентам. Удешевлённый и более специализированный вариант для медицинских боргов.
+    .suffix = Диловен
+ent-BorgHypoHyronalin = борг-гипоспрей хироналина
+    .desc = Стерильный инъектор для быстрого введения и генерации хироналина пациентам. Удешевлённый и более специализированный вариант для медицинских боргов.
+    .suffix = Хироналин
+ent-BorgHypoDexalin = борг-гипоспрей дексалина
+    .desc = Стерильный инъектор для быстрого введения и генерации дексалина пациентам. Удешевлённый и более специализированный вариант для медицинских боргов.
+    .suffix = Дексалин
+ent-BorgGeneratorCommonCandy = генератор конфет
+    .desc = Успокойте членов экипажа вкусной ( или нет ) конфеткой! Убедите их, что Вы знакомый дядя для них!
+    .suffix = 10% мед веществ
+ent-BorgGeneratorProCandy = генератор конфет
+    .desc = Успокойте членов экипажа вкусной ( или нет ) конфеткой! Убедите их, что Вы знакомый дядя для них!
+    .suffix = 50% мед веществ
+ent-BorgIconRollerBed = Заглушка
+    .desc = Заглушка
+ent-BorgIconMorgBag = Заглушка
+    .desc = Заглушка
 borg-slot-biomaterials-empty = Биоматериалы
 borg-slot-implants-empty = Имплантаты
 borg-slot-PKA-empty = Модули улучшения ПКА
@@ -74,4 +160,6 @@ borg-slot-hand-empty = Рука
 borg-slot-zipties-empty = Наручники
 borg-slot-forensic-pad-empty = Пластинки и номерки
 borg-slot-granade-empty = Гранаты и снаряды
-borg-slot-cabeldet-empty = Детонационный шнур
+borg-slot-cabeldet-empty = Детонационный шнур
+borg-slot-candy-empty = Конфеты
+borg-slot-sextoy-empty = Сексуальные игрушки
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/salvageore/trogeibag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/salvageore/trogeibag.ftl
@@ -1,2 +1,4 @@
 ent-TrofeiBag = сумка для трофеев
-    .desc = Сумка для пояса, в которой можно хранить как и хлам, так и трофеи с поверженных врагов.
+    .desc = Сумка для пояса, в которой можно хранить как и хлам, так и трофеи с поверженных врагов.
+ent-BorgOreBagOfHolding = встроенная бездонная сумка для руды
+    .desc = Большая сумка для руды, встроенная прямо в каркас шахтёрского киборга, имеет переключаемую функцию магнита.
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/plasma_cutter.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/plasma_cutter.ftl
@@ -0,0 +1,5 @@
+ent-WeaponPlasmaCutter = плазменный резак
+    .desc = Энергетическое оружие, способное стрелять плазменными снарядами, что рассекают любой камень, а иногда и стену.
+ent-WeaponPlasmaCutterEmpty = плазменный резак
+    .desc = Энергетическое оружие, способное стрелять плазменными снарядами, что рассекают любой камень, а иногда и стену.
+    .suffix = Пустой
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/projectiles.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/projectiles.ftl
@@ -3,4 +3,6 @@ ent-BulletLaserAdvanced = лазерный выстрел
 ent-RedMediumLaser = лазерный выстрел
    .desc = { ent-BaseBullet.desc }
 ent-LaserStun = оглушающий лазер
+    .desc = { ent-BaseBullet.desc }
+ent-BulletPlasmaCutter = плазменный выстрел
    .desc = { ent-BaseBullet.desc }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/salvage/ore_bag.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/salvage/ore_bag.ftl
@@ -1,4 +1,4 @@
 ent-OreBag = сумка для руды
    .desc = Прочная сумка для специалистов по утилизации и шахтёров для переноски больших объёмов руды. Примагничивает близлежащую руду, если закрепить на поясе.
 ent-BorgOreBag = встроенная сумка для руды
-    .desc = Большая сумка для руды, встроенная прямо в каркас шахтёрского киборга.
+    .desc = Большая сумка для руды, встроенная прямо в каркас шахтёрского киборга, имеет переключаемую функцию магнита.
--- a/Resources/Maps/Dungeon/experiment.yml
+++ b/Resources/Maps/Dungeon/experiment.yml
@@ -9915,11 +9915,6 @@ entities:
    - type: Transform
      pos: 17.514208,15.501376
      parent: 1653
-  - uid: 1562
-    components:
-    - type: Transform
-      pos: 24.538218,15.750836
-      parent: 1653
 - proto: VehicleJanicartDestroyed
  entities:
  - uid: 729
--- a/Resources/Maps/Dungeon/mineshaft.yml
+++ b/Resources/Maps/Dungeon/mineshaft.yml
@@ -542,13 +542,6 @@ entities:
    - type: Transform
      pos: 43.64335,20.440603
      parent: 2
- proto: BorgModuleRCD
-  entities:
-  - uid: 801
-    components:
-    - type: Transform
-      pos: 43.352802,21.426386
-      parent: 2
 - proto: Bucket
  entities:
  - uid: 550
--- a/Resources/Maps/_Wega/Dungeon/experiment.yml
+++ b/Resources/Maps/_Wega/Dungeon/experiment.yml
--- a/Resources/Maps/_Wega/Dungeon/haunted.yml
+++ b/Resources/Maps/_Wega/Dungeon/haunted.yml
--- a/Resources/Maps/_Wega/Dungeon/lava_brig.yml
+++ b/Resources/Maps/_Wega/Dungeon/lava_brig.yml
--- a/Resources/Maps/_Wega/Dungeon/maints.yml
+++ b/Resources/Maps/_Wega/Dungeon/maints.yml
--- a/Resources/Maps/_Wega/Dungeon/mineshaft.yml
+++ b/Resources/Maps/_Wega/Dungeon/mineshaft.yml
--- a/Resources/Maps/_Wega/Dungeon/snowy_labs.yml
+++ b/Resources/Maps/_Wega/Dungeon/snowy_labs.yml
--- a/Resources/Maps/_Wega/Dungeon/template.yml
+++ b/Resources/Maps/_Wega/Dungeon/template.yml
@@ -0,0 +1,79 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  82: FloorShuttleOrange
+  89: FloorSteel
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+    - type: Broadphase
+    - type: OccluderTree
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: WQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: UgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,2:
+          ind: -1,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: UgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: LoadedMap
+    - type: SpreaderGrid
+    - type: GridTree
+    - type: GridPathfinding
+...
--- a/Resources/Maps/_Wega/Dungeon/vgroidinterior.yml
+++ b/Resources/Maps/_Wega/Dungeon/vgroidinterior.yml
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -60,9 +60,14 @@
  components:
  - type: EntityTableContainerFill
    containers:
-      entity_storage:
-        id: WeaponLaserCarbine
-        amount: 3
+ # Corvax-Wega-start
+      entity_storage: !type:AllSelector
+        children:
+        - id: WeaponLaserCarbine
+          amount: 3
+        - id: PortableRecharger
+          amount: 3
+ # Corvax-Wega-end

 - type: entity
  parent: [ CrateWeaponSecure, BaseSecurityContraband ]
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -99,6 +99,9 @@
        - id: LemonSeeds
        - id: LimeSeeds
        - id: OrangeSeeds
+        # Corvax-Wega-start
+        - id: TangerineSeeds
+        # Corvax-Wega-end
        - id: OatSeeds
        - id: OnionSeeds
        - id: OnionRedSeeds
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -359,3 +359,7 @@
    children:
    - id: WeaponLaserCarbine
      amount: 3
+# Corvax-Wega-start
+    - id: PortableRecharger
+      amount: 3
+# Corvax-Wega-end
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -35,6 +35,7 @@
  id: NanoMedPlusInventory
  startingInventory:
    HandheldHealthAnalyzer: 3
+    FoodBoxLollipop: 1 # Corvax-Wega
    Gauze: 5
    Brutepack: 5
    Ointment: 5
@@ -62,6 +63,7 @@
  id: NanoMedCivilianInventory
  startingInventory:
    HandheldHealthAnalyzer: 3
+    FoodBoxLollipop: 1 # Corvax-Wega
    AloeCream: 3
    Gauze: 5
    Brutepack: 5
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -26,6 +26,9 @@
    OnionSeeds: 5
    OnionRedSeeds: 5
    OrangeSeeds: 5
+    # Corvax-Wega-start
+    TangerineSeeds: 5
+    # Corvax-Wega-end
    PeaSeeds: 5
    PoppySeeds: 3
    PotatoSeeds: 5
--- a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
@@ -17,6 +17,7 @@
        - Pill
      tags:
        - FoodSnack
+        - Lollipops # Corvax-Wega-Add
  - type: ContainerContainer
    containers:
      bin-container: !type:Container
@@ -70,3 +71,4 @@
          - Pill
          tags:
          - FoodSnack
+          - Lollipops # Corvax-Wega-Add
--- a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml
@@ -5,7 +5,7 @@
  description: High-tech recharger adapted for portability.
  components:
  - type: Item
-    size: Huge
+    size: Ginormous
  - type: Sprite
    sprite: Objects/Power/portable_recharger.rsi
    layers:
@@ -18,7 +18,7 @@
    equippedPrefix: charging
    quickEquip: false
    slots:
-    - back
+    - suitStorage
  - type: Charger
    slotId: charger_slot
    portable: true
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -634,6 +634,7 @@
        whitelist:
          tags:
          - Ore
+          - ArtifactFragment
    # Corvax-Wega-Robot-end
    - item: BorgOreBag
  - type: BorgModuleIcon
@@ -661,8 +662,9 @@
        whitelist:
          tags:
          - Ore
+          - ArtifactFragment
    # Corvax-Wega-Robot-end
-    - item: OreBagOfHolding
+    - item: BorgOreBagOfHolding # BorgOreBagOfHolding Corvax-Wega-Robot-add
  - type: BorgModuleIcon
    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-mining-module }

@@ -946,6 +948,15 @@
        whitelist:
          components:
          - Healing
+    # Corvax-Wega-Robot-Start
+    - item: BorgGeneratorProCandy
+    - hand:
+        emptyRepresentative: FoodProduceLollipopMedical
+        emptyLabel: borg-slot-candy-empty
+        whitelist:
+          tags:
+          - Lollipops
+    # Corvax-Wega-Robot-End
  - type: BorgModuleIcon
    icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }

@@ -969,13 +980,13 @@
    # Corvax-Wega-Robot-Start
    - hand:
        emptyLabel: borg-slot-table-empty
-        emptyRepresentative: CheapRollerBedSpawnFolded
+        emptyRepresentative: BorgIconRollerBed
        whitelist:
          components:
          - OperatingTable
    - hand:
        emptyLabel: borg-slot-bodybag-empty
-        emptyRepresentative: BodyBagFolded
+        emptyRepresentative: BorgIconMorgBag
        whitelist:
          tags:
          - BodyBag
@@ -1146,18 +1157,7 @@
  - type: ItemBorgModule
    hands:
    - item: Pen
-    - item: BooksBag
-    - hand:
-        emptyLabel: borg-slot-documents-empty
-        emptyRepresentative: BookBase
-        whitelist:
-          tags:
-          - Book
-          - Dice
-          - Document
-          - Figurine
-          - TabletopBoard
-          - Write
+    # Corvax-Wega-Robot-start
    - hand:
        emptyLabel: borg-slot-documents-empty
        emptyRepresentative: Paper
@@ -1169,6 +1169,32 @@
          - Figurine
          - TabletopBoard
          - Write
+    - item: BooksBag
+    # - hand:
+        # emptyLabel: borg-slot-documents-empty
+        # emptyRepresentative: BookBase
+        # whitelist:
+          # tags:
+          # - Book
+          # - Dice
+          # - Document
+          # - Figurine
+          # - TabletopBoard
+          # - Write
+    # Corvax-Wega-Robot-end
+    # Corvax-Wega-Robot-start
+    # - hand:
+        # emptyLabel: borg-slot-documents-empty
+        # emptyRepresentative: Paper
+        # whitelist:
+          # tags:
+          # - Book
+          # - Dice
+          # - Document
+          # - Figurine
+          # - TabletopBoard
+          # - Write
+    # Corvax-Wega-Robot-end
    - item: HandLabeler
    - item: RubberStampApproved
    - item: RubberStampDenied
--- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -27,12 +27,50 @@
        - Ore
  - type: Dumpable

+## Corvax-Wega-Start
 - type: entity
-  parent: OreBag
+  parent: BaseStorageItem
  id: BorgOreBag
  name: integrated ore bag
  description: A large ore bag built into the frame of a mining cyborg.
  components:
+    - type: ItemToggle
+    - type: ComponentToggler
+      components:
+      - type: MagnetPickup
+        needForSlotFlag: false
    - type: Storage
+      maxItemSize: Normal
      grid:
      - 0,0,9,5
+      quickInsert: true
+      areaInsert: true
+      whitelist:
+        tags:
+          - ArtifactFragment
+          - Ore
+    - type: Sprite
+      sprite: Objects/Specific/Mining/ore_bag.rsi
+    # Corvax-Wega-Start
+    # state: icon
+      layers:
+      - state: orebag_off
+        map: [ "enum.ToggleableVisuals.Layer" ]
+    # Corvax-Wega-End
+    - type: Clothing
+      sprite: Objects/Specific/Mining/ore_bag.rsi
+      quickEquip: false
+      slots:
+      - belt
+    - type: Item
+      size: Ginormous
+  # Corvax-Wega-Start
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.ToggleableVisuals.Enabled:
+          enum.ToggleableVisuals.Layer:
+            True: { state: orebag_on }
+            False: { state: orebag_off }
+  # Corvax-Wega-End
+    - type: Dumpable
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -163,6 +163,8 @@
    sprite: Structures/Power/recharger.rsi
  - type: Machine
    board: WeaponCapacitorRechargerCircuitboard
+  - type: Charger  # Corvax-Wega-add
+    chargeRate: 50 # Corvax-Wega-add
  - type: ItemSlots
    slots:
      charger_slot:
@@ -171,7 +173,7 @@
          components:
          - BatteryAmmoProvider
          - Stunbaton
-          - PowerCell
+          # - PowerCell Corvax-Wega-add
        blacklist:
          tags:
          - PotatoBattery
@@ -216,7 +218,7 @@
      state: "light-off"
      shader: "unshaded"
  - type: Charger
-    chargeRate: 25
+    chargeRate: 55 # Corvax-Wega-add
  - type: ItemSlots
    slots:
      charger_slot:
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -117,6 +117,8 @@
  - type: Occluder
  - type: StaticPrice
    price: 70
+  - type: SoundInsulator # Corvax-Wega-SoundInsolation
+    insulationFactor: 1 # Corvax-Wega-SoundInsolation

 - type: entity
  id: WindowRCDResistant
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -74,7 +74,10 @@
  - BrasletSearch
  - BrasletBite
  - BrasletSex
-  - BrasletRape
+  - HatNewYearRed
+  - HatNewYearBlue
+  - HatNewYearCyan
+  - HatNewYearWega
  # Corvax-Wega-end
  - TowelColorWhite
  - TowelColorGray
@@ -342,8 +345,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -549,8 +552,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -710,8 +713,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -851,8 +854,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -1040,8 +1043,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -1199,8 +1202,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -1355,8 +1358,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -1511,8 +1514,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -1693,8 +1696,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -1857,8 +1860,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -2110,8 +2113,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -2395,8 +2398,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -2538,8 +2541,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -2724,8 +2727,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -3007,8 +3010,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -3206,8 +3209,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -3956,8 +3959,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -4086,8 +4089,8 @@
  - JumpsuitCasualRed
  - JumpskirtCasualRed
  - JumpsuitCasualGreen
-  - JumpskirtCasualGreen 
-  - JumpskirtTurtleneckAquamarine   
+  - JumpskirtCasualGreen
+  - JumpskirtTurtleneckAquamarine
  - JumpsuitTurtleneckAquamarine
  - JumpskirtTurtleneckWhite
  - JumpsuitTurtleneckWhite
@@ -4213,4 +4216,4 @@
  maxLimit: 1
  hidden: true
  loadouts:
-  - LoadoutSpeciesBreathToolSecurity
+  - LoadoutSpeciesBreathToolSecurity
--- a/Resources/Prototypes/Procedural/Themes/experiment.yml
+++ b/Resources/Prototypes/Procedural/Themes/experiment.yml
@@ -4,7 +4,7 @@
 - type: dungeonRoom
  id: Science17x5a
  size: 17,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,0
  tags:
    - SalvageExperiment
@@ -12,7 +12,7 @@
 - type: dungeonRoom
  id: Science17x5b
  size: 17,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 18,0
  tags:
    - SalvageExperiment
@@ -20,7 +20,7 @@
 - type: dungeonRoom
  id: Science17x5c
  size: 17,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 36,0
  tags:
    - SalvageExperiment
@@ -29,7 +29,7 @@
 - type: dungeonRoom
  id: Science7x7a
  size: 7,7
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,42
  tags:
    - SalvageExperiment
@@ -37,7 +37,7 @@
 - type: dungeonRoom
  id: Science7x7b
  size: 7,7
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 8,42
  tags:
    - SalvageExperiment
@@ -45,7 +45,7 @@
 - type: dungeonRoom
  id: Science7x7c
  size: 7,7
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 16,42
  tags:
    - SalvageExperiment
@@ -55,7 +55,7 @@
 - type: dungeonRoom
  id: Science11x5a
  size: 11,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,6
  tags:
    - SalvageExperiment
@@ -63,7 +63,7 @@
 - type: dungeonRoom
  id: Science11x5b
  size: 11,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 12,6
  tags:
    - SalvageExperiment
@@ -71,7 +71,7 @@
 - type: dungeonRoom
  id: Science11x5c
  size: 11,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 24,6
  tags:
    - SalvageExperiment
@@ -80,7 +80,7 @@
 - type: dungeonRoom
  id: Science7x5a
  size: 7,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,12
  tags:
    - SalvageExperiment
@@ -88,7 +88,7 @@
 - type: dungeonRoom
  id: Science7x5b
  size: 7,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 8,12
  tags:
    - SalvageExperiment
@@ -96,7 +96,7 @@
 - type: dungeonRoom
  id: Science7x5c
  size: 7,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 16,12
  tags:
    - SalvageExperiment
@@ -104,7 +104,7 @@
 - type: dungeonRoom
  id: Science7x5d
  size: 7,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 24,12
  tags:
    - SalvageExperiment
@@ -112,7 +112,7 @@
 - type: dungeonRoom
  id: Science7x5e
  size: 7,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 32,12
  tags:
    - SalvageExperiment
@@ -120,7 +120,7 @@
 - type: dungeonRoom
  id: Science7x5f
  size: 7,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 40,12
  tags:
    - SalvageExperiment
@@ -129,7 +129,7 @@
 - type: dungeonRoom
  id: Science13x3a
  size: 13,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,30
  tags:
    - SalvageExperiment
@@ -137,7 +137,7 @@
 - type: dungeonRoom
  id: Science13x3b
  size: 13,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 14,30
  tags:
    - SalvageExperiment
@@ -145,7 +145,7 @@
 - type: dungeonRoom
  id: Science13x3c
  size: 13,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 28,30
  tags:
    - SalvageExperiment
@@ -154,7 +154,7 @@
 - type: dungeonRoom
  id: Science11x3a
  size: 11,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,34
  tags:
    - SalvageExperiment
@@ -162,7 +162,7 @@
 - type: dungeonRoom
  id: Science11x3b
  size: 11,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 12,34
  tags:
    - SalvageExperiment
@@ -170,7 +170,7 @@
 - type: dungeonRoom
  id: Science11x3c
  size: 11,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 24,34
  tags:
    - SalvageExperiment
@@ -179,7 +179,7 @@
 - type: dungeonRoom
  id: Science7x3a
  size: 7,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,38
  tags:
    - SalvageExperiment
@@ -187,7 +187,7 @@
 - type: dungeonRoom
  id: Science7x3b
  size: 7,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 8,38
  tags:
    - SalvageExperiment
@@ -195,7 +195,7 @@
 - type: dungeonRoom
  id: Science7x3c
  size: 7,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 16,38
  tags:
    - SalvageExperiment
@@ -203,7 +203,7 @@
 - type: dungeonRoom
  id: Science7x3d
  size: 7,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 24,38
  tags:
    - SalvageExperiment
@@ -211,7 +211,7 @@
 - type: dungeonRoom
  id: Science7x3e
  size: 7,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 32,38
  tags:
    - SalvageExperiment
@@ -219,7 +219,7 @@
 - type: dungeonRoom
  id: Science7x3f
  size: 7,3
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 40,38
  tags:
    - SalvageExperiment
@@ -229,7 +229,7 @@
 - type: dungeonRoom
  id: Science5x5a
  size: 5,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,18
  tags:
    - SalvageExperiment
@@ -237,7 +237,7 @@
 - type: dungeonRoom
  id: Science5x5b
  size: 5,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 6,18
  tags:
    - SalvageExperiment
@@ -245,7 +245,7 @@
 - type: dungeonRoom
  id: Science5x5c
  size: 5,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 12,18
  tags:
    - SalvageExperiment
@@ -253,7 +253,7 @@
 - type: dungeonRoom
  id: Science5x5d
  size: 5,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 18,18
  tags:
    - SalvageExperiment
@@ -261,7 +261,7 @@
 - type: dungeonRoom
  id: Science5x5e
  size: 5,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 24,18
  tags:
    - SalvageExperiment
@@ -269,7 +269,7 @@
 - type: dungeonRoom
  id: Science5x5f
  size: 5,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 30,18
  tags:
    - SalvageExperiment
@@ -278,7 +278,7 @@
 - type: dungeonRoom
  id: Science3x5a
  size: 3,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 0,24
  tags:
    - SalvageExperiment
@@ -286,7 +286,7 @@
 - type: dungeonRoom
  id: Science3x5b
  size: 3,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 4,24
  tags:
    - SalvageExperiment
@@ -294,7 +294,7 @@
 - type: dungeonRoom
  id: Science3x5c
  size: 3,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 8,24
  tags:
    - SalvageExperiment
@@ -302,7 +302,7 @@
 - type: dungeonRoom
  id: Science3x5d
  size: 3,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 12,24
  tags:
    - SalvageExperiment
@@ -310,7 +310,7 @@
 - type: dungeonRoom
  id: Science3x5e
  size: 3,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 16,24
  tags:
    - SalvageExperiment
@@ -318,7 +318,7 @@
 - type: dungeonRoom
  id: Science3x5f
  size: 3,5
-  atlas: /Maps/Dungeon/experiment.yml
+  atlas: /Maps/_Wega/Dungeon/experiment.yml # Corvax-Wega
  offset: 20,24
  tags:
    - SalvageExperiment
--- a/Resources/Prototypes/Procedural/Themes/haunted.yml
+++ b/Resources/Prototypes/Procedural/Themes/haunted.yml
@@ -4,7 +4,7 @@
 - type: dungeonRoom
  id: Haunted17x5a
  size: 17,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,0
  tags:
    - Haunted
@@ -12,7 +12,7 @@
 - type: dungeonRoom
  id: Haunted17x5b
  size: 17,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 18,0
  tags:
    - Haunted
@@ -21,7 +21,7 @@
 - type: dungeonRoom
  id: Haunted7x7a
  size: 7,7
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,42
  tags:
    - Haunted
@@ -29,7 +29,7 @@
 - type: dungeonRoom
  id: Haunted7x7b
  size: 7,7
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 8,42
  tags:
    - Haunted
@@ -37,7 +37,7 @@
 - type: dungeonRoom
  id: Haunted7x7c
  size: 7,7
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 16,42
  tags:
    - Haunted
@@ -45,7 +45,7 @@
 - type: dungeonRoom
  id: Haunted7x7d
  size: 7,7
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,42
  tags:
    - Haunted
@@ -55,7 +55,7 @@
 - type: dungeonRoom
  id: Haunted11x5a
  size: 11,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,6
  tags:
    - Haunted
@@ -63,7 +63,7 @@
 - type: dungeonRoom
  id: Haunted11x5b
  size: 11,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 12,6
  tags:
    - Haunted
@@ -71,7 +71,7 @@
 - type: dungeonRoom
  id: Haunted11x5c
  size: 11,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,6
  tags:
    - Haunted
@@ -80,7 +80,7 @@
 - type: dungeonRoom
  id: Haunted7x5a
  size: 7,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,12
  tags:
    - Haunted
@@ -88,7 +88,7 @@
 - type: dungeonRoom
  id: Haunted7x5b
  size: 7,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 8,12
  tags:
    - Haunted
@@ -96,7 +96,7 @@
 - type: dungeonRoom
  id: Haunted7x5c
  size: 7,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 16,12
  tags:
    - Haunted
@@ -104,7 +104,7 @@
 - type: dungeonRoom
  id: Haunted7x5d
  size: 7,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,12
  tags:
    - Haunted
@@ -113,7 +113,7 @@
 - type: dungeonRoom
  id: Haunted13x3a
  size: 13,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,30
  tags:
    - Haunted
@@ -121,7 +121,7 @@
 - type: dungeonRoom
  id: Haunted13x3b
  size: 13,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 14,30
  tags:
    - Haunted
@@ -130,7 +130,7 @@
 - type: dungeonRoom
  id: Haunted11x3a
  size: 11,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,34
  tags:
    - Haunted
@@ -138,7 +138,7 @@
 - type: dungeonRoom
  id: Haunted11x3b
  size: 11,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 12,34
  tags:
    - Haunted
@@ -146,7 +146,7 @@
 - type: dungeonRoom
  id: Haunted11x3c
  size: 11,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,34
  tags:
    - Haunted
@@ -155,7 +155,7 @@
 - type: dungeonRoom
  id: Haunted7x3a
  size: 7,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,38
  tags:
    - Haunted
@@ -163,7 +163,7 @@
 - type: dungeonRoom
  id: Haunted7x3b
  size: 7,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 8,38
  tags:
    - Haunted
@@ -171,7 +171,7 @@
 - type: dungeonRoom
  id: Haunted7x3c
  size: 7,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 16,38
  tags:
    - Haunted
@@ -179,7 +179,7 @@
 - type: dungeonRoom
  id: Haunted7x3d
  size: 7,3
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,38
  tags:
    - Haunted
@@ -189,7 +189,7 @@
 - type: dungeonRoom
  id: Haunted5x5a
  size: 5,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,18
  tags:
    - Haunted
@@ -197,7 +197,7 @@
 - type: dungeonRoom
  id: Haunted5x5b
  size: 5,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 6,18
  tags:
    - Haunted
@@ -205,7 +205,7 @@
 - type: dungeonRoom
  id: Haunted5x5c
  size: 5,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 12,18
  tags:
    - Haunted
@@ -213,7 +213,7 @@
 - type: dungeonRoom
  id: Haunted5x5d
  size: 5,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 18,18
  tags:
    - Haunted
@@ -221,7 +221,7 @@
 - type: dungeonRoom
  id: Haunted5x5e
  size: 5,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,18
  tags:
    - Haunted
@@ -229,7 +229,7 @@
 - type: dungeonRoom
  id: Haunted5x5f
  size: 5,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 30,18
  tags:
    - Haunted
@@ -238,7 +238,7 @@
 - type: dungeonRoom
  id: Haunted3x5a
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 0,24
  tags:
    - Haunted
@@ -246,7 +246,7 @@
 - type: dungeonRoom
  id: Haunted3x5b
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 4,24
  tags:
    - Haunted
@@ -254,7 +254,7 @@
 - type: dungeonRoom
  id: Haunted3x5c
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 8,24
  tags:
    - Haunted
@@ -262,7 +262,7 @@
 - type: dungeonRoom
  id: Haunted3x5d
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 12,24
  tags:
    - Haunted
@@ -270,7 +270,7 @@
 - type: dungeonRoom
  id: Haunted3x5e
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 16,24
  tags:
    - Haunted
@@ -278,7 +278,7 @@
 - type: dungeonRoom
  id: Haunted3x5f
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 20,24
  tags:
    - Haunted
@@ -286,7 +286,7 @@
 - type: dungeonRoom
  id: Haunted3x5g
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 24,24
  tags:
    - Haunted
@@ -294,7 +294,7 @@
 - type: dungeonRoom
  id: Haunted3x5h
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 28,24
  tags:
    - Haunted
@@ -302,7 +302,7 @@
 - type: dungeonRoom
  id: Haunted3x5i
  size: 3,5
-  atlas: /Maps/Dungeon/haunted.yml
+  atlas: /Maps/_Wega/Dungeon/haunted.yml # Corvax-Wega
  offset: 32,24
  tags:
    - Haunted
--- a/Resources/Prototypes/Procedural/Themes/lava_brig.yml
+++ b/Resources/Prototypes/Procedural/Themes/lava_brig.yml
@@ -4,7 +4,7 @@
 - type: dungeonRoom
  id: LavaBrig17x5a
  size: 17,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,0
  tags:
    - LavaBrig
@@ -12,7 +12,7 @@
 - type: dungeonRoom
  id: LavaBrig17x5b
  size: 17,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 18,0
  tags:
    - LavaBrig
@@ -21,7 +21,7 @@
 - type: dungeonRoom
  id: LavaBrig7x7a
  size: 7,7
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,42
  tags:
    - LavaBrig
@@ -29,7 +29,7 @@
 - type: dungeonRoom
  id: LavaBrig7x7b
  size: 7,7
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 8,42
  tags:
    - LavaBrig
@@ -37,7 +37,7 @@
 - type: dungeonRoom
  id: LavaBrig7x7c
  size: 7,7
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 16,42
  tags:
    - LavaBrig
@@ -45,7 +45,7 @@
 - type: dungeonRoom
  id: LavaBrig7x7d
  size: 7,7
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,42
  tags:
    - LavaBrig
@@ -55,7 +55,7 @@
 - type: dungeonRoom
  id: LavaBrig11x5a
  size: 11,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,6
  tags:
    - LavaBrig
@@ -63,7 +63,7 @@
 - type: dungeonRoom
  id: LavaBrig11x5b
  size: 11,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 12,6
  tags:
    - LavaBrig
@@ -71,7 +71,7 @@
 - type: dungeonRoom
  id: LavaBrig11x5c
  size: 11,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,6
  tags:
    - LavaBrig
@@ -80,7 +80,7 @@
 - type: dungeonRoom
  id: LavaBrig7x5a
  size: 7,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,12
  tags:
    - LavaBrig
@@ -88,7 +88,7 @@
 - type: dungeonRoom
  id: LavaBrig7x5b
  size: 7,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 8,12
  tags:
    - LavaBrig
@@ -96,7 +96,7 @@
 - type: dungeonRoom
  id: LavaBrig7x5c
  size: 7,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 16,12
  tags:
    - LavaBrig
@@ -104,7 +104,7 @@
 - type: dungeonRoom
  id: LavaBrig7x5d
  size: 7,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,12
  tags:
    - LavaBrig
@@ -113,7 +113,7 @@
 - type: dungeonRoom
  id: LavaBrig13x3a
  size: 13,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,30
  tags:
    - LavaBrig
@@ -121,7 +121,7 @@
 - type: dungeonRoom
  id: LavaBrig13x3b
  size: 13,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 14,30
  tags:
    - LavaBrig
@@ -130,7 +130,7 @@
 - type: dungeonRoom
  id: LavaBrig11x3a
  size: 11,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,34
  tags:
    - LavaBrig
@@ -138,7 +138,7 @@
 - type: dungeonRoom
  id: LavaBrig11x3b
  size: 11,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 12,34
  tags:
    - LavaBrig
@@ -146,7 +146,7 @@
 - type: dungeonRoom
  id: LavaBrig11x3c
  size: 11,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,34
  tags:
    - LavaBrig
@@ -155,7 +155,7 @@
 - type: dungeonRoom
  id: LavaBrig7x3a
  size: 7,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,38
  tags:
    - LavaBrig
@@ -163,7 +163,7 @@
 - type: dungeonRoom
  id: LavaBrig7x3b
  size: 7,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 8,38
  tags:
    - LavaBrig
@@ -171,7 +171,7 @@
 - type: dungeonRoom
  id: LavaBrig7x3c
  size: 7,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 16,38
  tags:
    - LavaBrig
@@ -179,7 +179,7 @@
 - type: dungeonRoom
  id: LavaBrig7x3d
  size: 7,3
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,38
  tags:
    - LavaBrig
@@ -189,7 +189,7 @@
 - type: dungeonRoom
  id: LavaBrig5x5a
  size: 5,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,18
  tags:
    - LavaBrig
@@ -197,7 +197,7 @@
 - type: dungeonRoom
  id: LavaBrig5x5b
  size: 5,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 6,18
  tags:
    - LavaBrig
@@ -205,7 +205,7 @@
 - type: dungeonRoom
  id: LavaBrig5x5c
  size: 5,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 12,18
  tags:
    - LavaBrig
@@ -213,7 +213,7 @@
 - type: dungeonRoom
  id: LavaBrig5x5d
  size: 5,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 18,18
  tags:
    - LavaBrig
@@ -221,7 +221,7 @@
 - type: dungeonRoom
  id: LavaBrig5x5e
  size: 5,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,18
  tags:
    - LavaBrig
@@ -229,7 +229,7 @@
 - type: dungeonRoom
  id: LavaBrig5x5f
  size: 5,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 30,18
  tags:
    - LavaBrig
@@ -238,7 +238,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5a
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 0,24
  tags:
    - LavaBrig
@@ -246,7 +246,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5b
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 4,24
  tags:
    - LavaBrig
@@ -254,7 +254,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5c
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 8,24
  tags:
    - LavaBrig
@@ -262,7 +262,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5d
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 12,24
  tags:
    - LavaBrig
@@ -270,7 +270,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5e
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 16,24
  tags:
    - LavaBrig
@@ -278,7 +278,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5f
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 20,24
  tags:
    - LavaBrig
@@ -286,7 +286,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5g
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 24,24
  tags:
    - LavaBrig
@@ -294,7 +294,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5h
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 28,24
  tags:
    - LavaBrig
@@ -302,7 +302,7 @@
 - type: dungeonRoom
  id: LavaBrig3x5i
  size: 3,5
-  atlas: /Maps/Dungeon/lava_brig.yml
+  atlas: /Maps/_Wega/Dungeon/lava_brig.yml # Corvax-Wega
  offset: 32,24
  tags:
    - LavaBrig
--- a/Resources/Prototypes/Procedural/Themes/maints.yml
+++ b/Resources/Prototypes/Procedural/Themes/maints.yml
@@ -1,7 +1,7 @@
 - type: dungeonRoom
  id: Maints5x5a
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 0,0
  tags:
  - Maints
@@ -9,7 +9,7 @@
 - type: dungeonRoom
  id: Maints5x5b
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 6,0
  tags:
  - Maints
@@ -17,7 +17,7 @@
 - type: dungeonRoom
  id: Maints5x5c
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 12,0
  tags:
  - Maints
@@ -25,7 +25,7 @@
 - type: dungeonRoom
  id: Maints5x5d
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 18,0
  tags:
  - Maints
@@ -33,7 +33,7 @@
 - type: dungeonRoom
  id: Maints5x5e
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 0,6
  tags:
    - Maints
@@ -41,7 +41,7 @@
 - type: dungeonRoom
  id: Maints5x5f
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 6,6
  tags:
  - Maints
@@ -49,7 +49,7 @@
 - type: dungeonRoom
  id: Maints5x5g
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 12,6
  tags:
  - Maints
@@ -57,7 +57,7 @@
 - type: dungeonRoom
  id: Maints5x5h
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 18,6
  tags:
  - Maints
@@ -65,7 +65,7 @@
 - type: dungeonRoom
  id: Maints5x5i
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 0,12
  tags:
  - Maints
@@ -73,7 +73,7 @@
 - type: dungeonRoom
  id: Maints5x5j
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 6,12
  tags:
  - Maints
@@ -81,7 +81,7 @@
 - type: dungeonRoom
  id: Maints5x5k
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 12,12
  tags:
  - Maints
@@ -89,7 +89,7 @@
 - type: dungeonRoom
  id: Maints5x5l
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 18,12
  tags:
  - Maints
@@ -97,7 +97,7 @@
 - type: dungeonRoom
  id: Maints5x5m
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 0,18
  tags:
  - Maints
@@ -105,7 +105,7 @@
 - type: dungeonRoom
  id: Maints5x5n
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 6,18
  tags:
  - Maints
@@ -113,7 +113,7 @@
 - type: dungeonRoom
  id: Maints5x5o
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 12,18
  tags:
  - Maints
@@ -121,7 +121,7 @@
 - type: dungeonRoom
  id: Maints5x5p
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 18,18
  tags:
  - Maints
@@ -129,7 +129,7 @@
 - type: dungeonRoom
  id: Maints5x5q
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 0,24
  tags:
  - Maints
@@ -137,7 +137,7 @@
 - type: dungeonRoom
  id: Maints5x5r
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 6,24
  tags:
  - Maints
@@ -145,7 +145,7 @@
 - type: dungeonRoom
  id: Maints5x5s
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 12,24
  tags:
  - Maints
@@ -153,7 +153,7 @@
 - type: dungeonRoom
  id: Maints5x5t
  size: 5,5
-  atlas: /Maps/Dungeon/maints.yml
+  atlas: /Maps/_Wega/Dungeon/maints.yml # Corvax-Wega
  offset: 18,24
  tags:
  - Maints
--- a/Resources/Prototypes/Procedural/Themes/mineshaft.yml
+++ b/Resources/Prototypes/Procedural/Themes/mineshaft.yml
@@ -4,7 +4,7 @@
 - type: dungeonRoom
  id: Mineshaft17x5a
  size: 17,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 0,0
  tags:
    - Mineshaft
@@ -12,7 +12,7 @@
 - type: dungeonRoom
  id: Mineshaft17x5b
  size: 17,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 18,0
  tags:
    - Mineshaft
@@ -20,7 +20,7 @@
 - type: dungeonRoom
  id: Mineshaft17x5c
  size: 17,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 36,0
  tags:
    - Mineshaft
@@ -30,7 +30,7 @@
 - type: dungeonRoom
  id: Mineshaft11x5a
  size: 11,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 0,6
  tags:
    - Mineshaft
@@ -38,7 +38,7 @@
 - type: dungeonRoom
  id: Mineshaft11x5b
  size: 11,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 12,6
  tags:
    - Mineshaft
@@ -46,7 +46,7 @@
 - type: dungeonRoom
  id: Mineshaft11x5c
  size: 11,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 24,6
  tags:
    - Mineshaft
@@ -54,7 +54,7 @@
 - type: dungeonRoom
  id: Mineshaft11x5d
  size: 11,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 36,6
  tags:
    - Mineshaft
@@ -64,7 +64,7 @@
 - type: dungeonRoom
  id: Mineshaft7x5a
  size: 7,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 0,12
  tags:
    - Mineshaft
@@ -72,7 +72,7 @@
 - type: dungeonRoom
  id: Mineshaft7x5b
  size: 7,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 8,12
  tags:
    - Mineshaft
@@ -80,7 +80,7 @@
 - type: dungeonRoom
  id: Mineshaft7x5c
  size: 7,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 16,12
  tags:
    - Mineshaft
@@ -88,7 +88,7 @@
 - type: dungeonRoom
  id: Mineshaft7x5d
  size: 7,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 24,12
  tags:
    - Mineshaft
@@ -96,7 +96,7 @@
 - type: dungeonRoom
  id: Mineshaft7x5e
  size: 7,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 32,12
  tags:
    - Mineshaft
@@ -104,7 +104,7 @@
 - type: dungeonRoom
  id: Mineshaft7x5f
  size: 7,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 40,12
  tags:
    - Mineshaft
@@ -114,7 +114,7 @@
 - type: dungeonRoom
  id: Mineshaft5x5a
  size: 5,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 0,18
  tags:
    - Mineshaft
@@ -122,7 +122,7 @@
 - type: dungeonRoom
  id: Mineshaft5x5b
  size: 5,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 6,18
  tags:
    - Mineshaft
@@ -130,7 +130,7 @@
 - type: dungeonRoom
  id: Mineshaft5x5c
  size: 5,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 12,18
  tags:
    - Mineshaft
@@ -140,7 +140,7 @@
 - type: dungeonRoom
  id: Mineshaft7x7a
  size: 7,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 18,18
  tags:
    - Mineshaft
@@ -148,7 +148,7 @@
 - type: dungeonRoom
  id: Mineshaft7x7b
  size: 7,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 26,18
  tags:
    - Mineshaft
@@ -156,7 +156,7 @@
 - type: dungeonRoom
  id: Mineshaft7x7c
  size: 7,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 34,18
  tags:
    - Mineshaft
@@ -164,7 +164,7 @@
 - type: dungeonRoom
  id: Mineshaft7x7e
  size: 7,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 42,18
  tags:
    - Mineshaft
@@ -174,7 +174,7 @@
 - type: dungeonRoom
  id: Mineshaft3x7a
  size: 3,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 0,24
  tags:
    - Mineshaft
@@ -182,7 +182,7 @@
 - type: dungeonRoom
  id: Mineshaft3x7b
  size: 3,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 4,24
  tags:
    - Mineshaft
@@ -190,7 +190,7 @@
 - type: dungeonRoom
  id: Mineshaft3x7c
  size: 3,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 8,24
  tags:
    - Mineshaft
@@ -198,7 +198,7 @@
 - type: dungeonRoom
  id: Mineshaft3x7d
  size: 3,7
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 12,24
  tags:
    - Mineshaft
@@ -208,7 +208,7 @@
 - type: dungeonRoom
  id: Mineshaft3x5a
  size: 3,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 16,26
  tags:
    - Mineshaft
@@ -216,7 +216,7 @@
 - type: dungeonRoom
  id: Mineshaft3x5b
  size: 3,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 20,26
  tags:
    - Mineshaft
@@ -224,7 +224,7 @@
 - type: dungeonRoom
  id: Mineshaft3x5c
  size: 3,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 24,26
  tags:
    - Mineshaft
@@ -232,7 +232,7 @@
 - type: dungeonRoom
  id: Mineshaft3x5e
  size: 3,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 32,26
  tags:
    - Mineshaft
@@ -240,7 +240,7 @@
 - type: dungeonRoom
  id: Mineshaft3x5f
  size: 3,5
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 36,26
  tags:
    - Mineshaft
@@ -250,7 +250,7 @@
 - type: dungeonRoom
  id: Mineshaft13x3a
  size: 13,3
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 0,32
  tags:
    - Mineshaft
@@ -258,7 +258,7 @@
 - type: dungeonRoom
  id: Mineshaft13x3b
  size: 13,3
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 14,32
  tags:
    - Mineshaft
@@ -266,7 +266,7 @@
 - type: dungeonRoom
  id: Mineshaft13x3c
  size: 13,3
-  atlas: /Maps/Dungeon/mineshaft.yml
+  atlas: /Maps/_Wega/Dungeon/mineshaft.yml # Corvax-Wega
  offset: 28,32
  tags:
    - Mineshaft
--- a/Resources/Prototypes/Procedural/Themes/snowylabs.yml
+++ b/Resources/Prototypes/Procedural/Themes/snowylabs.yml
@@ -4,7 +4,7 @@
 - type: dungeonRoom
  id: SnowyLab17x5a
  size: 17,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,0
  tags:
    - SnowyLabs
@@ -12,7 +12,7 @@
 - type: dungeonRoom
  id: SnowyLab17x5b
  size: 17,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 18,0
  tags:
    - SnowyLabs
@@ -20,7 +20,7 @@
 - type: dungeonRoom
  id: SnowyLab17x5c
  size: 17,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 36,0
  tags:
    - SnowyLabs
@@ -29,7 +29,7 @@
 - type: dungeonRoom
  id: SnowyLab7x7a
  size: 7,7
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,42
  tags:
    - SnowyLabs
@@ -37,7 +37,7 @@
 - type: dungeonRoom
  id: SnowyLab7x7b
  size: 7,7
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 8,42
  tags:
    - SnowyLabs
@@ -45,7 +45,7 @@
 - type: dungeonRoom
  id: SnowyLab7x7c
  size: 7,7
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 16,42
  tags:
    - SnowyLabs
@@ -55,7 +55,7 @@
 - type: dungeonRoom
  id: SnowyLab11x5a
  size: 11,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,6
  tags:
    - SnowyLabs
@@ -63,7 +63,7 @@
 - type: dungeonRoom
  id: SnowyLab11x5b
  size: 11,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 12,6
  tags:
    - SnowyLabs
@@ -71,7 +71,7 @@
 - type: dungeonRoom
  id: SnowyLab11x5c
  size: 11,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 24,6
  tags:
    - SnowyLabs
@@ -79,7 +79,7 @@
 - type: dungeonRoom
  id: SnowyLab11x5d
  size: 11,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 36,6
  tags:
    - SnowyLabs
@@ -88,7 +88,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5a
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,12
  tags:
    - SnowyLabs
@@ -96,7 +96,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5b
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 8,12
  tags:
    - SnowyLabs
@@ -104,7 +104,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5c
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 16,12
  tags:
    - SnowyLabs
@@ -112,7 +112,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5d
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 24,12
  tags:
    - SnowyLabs
@@ -120,7 +120,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5e
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 32,12
  tags:
    - SnowyLabs
@@ -128,7 +128,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5f
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 40,12
  tags:
    - SnowyLabs
@@ -136,7 +136,7 @@
 - type: dungeonRoom
  id: SnowyLab7x5g
  size: 7,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 48,12
  tags:
    - SnowyLabs
@@ -145,7 +145,7 @@
 - type: dungeonRoom
  id: SnowyLab13x3a
  size: 13,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,30
  tags:
    - SnowyLabs
@@ -153,7 +153,7 @@
 - type: dungeonRoom
  id: SnowyLab13x3b
  size: 13,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 14,30
  tags:
    - SnowyLabs
@@ -162,7 +162,7 @@
 - type: dungeonRoom
  id: SnowyLab11x3a
  size: 11,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,34
  tags:
    - SnowyLabs
@@ -170,7 +170,7 @@
 - type: dungeonRoom
  id: SnowyLab11x3b
  size: 11,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 12,34
  tags:
    - SnowyLabs
@@ -178,7 +178,7 @@
 - type: dungeonRoom
  id: SnowyLab11x3c
  size: 11,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 24,34
  tags:
    - SnowyLabs
@@ -187,7 +187,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3a
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,38
  tags:
    - SnowyLabs
@@ -195,7 +195,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3b
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 8,38
  tags:
    - SnowyLabs
@@ -203,7 +203,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3c
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 16,38
  tags:
    - SnowyLabs
@@ -211,7 +211,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3d
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 24,38
  tags:
    - SnowyLabs
@@ -219,7 +219,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3e
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 32,38
  tags:
    - SnowyLabs
@@ -227,7 +227,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3f
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 40,38
  tags:
    - SnowyLabs
@@ -235,7 +235,7 @@
 - type: dungeonRoom
  id: SnowyLab7x3g
  size: 7,3
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 48,38
  tags:
    - SnowyLabs
@@ -245,7 +245,7 @@
 - type: dungeonRoom
  id: SnowyLab5x5a
  size: 5,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,18
  tags:
    - SnowyLabs
@@ -253,7 +253,7 @@
 - type: dungeonRoom
  id: SnowyLab5x5b
  size: 5,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 6,18
  tags:
    - SnowyLabs
@@ -261,7 +261,7 @@
 - type: dungeonRoom
  id: SnowyLab5x5c
  size: 5,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 12,18
  tags:
    - SnowyLabs
@@ -269,7 +269,7 @@
 - type: dungeonRoom
  id: SnowyLab5x5d
  size: 5,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 18,18
  tags:
    - SnowyLabs
@@ -277,7 +277,7 @@
 - type: dungeonRoom
  id: SnowyLab5x5e
  size: 5,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 24,18
  tags:
    - SnowyLabs
@@ -285,7 +285,7 @@
 - type: dungeonRoom
  id: SnowyLab5x5f
  size: 5,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 30,18
  tags:
    - SnowyLabs
@@ -294,7 +294,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5a
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 0,24
  tags:
    - SnowyLabs
@@ -302,7 +302,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5b
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 4,24
  tags:
    - SnowyLabs
@@ -310,7 +310,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5c
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 8,24
  tags:
    - SnowyLabs
@@ -318,7 +318,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5d
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 12,24
  tags:
    - SnowyLabs
@@ -326,7 +326,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5e
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 16,24
  tags:
    - SnowyLabs
@@ -334,7 +334,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5f
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 20,24
  tags:
    - SnowyLabs
@@ -342,7 +342,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5g
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 24,24
  tags:
    - SnowyLabs
@@ -350,7 +350,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5h
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 28,24
  tags:
    - SnowyLabs
@@ -358,7 +358,7 @@
 - type: dungeonRoom
  id: SnowyLab3x5i
  size: 3,5
-  atlas: /Maps/Dungeon/snowy_labs.yml
+  atlas: /Maps/_Wega/Dungeon/snowy_labs.yml # Corvax-Wega
  offset: 32,24
  tags:
    - SnowyLabs
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -23,6 +23,9 @@
  - BorgModuleCommonPen
  - BorgModuleCommonFight
  - BorgModuleCommonPickaxe
+  - BorgModuleCommonSpeed
+  - BorgModuleCommonMagBoots
+  - BorgModuleCommonRepeir
 # Corvax-Wega-end

 - type: latheRecipePack
@@ -68,7 +71,6 @@
  - BorgModuleClowning
  - BorgModuleSheild
  - BorgModuleGranader
-  - BorgModuleSecLethal
  - BorgModuleCommonHand
 # Corvax-Wega-end

--- a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hats.yml
@@ -164,3 +164,102 @@
    sprite: _Wega/Clothing/Head/Hats/catmelon_erars.rsi
  - type: AddAccentClothing
    accent: OwOAccent
+
+- type: entity
+  id: ClothingHeadHatNewYearRed
+  name: red new year hat
+  description: "The holiday is coming, the holiday is coming!"
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    layers:
+    - state: icon
+      color: red
+    - state: bottom-icon
+  - type: Clothing
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HEAD
+        color: red
+      - state: bottom-equipped-HEAD
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatNewYearBlue
+  name: blue new year hat
+  description: "The holiday is coming, the holiday is coming!"
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    layers:
+    - state: icon
+      color: blue
+    - state: bottom-icon
+  - type: Clothing
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HEAD
+        color: blue
+      - state: bottom-equipped-HEAD
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatNewYearCyan
+  name: cyan new year hat
+  description: "The holiday is coming, the holiday is coming!"
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    layers:
+    - state: icon
+      color: cyan
+    - state: bottom-icon
+  - type: Clothing
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HEAD
+        color: cyan
+      - state: bottom-equipped-HEAD
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatNewYearWega
+  name: fuchsia new year hat
+  description: "The holiday is coming, the holiday is coming!"
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    layers:
+    - state: icon
+      color: "#fd4ae4"
+    - state: bottom-icon
+  - type: Clothing
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HEAD
+        color: "#fd4ae4"
+      - state: bottom-equipped-HEAD
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatNewYearCentComm
+  name: new year hat CentComm
+  description: "The holiday is coming, the holiday is coming!"
+  components:
+  - type: Sprite
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    layers:
+    - state: icon
+      color: "#29722e"
+    - state: bottom-icon
+  - type: Clothing
+    sprite: _Wega/Clothing/Head/Hats/new_yearhat.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-HEAD
+        color: "#29722e"
+      - state: bottom-equipped-HEAD
--- a/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/extracts.yml
+++ b/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/extracts.yml
@@ -94,3 +94,38 @@
      - MobXenoSlimePyrite
      - MobXenoSlimeAzure
      - MobXenoSlimeLightPink
+
+- type: entity
+  id: RandomXenoSlimeExtract
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: _Wega/Objects/Consumable/Food/extracts.rsi
+        state: grey
+  - type: RandomSpawner
+    prototypes:
+      - MaterialSlimeExtractGray
+      - MaterialSlimeExtractBlue
+      - MaterialSlimeExtractPurple
+      - MaterialSlimeExtractOrange
+      - MaterialSlimeExtractMetallic
+      - MaterialSlimeExtractDarkPurple
+      - MaterialSlimeExtractGreen
+      - MaterialSlimeExtractDarkBlue
+      - MaterialSlimeExtractPink
+      - MaterialSlimeExtractRed
+      - MaterialSlimeExtractYellow
+      - MaterialSlimeExtractGold
+      - MaterialSlimeExtractSilver
+      - MaterialSlimeExtractBlack
+      - MaterialSlimeExtractSepia
+      - MaterialSlimeExtractOil
+      - MaterialSlimeExtractBluespace
+      - MaterialSlimeExtractAdamantine
+      - MaterialSlimeExtractPyrite
+      - MaterialSlimeExtractAzure
+      - MaterialSlimeExtractLightPink
+      - MaterialSlimeExtractRainbow
+    chance: 0.75
--- a/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/misc.yml
+++ b/Resources/Prototypes/_Wega/Entities/Markers/Spawners/Random/misc.yml
@@ -0,0 +1,20 @@
+- type: entity
+  name: Rare module spawner
+  id: RareBorgModuleSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+          state: command
+    - type: RandomSpawner
+      prototypes:
+        - BorgModuleCommonHand
+        - BorgModuleSecRare
+        - BorgModuleCargoRare
+        - BorgModuleEngenerRare
+        - BorgModuleCleanerRare
+        - BorgModuleMedicalRare
+        - BorgModuleServiceRare
+      chance: 1
--- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -63,5 +63,5 @@
    price: 0
  - type: StorageFill
    contents:
-    - id: FoodProduceLollipopBar
+    - id: FoodProduceLollipopMedRandom
      amount: 12
--- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/candy.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/candy.yml
@@ -52,6 +52,21 @@
      - Blood
      - ZombieBlood

+- type: weightedRandomFillSolution
+  id: RandomFillLollipopMedical
+  fills:
+    - quantity: 5
+      weight: 1
+      reagents:
+      - Tricordrazine
+      - Tricordrazine
+      - Tricordrazine
+      - Tricordrazine
+      - Tricordrazine
+      - Tricordrazine
+      - Tricordrazine
+      - Tricordrazine
+      - Omnizine

 - type: entity
  name: lollipop
@@ -136,3 +151,43 @@
  - type: Tag
    tags:
    - Lollipops
+    
+- type: entity
+  name: lollipop
+  parent: FoodProduceBase
+  id: FoodProduceLollipopMedicalBar
+  suffix: "medical chemicals"
+  description: "Extremely tasty lollipop!"
+  components:
+  - type: FlavorProfile
+    flavors: []
+  - type: RandomFillSolution
+    solution: food
+    weightedRandomId: RandomFillLollipopMedical
+  - type: Sprite
+    sprite: _Wega/Objects/Consumable/Food/randomlollipop.rsi
+    layers:
+    - state: lollipop1
+      map: [ "enum.DamageStateVisualLayers.Base" ]
+  - type: RandomSprite
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          lollipop1: ""
+          lollipop2: ""
+          lollipop3: ""
+          lollipop4: ""
+          lollipop5: ""
+          lollipop6: ""
+          lollipop7: ""
+          lollipop8: ""
+          lollipop9: ""
+          lollipop10: ""
+          lollipop11: ""
+          lollipop12: ""
+          lollipop13: ""
+          lollipop14: ""
+          lollipop15: ""
+          lollipop16: ""
+  - type: Tag
+    tags:
+    - Lollipops
--- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/produce.yml
@@ -467,7 +467,7 @@
      path: /Audio/Effects/unwrap.ogg
  - type: Tag
    tags:
-    - Fruit
+    - Lollipops

 - type: entity
  name: lollipop 
@@ -497,10 +497,342 @@
      - id: FoodProduceLollipopRandomBar
    sound:
      path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - Lollipops
+
+- type: entity
+  name: lollipop 
+  parent: FoodProduceBase
+  id: FoodProduceLollipopMedical
+  suffix: "medical chemicals"
+  description: "the most delicious lollipops and more!"
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 4
+        - ReagentId: UnstableMutagen
+          Quantity: 1
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/candytreerandom.rsi
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodProduceLollipopMedicalBar
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - Lollipops
+
+- type: entity
+  name: lollipop 
+  parent: FoodProduceBase
+  id: FoodProduceLollipopMedRandom
+  suffix: "medical case"
+  description: "the most delicious lollipops and more!"
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 4
+        - ReagentId: UnstableMutagen
+          Quantity: 1
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/candytreerandom.rsi
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodProduceLollipopBar
+        orGroup: CCandyBorg
+      - id: FoodProduceLollipopMedicalBar
+        prob: 0.5
+        orGroup: CCandyBorg
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - Lollipops
+
+- type: entity
+  name: tangerine
+  parent: FoodProduceBase
+  id: FoodProduceTangerine
+  description: "the best New Year's food!"
+  components:
+  - type: FlavorProfile
+    flavors:
+      - tangerine
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceTangerine
+        Quantity: 7.5
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/tangerine.rsi
+  - type: Produce
+    seedId: tangerine
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodProduceTangerineTrash
+      - id: FoodProduceTangerineOpen
+    sound:
+      path: /Audio/Effects/packetrip.ogg
  - type: Tag
    tags:
    - Fruit

+- type: entity
+name: tangerine open
+  parent: FoodProduceBase
+  id: FoodProduceTangerineOpen
+  description: "the best New Year's food!"
+  components:
+  - type: FlavorProfile
+    flavors:
+      - tangerine
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceTangerine
+        Quantity: 7.5
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/tangerine.rsi
+    state: open
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+parent: BaseItem
+  name: tangerine peel
+  id: FoodProduceTangerineTrash
+  description: It smells strongly of tangerine!
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/tangerine.rsi
+    state: trash
+  - type: FlavorProfile
+    flavors:
+      - tangerine
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Trash
+  - type: SpaceGarbage
+  - type: StaticPrice
+    price: 0
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Vitamin
+          Quantity: 7
+  - type: Edible
+    requiresSpecialDigestion: true
+  - type: Extractable
+    grindableSolutionName: food
+
+- type: entity
+  name: festive tangerine
+  parent: FoodProduceBase
+  id: FoodProduceFestiveTangerine
+  description: "A beautiful box with a gift!"
+  components:
+  - type: FlavorProfile
+    flavors:
+      - tangerine
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Vitamin
+          Quantity: 2
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/festive_tangerine.rsi
+  - type: Produce
+    seedId: festivetangerine
+  - type: SpawnItemsOnUse
+    items:
+      - id: FoodProduceFestiveTangerineTrash
+      - id: Bucket
+        orGroup: GiftPool
+      - id: PlushieGhost
+        orGroup: GiftPool
+      - id: PlushieBee
+        orGroup: GiftPool
+      - id: PlushieRGBee
+        orGroup: GiftPool
+      - id: PlushieNuke
+        orGroup: GiftPool
+      - id: PlushieRouny
+        orGroup: GiftPool
+      - id: PlushieLizard #Weh!
+        orGroup: GiftPool
+      - id: PlushieRainbowLizard
+        orGroup: GiftPool
+      - id: PlushieNar
+        orGroup: GiftPool
+      - id: PlushieCarp
+        orGroup: GiftPool
+      - id: PlushieMagicarp
+        orGroup: GiftPool
+      - id: PlushieHolocarp
+        orGroup: GiftPool
+      - id: PlushieRainbowCarp
+        orGroup: GiftPool
+      - id: PlushieSlime
+        orGroup: GiftPool
+      - id: PlushieSnake
+        orGroup: GiftPool
+      - id: PlushieVox
+        orGroup: GiftPool
+      - id: PlushieRatvar
+        orGroup: GiftPool
+      - id: PlushieSpaceLizard
+        orGroup: GiftPool
+      - id: PlushieSharkBlue
+        orGroup: GiftPool
+      - id: PlushieSharkPink
+        orGroup: GiftPool
+      - id: PlushieSharkGrey
+        orGroup: GiftPool
+      - id: ToyAmongPequeno
+        orGroup: GiftPool
+      - id: PlushieDiona
+        orGroup: GiftPool
+      - id: PlushieArachind
+        orGroup: GiftPool
+      - id: ToyMouse
+        orGroup: GiftPool
+      - id: ToyAi
+        orGroup: GiftPool
+      - id: ToyNuke
+        orGroup: GiftPool
+      - id: ToyFigurinePassenger
+        orGroup: GiftPool
+      - id: ToyFigurineGriffin
+        orGroup: GiftPool
+      - id: ToyHonk
+        orGroup: GiftPool
+      - id: ToyIan
+        orGroup: GiftPool
+      - id: ToyMarauder
+        orGroup: GiftPool
+      - id: ToyMauler
+        orGroup: GiftPool
+      - id: ToyGygax
+        orGroup: GiftPool
+      - id: ToyOdysseus
+        orGroup: GiftPool
+      - id: ToyFigurineOwlman
+        orGroup: GiftPool
+      - id: ToyDeathRipley
+        orGroup: GiftPool
+      - id: ToyPhazon
+        orGroup: GiftPool
+      - id: ToyFireRipley
+        orGroup: GiftPool
+      - id: ToyReticence
+        orGroup: GiftPool
+      - id: ToyRipley
+        orGroup: GiftPool
+      - id: ToySeraph
+        orGroup: GiftPool
+      - id: ToyDurand
+        orGroup: GiftPool
+      - id: ToyFigurineSkeleton
+        orGroup: GiftPool
+      - id: FoamBlade
+        orGroup: GiftPool
+      - id: PonderingOrb
+        orGroup: GiftPool
+      - id: Skub
+        orGroup: GiftPool
+      - id: PersonalAI
+        orGroup: GiftPool
+      - id: DiceBag
+        orGroup: GiftPool
+      - id: CrayonBox
+        orGroup: GiftPool
+      - id: ToySword
+        orGroup: GiftPool
+      - id: Coal1
+        orGroup: GiftPool
+      - id: ToyRubberDuck
+        orGroup: GiftPool
+      - id: RGBStaff
+        orGroup: GiftPool
+    sound:
+      path: /Audio/Effects/packetrip.ogg
+  - type: Tag
+    tags:
+    - Fruit
+
+- type: entity
+  name: gift wrapping
+  parent: BaseItem
+  id: FoodProduceFestiveTangerineTrash
+  description: This is rubbish.
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Hydroponics/festive_tangerine.rsi
+    state: trash
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Trash
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+  - type: SpaceGarbage
+  - type: StaticPrice
+    price: 0
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Edible
+    requiresSpecialDigestion: true
+
 - type: entity
  name: melon
  parent: [FoodProduceBase, ItemHeftyBase]
--- a/Resources/Prototypes/_Wega/Entities/Objects/Power/portable_recharger.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Power/portable_recharger.yml
@@ -7,16 +7,7 @@
  - type: Sprite
    sprite: _Wega/Objects/Power/portable_rechargeres/turbo_portable_recharger.rsi
  - type: Charger
-    chargeRate: 100
-  - type: ItemSlots
-    slots:
-      charger_slot:
-        ejectOnInteract: true
-        whitelist:
-          components:
-          - BatteryAmmoProvider
-          - Stunbaton
-          - PowerCell
+    chargeRate: 50

 - type: entity
  parent: [PortableRecharger, ClothingBackpack]
@@ -27,7 +18,7 @@
  - type: Sprite
    sprite: _Wega/Objects/Power/portable_rechargeres/bag_portable_recharger.rsi
  - type: Charger
-    chargeRate: 25
+    chargeRate: 30
  - type: Storage
    maxItemSize: Huge
    grid:
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/plant_analyzer.yml
@@ -44,6 +44,7 @@
  parent: [ PlantAnalyzerUnpowered, PowerCellSlotSmallItem ]
  suffix: Powered
  components:
+  - type: PredictedBatteryVisuals
  - type: PowerCellDraw
    drawRate: 1.2
  - type: ToggleCellDraw
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -147,3 +147,22 @@
      seedId: catmelon
    - type: Sprite
      sprite: _Wega/Objects/Specific/Hydroponics/catmelon.rsi
+
+- type: entity
+  name: packet of candy tangerine
+  id: TangerineSeeds
+  components:
+    - type: Seed
+      seedId: tangerine
+    - type: Sprite
+      sprite: _Wega/Objects/Specific/Hydroponics/tangerine.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of candy festive tangerine
+  id: FestiveTangerineSeeds
+  components:
+    - type: Seed
+      seedId: festivetangerine
+    - type: Sprite
+      sprite: _Wega/Objects/Specific/Hydroponics/festive_tangerine.rsi
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_item.yml
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -14,7 +14,7 @@
    inhandVisuals:
      left:
      - state: base-icon-inhand-left
-        color: "#EEF5F5"
+        color: "#db3e2a"
      - state: base-module-inhand-left
        color: "#B22222"
      - state: base-part-inhand-left
@@ -22,7 +22,7 @@
        color: "#C3C3C3"
      right:
      - state: base-icon-inhand-right
-        color: "#EEF5F5"
+        color: "#db3e2a"
      - state: base-module-inhand-right
        color: "#B22222"
      - state: base-part-inhand-right
@@ -264,6 +264,80 @@
          - Backpack
  - type: BorgModuleIcon
    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: hand-module }
+
+- type: entity
+  id: BorgModuleCommonSpeed
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: speed common module
+  description: Everyone can heal your action!
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: generic
+    - state: icon-speed
+  - type: ItemBorgModule
+    hands:
+    - item: SpeedModeDevice
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: speed }
+    
+- type: entity
+  id: BorgModuleCommonMagBoots
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: magboots common module
+  description: Everyone can heal your action!
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: generic
+    - state: icon-magboots
+  - type: ItemBorgModule
+    hands:
+    - item: MagbootsModeDevice
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: magboots }
+
+- type: entity
+  id: BorgModuleCommonCandy
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: candy module
+  description: Everyone can heal your action!
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: generic
+    - state: icon-candy
+  - type: ItemBorgModule
+    hands:
+    - item: BorgGeneratorCommonCandy
+    - hand:
+        emptyRepresentative: FoodProduceLollipopMedical
+        emptyLabel: borg-slot-candy-empty
+        whitelist:
+          tags:
+          - Lollipops
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: candy-module }
+ 
+- type: entity
+  id: BorgModuleCommonRepeir
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
+  name: repeir module
+  description: Everyone can heal your action!
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: generic
+    - state: icon-repeir
+  - type: ItemBorgModule
+    hands:
+    - item: RepeirModeDevice
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: repeir-module }
 # Servive Module

 - type: entity
@@ -300,10 +374,13 @@
        emptyRepresentative: ReagentContainerFlour
        emptyLabel: borg-slot-ingredient-empty
        whitelist:
+          components:
+          - SlimeFood
          tags:
          - Ingredient
          - Enzyme
          - Mayo
+          - FoodSnack
    - hand:
        emptyRepresentative: FoodMeat
        emptyLabel: borg-slot-meat-empty
@@ -342,9 +419,27 @@
          components:
          - FitsInDispenser
    - item: BarSpoon
+    - item: BorgGeneratorCommonCandy
+    - hand:
+        emptyRepresentative: FoodBreadPlain
+        emptyLabel: borg-slot-food-empty
+        whitelist:
+          components:
+          - SlimeFood
+          tags:
+          - FoodSnack
+    - item: DrinkGlass
+      hand:
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: DrinkGlass
+        whitelist:
+          components:
+          - FitsInDispenser
+          - SolutionContainerManager
+          tags:
+          - ChemDispensable
  - type: BorgModuleIcon
    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: bar-module }
-
 # Security module

 - type: entity
@@ -360,7 +455,9 @@
    - state: icon-dis
  - type: ItemBorgModule
    hands:
-    - item: StunprodBorg
+    # - item: StunprodBorg
+    - item: WeaponBorgDisabler
+    - item: WeaponMeleeNeedleBorg
    - item: Flash
      hand:
        emptyLabel: borg-slot-flash-empty
@@ -368,7 +465,6 @@
        whitelist:
          components:
          - Flash
-    - item: WeaponBorgDisabler
    - item: HoloprojectorSecurityMicrowave
    - item: Zipties
      hand:
@@ -418,31 +514,6 @@
  - type: BorgModuleIcon
    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: dec-module }

- type: entity
-  id: BorgModuleSecLethal
-  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
-  name: lethal module
-  description: Everyone can heal your action!
-  components:
-  - type: Sprite
-    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
-    layers:
-    - state: security
-    - state: icon-gun
-  - type: ItemBorgModule
-    hands:
-    - item: WeaponBorgLethal
-    - item: Truncheon
-    - item: Flash
-      hand:
-        emptyLabel: borg-slot-flash-empty
-        emptyRepresentative: Flash
-        whitelist:
-          components:
-          - Flash
-  - type: BorgModuleIcon
-    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: gun-module }
-
 - type: entity
  id: BorgModuleSheild
  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
@@ -475,14 +546,13 @@
    - state: icon-grenade
  - type: ItemBorgModule
    hands:
-    - item: WeaponBorgRG430
+    - item: WeaponHandGranadeGun
    - hand:
        emptyLabel: borg-slot-granade-empty
        emptyRepresentative: ModularGrenade
        whitelist:
          tags:
          - HandGrenade
-          - Grenade
          - Payload
          - VoiceTrigger
    - item: BoxBorgGranade
@@ -494,438 +564,266 @@
          - Payload
  - type: BorgModuleIcon
    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: grenade-module }
-
-## borg-item
-# Kinetic item
+    
+## Rare
 - type: entity
-  name: proto-kinetic accelerator1
-  id: WeaponProtoKineticAcceleratorBorg
-  parent: BaseItem
-  description: Fires low-damage kinetic bolts at a short range.
-  suffix: Borg
+  id: BorgModuleSecRare
+  parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
+  name: lethal module
+  suffix: rare
+  description: Everyone can heal your action!
  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
-    layers:
-    - state: icon
-    - state: animation-icon
-      visible: false
-      map: [ "empty-icon" ]
  - type: Item
-    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
-    size: Large
-    shape:
-    - 0,0,2,1
-  - type: Gun
-    fireRate: 0.5
-    selectedMode: SemiAuto
-    angleDecay: 0
-    minAngle: 0
-    maxAngle: 0
-    availableModes:
-    - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
-  - type: AmmoCounter
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.AmmoVisuals.HasAmmo:
-        empty-icon:
-          True: { visible: False }
-          False: { visible: True }
-        #todo: add other 'empty' animations
-  - type: RechargeBasicEntityAmmo
-    rechargeCooldown: 0.75
-    rechargeSound:
-      path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
-  - type: BasicEntityAmmoProvider
-    proto: BulletKinetic
-    capacity: 1
-    count: 1
-  - type: UseDelay
-    delay: 1
-  - type: UpgradeableGun
-    whitelist:
-      tags:
-      - PKAUpgrade
-  - type: ContainerContainer
-    containers:
-      upgrades: !type:Container
-
-# weapon
- type: entity
-  parent: Stunbaton
-  id: StunprodBorg
-  components:
-  - type: Stunbaton
-    energyPerUse: 60
-  - type: PredictedBattery
-    maxCharge: 360
-    startingCharge: 360
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 2
-
- type: entity
-  parent: HoloprojectorSecurity
-  id: HoloprojectorSecurityMicrowave
-  suffix: PowerCellMicroreactor
-  components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMicroreactor
-
- type: entity
-  name: makeshift disabler pistol
-  parent: BaseItem
-  id: WeaponBorgDisabler
-  description: Better pray it won't burn your hands off.
-  components:
-  - type: Gun
-    fireRate: 2
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    angleDecay: 0
-    minAngle: 0
-    maxAngle: 0
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
-  - type: Item
-    sprite:  _Wega/Objects/Weapons/Guns/Battery/borggun.rsi
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#db3e2a"
+      - state: base-module-inhand-left
+        color: "#1e548a"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#db3e2a"
+      - state: base-module-inhand-right
+        color: "#1e548a"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
  - type: Sprite
-    sprite: _Wega/Objects/Weapons/Guns/Battery/borggun.rsi
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
    layers:
-    - state: icon
-  - type: PredictedBattery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: BatteryAmmoProvider
-    proto: BulletDisabler
-    fireCost: 62.5
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 10
-    autoRechargePauseTime: 40
-  - type: AmmoCounter
+    - state: command
+    - state: icon-gun-rare
+  - type: ItemBorgModule
+    hands:
+    - item: WeaponBorgLethal
+    - item: Truncheon
+    - item: Flash
+      hand:
+        emptyLabel: borg-slot-flash-empty
+        emptyRepresentative: Flash
+        whitelist:
+          components:
+          - Flash
+    - item: RiotBulletShieldBorg   
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: lethal-rare }

 - type: entity
-  name: makeshift laser pistol
-  parent: BaseItem
-  id: WeaponBorgLethal
-  description: Better pray it won't burn your hands off.
+  id: BorgModuleCargoRare
+  parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
+  name: plasma cutter module
+  suffix: rare
+  description: Everyone can heal your action!
  components:
-  - type: Gun
-    fireRate: 2
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    angleDecay: 0
-    minAngle: 0
-    maxAngle: 0
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
-  - type: Sprite
-    sprite: _Wega/Objects/Weapons/Guns/Battery/borggun.rsi
-    layers:
-    - state: icon
  - type: Item
-    sprite: _Wega/Objects/Weapons/Guns/Battery/borggun.rsi
-    storedOffset: 0,-4
-  - type: Appearance
-  - type: BatteryAmmoProvider
-    proto: BulletLaserAdvanced
-    fireCost: 100
-  - type: PredictedBattery
-    maxCharge: 1000
-    startingCharge: 1000
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 10
-    autoRechargePauseTime: 40
-  - type: AmmoCounter
-
-# Common-fight
- type: entity
-  parent: WeaponMeleeNeedle
-  id: WeaponMeleeNeedleBorg
-  name: security damage stick
-  description: A specialty weapon used in the destruction of unique syndicate morale-boosting equipment.
-  components:
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Piercing: 12
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Piercing: 0
-
-# mining-common
- type: entity
-  name: pickaxe
-  parent: BaseItem
-  id: PickaxeBorg
-  description: Notched to perfection, for jamming it into rocks.
-  components:
-  - type: Tag
-    tags:
-    - Pickaxe
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#db3e2a"
+      - state: base-module-inhand-left
+        color: "#1e548a"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#db3e2a"
+      - state: base-module-inhand-right
+        color: "#1e548a"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
  - type: Sprite
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    state: pickaxe
-  - type: MeleeWeapon
-    attackRate: 0.7
-    wideAnimationRotation: -135
-    soundHit:
-      path: "/Audio/Weapons/smash.ogg"
-      params:
-        volume: -3
-    damage:
-      groups:
-        Brute: 10
-      types:
-        Structural: 30
-  - type: Item
-    size: Normal
-    shape:
-    - 0,0,2,0
-    - 1,1,1,2
-    sprite: Objects/Weapons/Melee/pickaxe.rsi
-    storedRotation: -45
-  - type: UseDelay
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-      Wood: 100
-
-# decPDA
- type: entity
-  parent: BaseSecurityPDA
-  id: DetectivePDABorg
-  name: borg sec PDA
-  description: Smells like rain... pouring down the rooftops...
-  components:
-  - type: Appearance
-    appearanceDataInit:
-     enum.PdaVisuals.PdaType:
-       !type:String
-       pda-detective
-  - type: PdaBorderColor
-    borderColor: "#774705"
-  - type: Icon
-    state: pda-detective
-  - type: CartridgeLoader
-    preinstalled:
-    - CrewManifestCartridge
-    - NotekeeperCartridge
-    - NanoTaskCartridge
-    - NewsReaderCartridge
-    - NanoChatCartridge # Corvax-Wega-NanoChat
-    - WantedListCartridge
-    - LogProbeCartridge
-
-# grenader
- type: entity
-  name: rg 430
-  parent: BaseStorageItem
-  id: WeaponBorgRG430
-  description: Load granade for optimal results.
-  components:
-  - type: Sprite
-    sprite: _Wega/Objects/Weapons/Guns/Launchers/rg_430.rsi
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
    layers:
-    - state: base
-  - type: Storage
-    maxItemSize: Normal
-    grid:
-    - 0,0,0,1
-    - 1,0,0,0
-    whitelist:
-      tags:
-      - HandGrenade
-      - Grenade
-  - type: Gun
-    fireRate: 2
-    selectedMode: SemiAuto
-    availableModes:
-    - SemiAuto
-    - FullAuto
-    soundGunshot:
-      path: /Audio/Effects/thunk.ogg
-    soundEmpty:
-      path: /Audio/Items/hiss.ogg
-    clumsyProof: true
-  - type: ContainerAmmoProvider
-    container: storagebase
+    - state: command
+    - state: icon-mining-rare
+  - type: ItemBorgModule
+    hands:
+    - item: WeaponPlasmaCutter
+    - item: AdvancedMineralScannerUnpowered
+    - hand:
+        emptyLabel: borg-slot-ore-empty
+        emptyRepresentative: Coal
+        whitelist:
+          tags:
+          - Ore
+          - ArtifactFragment
+    - item: BorgOreBagOfHolding
+    - item: BorgOreBagOfHolding
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: mining-rare }
+
+- type: entity
+  id: BorgModuleCleanerRare
+  parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
+  name: turbo cleaning module
+  suffix: rare
+  description: Everyone can heal your action!
+  components:
  - type: Item
-    size: Large
-  - type: Clothing
-    sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
-    quickEquip: false
-    slots:
-    - Back
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: []
-
- type: entity
-  name: box granade
-  parent: BoxPillCanister
-  id: BoxBorgGranade
-  description: A box full of pill canisters.
-  components:
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#db3e2a"
+      - state: base-module-inhand-left
+        color: "#1e548a"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#db3e2a"
+      - state: base-module-inhand-right
+        color: "#1e548a"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
    layers:
-      - state: box_of_doom # Corvax-Resprite
-      - state: flashbang
-  - type: Storage
-    grid:
-    - 0,0,4,3
-  - type: StorageFill
-    contents:
-      - id: GrenadeStinger
-      - id: TearGasGrenade
-      - id: GrenadeFlashBang
-
-# sheild
- type: entity
-  name: riot shield borg
-  parent: [ BaseShield, BaseSecurityContraband ]
-  id: RiotShieldBorg
-  description: It s nanomachine, son!
-  components:
-    - type: StaticPrice
-      price: 90
-    - type: Blocking
-      activeBlockFraction: 0.95
-      passiveBlockFraction: 0.8
-      passiveBlockModifier:
-        coefficients:
-          Blunt: 0.7
-          Slash: 0.7
-      activeBlockModifier:
-        coefficients:
-          Blunt: 1
-          Slash: 1
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 10000000000000000000000
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 10000000000000000000000 #This is probably enough damage before it breaks
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                SheetSteel:
-                  min: 2
-                  max: 2
-                SheetGlass:
-                  min: 2
-                  max: 2
-
+    - state: command
+    - state: icon-mop-rare
+  - type: ItemBorgModule
+    hands:
+    - item: WeaponHydraBorg
+    - item: LightReplacerBorg
+    - item: BorgTrashBag
+    - item: BorgTrashBag
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: ubor-rare }

 - type: entity
-  name: laser shield borg
-  parent: [ BaseShield, BaseSecurityContraband ]
-  id: RiotLaserShieldBorg
-  description: It s nanomachine, son!
+  id: BorgModuleEngenerRare
+  parent: [ BaseBorgModuleEngineering, BaseProviderBorgModule ]
+  name: combat RCD module
+  suffix: rare
+  description: Everyone can heal your action!
  components:
-    - type: Sprite
-      state: riot_laser-icon
-    - type: Item
-      heldPrefix: riot_laser
-    - type: Blocking
-      activeBlockFraction: 0.7
-      passiveBlockFraction: 0.7
-      passiveBlockModifier:
-        coefficients:
-          Heat: 0.7
-      activeBlockModifier:
-        coefficients:
-          Heat: 1
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 10000000000000000000000
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 10000000000000000000000 #This is probably enough damage before it breaks
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                SheetSteel:
-                  min: 2
-                  max: 2
-                SheetGlass:
-                  min: 2
-                  max: 2
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#db3e2a"
+      - state: base-module-inhand-left
+        color: "#1e548a"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#db3e2a"
+      - state: base-module-inhand-right
+        color: "#1e548a"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: command
+    - state: icon-rcd-rare
+  - type: ItemBorgModule
+    hands:
+    - item: RCDCombatRecharging
+    - item: BorgGeneratorMaterialRod
+    - item: BorgGeneratorTile
+    - item: BorgGeneratorMaterialSteal
+    - item: BorgGeneratorMaterialPlasteel
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: rcd-rare }

 - type: entity
-  name: ballistic shield borg
-  parent: [ BaseShield, BaseSecurityContraband ]
-  id: RiotBulletShieldBorg
-  description: It s nanomachine, son!
+  id: BorgModuleServiceRare
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: product module
+  suffix: rare
+  description: Everyone can heal your action!
  components:
-    - type: Sprite
-      state: riot_bullet-icon
-    - type: Item
-      heldPrefix: riot_bullet
-    - type: Blocking
-      activeBlockFraction: 0.8
-      passiveBlockFraction: 0.5
-      passiveBlockModifier:
-        coefficients:
-          Piercing: 0.7
-      activeBlockModifier:
-        coefficients:
-          Piercing: 1
-    - type: Destructible
-      thresholds:
-        - trigger:
-            !type:DamageTrigger
-            damage: 10000000000000000000000
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 10000000000000000000000 #This is probably enough damage before it breaks
-          behaviors:
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-            - !type:PlaySoundBehavior
-              sound:
-                collection: MetalBreak
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                SheetSteel:
-                  min: 2
-                  max: 2
-                SheetGlass:
-                  min: 2
-                  max: 2
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#db3e2a"
+      - state: base-module-inhand-left
+        color: "#1e548a"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#db3e2a"
+      - state: base-module-inhand-right
+        color: "#1e548a"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: command
+    - state: icon-cook-rare
+  - type: ItemBorgModule
+    hands:
+    - item: MicrowaveForBorg
+    - item: BorgGeneratorPocket
+    - item: BorgGeneratorMeat
+    - hand:
+        emptyRepresentative: FoodBreadPlain
+        emptyLabel: borg-slot-food-empty
+        whitelist:
+          components:
+          - SlimeFood
+          tags:
+          - FoodSnack
+    - item: BorgGeneratorDrink
+    - hand:
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: DrinkGlass
+        whitelist:
+          components:
+          - FitsInDispenser
+          - SolutionContainerManager
+          tags:
+          - ChemDispensable
+    - item: BoxFreezer
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: cook-rare }
+
+- type: entity
+  id: BorgModuleMedicalRare
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: generation module
+  suffix: rare
+  description: Surgical module, built-in all necessary surgical instruments and sterilization device. Now cutting out the brain of a crew member has become easier!
+  components:
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#db3e2a"
+      - state: base-module-inhand-left
+        color: "#1e548a"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#C3C3C3"
+      right:
+      - state: base-icon-inhand-right
+        color: "#db3e2a"
+      - state: base-module-inhand-right
+        color: "#1e548a"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi
+    layers:
+    - state: command
+    - state: icon-doc-rare
+  - type: ItemBorgModule
+    hands:
+    - item: BorgHypoTricordrazine
+    - item: BorgHypoBicaridine
+    - item: BorgHypoDermaline
+    - item: BorgHypoDylovene
+    - item: BorgHypoHyronalin
+    - item: BorgHypoDexalin
+  - type: BorgModuleIcon
+    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: med-rare }
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Salvage/ore_bag.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -0,0 +1,47 @@
+- type: entity
+  parent: BaseStorageItem
+  id: BorgOreBagOfHolding
+  name: integrated ore bag of holding
+  description: A large ore bag built into the frame of a mining cyborg.
+  components:
+    - type: ItemToggle
+    - type: ComponentToggler
+      components:
+      - type: MagnetPickup
+        needForSlotFlag: false
+        range: 2
+    - type: Storage
+      maxItemSize: Normal
+      grid:
+      - 0,0,19,9
+      quickInsert: true
+      areaInsert: true
+      whitelist:
+        tags:
+          - ArtifactFragment
+          - Ore
+    - type: Sprite
+      sprite: Objects/Specific/Mining/ore_bag_holding.rsi
+    # Corvax-Wega-Start
+    # state: icon
+      layers:
+      - state: orebag_off
+        map: [ "enum.ToggleableVisuals.Layer" ]
+    # Corvax-Wega-End
+    - type: Clothing
+      sprite: Objects/Specific/Mining/ore_bag_holding.rsi
+      quickEquip: false
+      slots:
+      - belt
+    - type: Item
+      size: Ginormous
+  # Corvax-Wega-Start
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.ToggleableVisuals.Enabled:
+          enum.ToggleableVisuals.Layer:
+            True: { state: orebag_on }
+            False: { state: orebag_off }
+  # Corvax-Wega-End
+    - type: Dumpable
--- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Xenobiology/slimeanalyzer.yml
@@ -40,6 +40,7 @@
  parent: [ HandheldSlimeAnalyzerUnpowered, PowerCellSlotSmallItem]
  suffix: Powered
  components:
+  - type: PredictedBatteryVisuals
  - type: PowerCellDraw
    drawRate: 1.2
  - type: ToggleCellDraw
--- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -0,0 +1,43 @@
+- type: entity
+  name: rg 430
+  parent: BaseStorageItem
+  id: WeaponRG430
+  description: Load granade for optimal results.
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Weapons/Guns/Launchers/rg_430.rsi
+    layers:
+    - state: base
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,0,1
+    - 1,0,0,0
+    whitelist:
+      tags:
+      - HandGrenade
+      - Grenade
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Effects/thunk.ogg
+    soundEmpty:
+      path: /Audio/Items/hiss.ogg
+    clumsyProof: true
+  - type: ContainerAmmoProvider
+    container: storagebase
+  - type: Item
+    size: Large
+  - type: Clothing
+    sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
+    quickEquip: false
+    slots:
+    - Back
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
--- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml
+++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/plasma_cutter.yml
@@ -0,0 +1,65 @@
+- type: entity
+  name: plasma cutter
+  parent: BaseWeaponBatterySmall
+  id: WeaponPlasmaCutter
+  description: A good mining tool that can help to break through the rocks really fast
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Weapons/Guns/Plasma/cutter.rsi
+    state: icon
+  - type: Gun
+    fireRate: 1
+    soundGunshot:
+      path: /Audio/_Wega/Weapons/Guns/Gunshots/plasma_cutter.ogg
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,2,1
+  - type: Battery
+    maxCharge: 1500
+    startingCharge: 1500
+  - type: PredictedBatterySelfRecharger
+    autoRechargeRate: 25
+  - type: BatteryAmmoProvider
+    proto: BulletPlasmaCutter
+    fireCost: 75
+  - type: Appearance
+
+- type: entity
+  parent: WeaponPlasmaCutter
+  id: WeaponPlasmaCutterEmpty
+  suffix: Empty
+  components:
+  - type: Battery
+    maxCharge: 1500
+    startingCharge: 0
+
+- type: entity
+  id: BulletPlasmaCutter
+  name: cutter bolt
+  parent: BaseBullet
+  description: A projectile of dectruction energy.
+  components:
+  - type: Sprite
+    noRot: false
+    sprite: _Wega/Objects/Weapons/Guns/Projectiles/bullet_cutter.rsi
+    layers:
+    - state: icon
+      shader: unshaded
+  - type: Projectile
+    deleteOnCollide: false
+    penetrationThreshold: 900
+    damage:
+      types:
+        Heat: 5
+        Structural: 30
+    penetrationDamageTypeRequirement:
+    - Structural
+  - type: StaminaDamageOnCollide
+    damage: 10
+  - type: TimedDespawn
+    lifetime: 0.2
+  - type: PointLight
+    radius: 1
+    color: blue
+    energy: 1
--- a/Resources/Prototypes/_Wega/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/_Wega/Entities/Structures/Power/chargers.yml
@@ -14,12 +14,11 @@
    allowedStates:
    - Alive
    - Critical
-    damageCap: 0
    damage:
      types:
-        Heat: -1
+        Heat: -2
      groups:
-        Brute: -1
+        Brute: -2
    slotId: entity_storage
    whitelist:
      components:
--- a/Resources/Prototypes/_Wega/Flavors/flavors.yml
+++ b/Resources/Prototypes/_Wega/Flavors/flavors.yml
@@ -332,3 +332,8 @@
  id: melon
  flavorType: Base
  description: flavor-base-melon
+
+- type: flavor
+  id: tangerine
+  flavorType: Base
+  description: flavor-base-tangerine
--- a/Resources/Prototypes/_Wega/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/_Wega/Hydroponics/seeds.yml
@@ -389,3 +389,57 @@
      Min: 1
      Max: 5
      PotencyDivisor: 20
+
+- type: seed
+  id: tangerine
+  name: seeds-tangerine-name
+  noun: seeds-noun-seeds
+  displayName: seeds-tangerine-display-name
+  plantRsi: _Wega/Objects/Specific/Hydroponics/tangerine.rsi
+  packetPrototype: TangerineSeeds
+  productPrototypes:
+    - FoodProduceTangerine
+  mutationPrototypes:
+    - festivetangerine
+  harvestRepeat: Repeat
+  lifespan: 50
+  maturation: 7
+  production: 5
+  yield: 3
+  potency: 10
+  growthStages: 7
+  chemicals:
+    Nutriment:
+      Min: 2
+      Max: 7
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 15
+
+- type: seed
+  id: festivetangerine
+  name: seeds-festivetangerine-name
+  noun: seeds-noun-seeds
+  displayName: seeds-festivetangerine-display-name
+  plantRsi: _Wega/Objects/Specific/Hydroponics/festive_tangerine.rsi
+  packetPrototype: FestiveTangerineSeeds
+  productPrototypes:
+    - FoodProduceFestiveTangerine
+  harvestRepeat: Repeat
+  lifespan: 50
+  maturation: 7
+  production: 5
+  yield: 3
+  potency: 10
+  growthStages: 5
+  chemicals:
+    Nutriment:
+      Min: 2
+      Max: 7
+      PotencyDivisor: 10
+    Vitamin:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 15
--- a/Resources/Prototypes/_Wega/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/_Wega/Loadouts/Miscellaneous/trinkets.yml
@@ -103,3 +103,31 @@
    back:
    - PlushieSharkBlue
  groupBy: "wegatoyload"
+
+- type: loadout
+  id: HatNewYearRed
+  storage:
+    back:
+    - ClothingHeadHatNewYearRed
+  groupBy: "weganewyearhats"
+
+- type: loadout
+  id: HatNewYearBlue
+  storage:
+    back:
+    - ClothingHeadHatNewYearBlue
+  groupBy: "weganewyearhats"
+
+- type: loadout
+  id: HatNewYearCyan
+  storage:
+    back:
+    - ClothingHeadHatNewYearCyan
+  groupBy: "weganewyearhats"
+
+- type: loadout
+  id: HatNewYearWega
+  storage:
+    back:
+    - ClothingHeadHatNewYearWega
+  groupBy: "weganewyearhats"
--- a/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/drinks.yml
@@ -264,6 +264,25 @@
      - !type:SatiateThirst
        factor: 2

+- type: reagent
+  id: JuiceTangerine
+  parent: BaseJuice
+  name: reagent-name-juicetangerine
+  group: Drinks
+  desc: reagent-desc-juicetangerine
+  physicalDesc: reagent-physical-desc-citric
+  flavor: tangerine
+  color: "#ff6000"
+  metamorphicSprite:
+    sprite: _Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi
+    state: icon
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+
 - type: reagent
  id: CatMelonJuice
  parent: BaseJuice
--- a/Resources/Prototypes/_Wega/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/_Wega/Recipes/Lathes/categories.yml
@@ -0,0 +1,3 @@
+- type: latheCategory
+  id: Anroid
+  name: lathe-category-android
--- a/Resources/Prototypes/_Wega/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/_Wega/Recipes/Lathes/clothing.yml
@@ -17,7 +17,7 @@
  materials:
    Cloth: 300
    Durathread: 100
-    Gold: 20
+    # Gold: 20

 - type: latheRecipe
  abstract: true
@@ -28,8 +28,8 @@
  materials:
    Cloth: 500
    Durathread: 200
-    Gold: 200
-    Silver: 100
+    # Gold: 200
+    # Silver: 100

 - type: latheRecipe
  abstract: true
--- a/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml
@@ -13,6 +13,21 @@
  id: BorgModuleCommonMedical
  result: BorgModuleCommonMedical

+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleCommonMagBoots
+  result: BorgModuleCommonMagBoots
+
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleCommonRepeir
+  result: BorgModuleCommonRepeir
+
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleCommonSpeed
+  result: BorgModuleCommonSpeed
+
 - type: latheRecipe
  parent: BaseBorgModuleRecipe
  id: BorgModuleCommonConstruction
@@ -58,11 +73,6 @@
  id: BorgModuleSheild
  result: BorgModuleSheild

- type: latheRecipe
-  parent: BaseGoldBorgModuleRecipe
-  id: BorgModuleSecLethal
-  result: BorgModuleSecLethal
-
 - type: latheRecipe
  parent: BaseGoldBorgModuleRecipe
  id: BorgModuleGranader
@@ -85,6 +95,8 @@
  parent: BaseRoboticsRecipe
  id: Tyriumpack
  result: Tyriumpack1
+  categories:
+    - Anroid
  completetime: 1
  materials:
    Steel: 20
@@ -95,6 +107,8 @@
  parent: BaseRoboticsRecipe
  id: AndroidBodyPart
  result: AndroidBodyPart
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 300
@@ -105,6 +119,8 @@
  parent: BaseRoboticsRecipe
  id: ArmSyntheticPry
  result: LeftArmSyntheticPry
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 750
@@ -116,6 +132,8 @@
  parent: BaseRoboticsRecipe
  id: ArmSyntheticDefib
  result: LeftArmSyntheticDefib
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 750
@@ -126,6 +144,8 @@
  parent: BaseRoboticsRecipe
  id: ArmSyntheticProtoKinetic
  result: LeftArmSyntheticProtoKinetic
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 750
@@ -137,6 +157,8 @@
  parent: BaseRoboticsRecipe
  id: ArmSyntheticCharger
  result: LeftArmSyntheticCharger
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 750
@@ -147,6 +169,8 @@
  parent: BaseRoboticsRecipe
  id: LegSyntheticMagboots
  result: LeftLegSyntheticMagboots
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 750
@@ -157,6 +181,8 @@
  parent: BaseRoboticsRecipe
  id: LegSyntheticJump
  result: LeftLegSyntheticJump
+  categories:
+    - Anroid
  completetime: 5
  materials:
    Steel: 750
--- a/Resources/Prototypes/_Wega/Research/arsenal.yml
+++ b/Resources/Prototypes/_Wega/Research/arsenal.yml
@@ -25,7 +25,6 @@
  - WeaponXrayCannon
  - WeaponTaser
  - WeaponDominator
-  - BorgModuleSecLethal # Corvax-Wega-Arsenal
  - PortableRechargerBag
  - PortableRechargerTurbo

--- a/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-equipped-SUITSTORAGE.png
+++ b/Resources/Textures/Objects/Power/portable_recharger.rsi/charging-equipped-SUITSTORAGE.png
--- a/Resources/Textures/Objects/Power/portable_recharger.rsi/meta.json
+++ b/Resources/Textures/Objects/Power/portable_recharger.rsi/meta.json
@@ -21,7 +21,7 @@
      ]
    },
    {
-      "name": "charging-equipped-BACKPACK",
+      "name": "charging-equipped-SUITSTORAGE",
      "directions": 4,
      "delays": [
        [
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
@@ -21,6 +21,20 @@
    {
      "name": "inhand-right",
      "directions": 4
+    },
+    {
+      "name": "orebag_off"
+    },
+    {
+      "name": "orebag_on",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
    }
  ]
 }
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/orebag_off.png
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/orebag_off.png
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/orebag_on.png
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/orebag_on.png
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json
@@ -1,7 +1,7 @@
 {
  "version": 1,
  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/5ce5a66c814c4a60118d24885389357fd0240002/icons/obj/mining.dmi",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/5ce5a66c814c4a60118d24885389357fd0240002/icons/obj/mining.dmi , ON state sprite by PuroSlavKing (Github)",
  "size": {
    "x": 32,
    "y": 32
@@ -106,6 +106,37 @@
          0.1
        ]
      ]
+    },
+    {
+      "name": "orebag_off",
+      "delays": [
+        [
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1
+        ]
+      ]
+    },
+    {
+      "name": "orebag_on",
+      "delays": [
+        [
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1,
+            0.1
+        ]
+      ]
    }
  ]
 }
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/orebag_off.png
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/orebag_off.png
--- a/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/orebag_on.png
+++ b/Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/orebag_on.png
--- a/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/bottom-equipped-HEAD.png
+++ b/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/bottom-equipped-HEAD.png
--- a/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/bottom-icon.png
+++ b/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/bottom-icon.png
--- a/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/equipped-HEAD.png
+++ b/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/equipped-HEAD.png
--- a/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/icon.png
+++ b/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/icon.png
--- a/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/meta.json
+++ b/Resources/Textures/_Wega/Clothing/Head/Hats/new_yearhat.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Creaetb by @melissandravov (751536199180484698) on discord",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "bottom-icon"
+    },
+    {
+      "name": "equipped-HEAD",
+      "directions": 4
+    },
+    {
+      "name": "bottom-equipped-HEAD",
+      "directions": 4
+    }
+  ]
+}
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/candy-module.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/candy-module.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/cook-rare.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/cook-rare.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/lethal-rare.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/lethal-rare.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/magboots.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/magboots.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/med-rare.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/med-rare.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json
@@ -19,6 +19,12 @@
        {
            "name": "hand-module"
        },
+        {
+            "name": "candy-module"
+        },
+        {
+            "name": "repeir-module"
+        },
        {
            "name": "kinetic-weapon-module"
        },
@@ -51,6 +57,30 @@
        },
        {
            "name": "zipper-module"
+        },
+        {
+            "name": "cook-rare"
+        },
+        {
+            "name": "rcd-rare"
+        },
+        {
+            "name": "med-rare"
+        },
+        {
+            "name": "mining-rare"
+        },
+        {
+            "name": "ubor-rare"
+        },
+        {
+            "name": "lethal-rare"
+        },
+        {
+            "name": "magboots"
+        },
+        {
+            "name": "speed"
        }
    ]
 }
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/mining-rare.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/mining-rare.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/rcd-rare.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/rcd-rare.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/repeir-module.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/repeir-module.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/speed.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/speed.png
--- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/ubor-rare.png
+++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/ubor-rare.png
--- a/Resources/Textures/_Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi/icon.png
+++ b/Resources/Textures/_Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi/icon.png
--- a/Resources/Textures/_Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi/icon_empty.png
+++ b/Resources/Textures/_Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi/icon_empty.png
--- a/Resources/Textures/_Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi/meta.json
+++ b/Resources/Textures/_Wega/Objects/Consumable/Drinks/juice_tangerine_glass.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "by <536468117468086274>",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        }
+    ]
+}
--- a/Resources/Textures/_Wega/Objects/Power/portable_rechargeres/bag_portable_recharger.rsi/charging-equipped-SUITSTORAGE.png
+++ b/Resources/Textures/_Wega/Objects/Power/portable_rechargeres/bag_portable_recharger.rsi/charging-equipped-SUITSTORAGE.png
--- a/Resources/Textures/_Wega/Objects/Power/portable_rechargeres/bag_portable_recharger.rsi/meta.json
+++ b/Resources/Textures/_Wega/Objects/Power/portable_rechargeres/bag_portable_recharger.rsi/meta.json
@@ -21,7 +21,7 @@
      ]
    },
    {
-      "name": "charging-equipped-BACKPACK",
+      "name": "charging-equipped-SUITSTORAGE",
      "directions": 4,
      "delays": [
        [
--- a/Show More
+++ b/Show More