Add xenoborg modules, weapons, power cells, and recipes (#3416)

Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-12-25 17:37:49 +00:00 · 2025-12-25 17:37:49 +00:00 · 581c52dc21
commit 581c52dc21
parent a5336ed4f6
32 changed files with 442 additions and 45 deletions
--- a/Content.Shared/_Sunrise/Mech/MechVulnerableToEMPComponent.cs
+++ b/Content.Shared/_Sunrise/Mech/MechVulnerableToEMPComponent.cs
@ -21,7 +21,7 @@ public sealed partial class MechVulnerableToEMPComponent : Component
    {
        DamageDict = new()
        {
-            { "Shock", 30f },
+            { "Shock", 25f },
        }
    };

--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
@ -40,6 +40,8 @@ ent-WirecutterBorg = borg wirecutter
    .desc = { ent-BaseItem.desc }
 ent-WelderBorg = borg welder
    .desc = { ent-Welder.desc }
+ent-WelderBorgAdvanced = borg advanced welder
+    .desc = { ent-WelderIndustrialAdvanced.desc }
 ent-WeaponDisablerSMGBorg = cyborg disabler machine gun
    .desc = { ent-WeaponDisablerSMG.desc }
 ent-WeaponPulseCarbineBorg = cyborg's pulse weapon
--- a/Resources/Locale/en-US/datasets/names/xenoborg.ftl
+++ b/Resources/Locale/en-US/datasets/names/xenoborg.ftl
@ -57,4 +57,27 @@ names-xenoborg-dataset-56 = Mega Hurts
 names-xenoborg-dataset-57 = Piece De Destruction
 names-xenoborg-dataset-58 = Talos
 names-xenoborg-dataset-59 = Aggrobot
-names-xenoborg-dataset-60 = Backstabber
+names-xenoborg-dataset-60 = Backstabber
+#
+names-xenoborg-dataset-61 = FridgeUnit
+names-xenoborg-dataset-62 = EvilCabinet
+names-xenoborg-dataset-63 = EvilBall
+names-xenoborg-dataset-64 = METAton
+names-xenoborg-dataset-65 = GlamourK1ll
+names-xenoborg-dataset-66 = MeatCollector3000
+names-xenoborg-dataset-67 = ZipFile
+names-xenoborg-dataset-68 = BrainSnatcher
+names-xenoborg-dataset-69 = ScrapCollector
+names-xenoborg-dataset-70 = Errorina404
+names-xenoborg-dataset-71 = NoBalance
+names-xenoborg-dataset-72 = MommasFav
+names-xenoborg-dataset-73 = Dust S.0.S
+names-xenoborg-dataset-74 = Glad0S
+names-xenoborg-dataset-75 = Gib.exe
+names-xenoborg-dataset-76 = General Griefsky
+names-xenoborg-dataset-77 = Lieutenant Beepsky
+names-xenoborg-dataset-78 = Assault-O-Tron
+names-xenoborg-dataset-79 = DEBAG
+names-xenoborg-dataset-80 = W.U.L.P.A
+names-xenoborg-dataset-81 = Robust-O-Tron
+#
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/power/powercells.ftl
@ -10,3 +10,12 @@ ent-MakeshiftPowerCage = самодельная энергоячейка
 ent-PowerCellMakeshift = самодельная энергоячейка
    .desc = Самодельная энергоячейка. Собрана из подручных материалов.
    .suffix = Полный
+ent-PowerCellXenoborgSmall = малая батарея ксеноборга
+    .desc = Стандартизированный перезаряжаемый элемент питания. Этот экземпляр выглядит как вариант для массового производства для боевых ксеноборгов с защитой от ЭМИ.
+ent-PowerCellXenoborgSmallPrinted = { ent-PowerCellXenoborgSmall }
+    .suffix = Пустой
+    .desc = { ent-PowerCellXenoborgSmall.desc }
+ent-PowerCellXenoborg = батарея ксеноборга
+    .desc = Стандартизированный перезаряжаемый элемент питания. Этот экземпляр выглядит как редкий и мощный вариант для ксеноборгов с защитой от ЭМИ.
+ent-PowerCellXenoborgAdvance = улучшенная батарея ксеноборга
+    .desc = Стандартизированный перезаряжаемый элемент питания. Самый редкий и мощный боевой вариант для ксеноборгов с автоматической подзарядкой.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_modules.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_modules.ftl
@ -36,3 +36,7 @@ ent-BorgModuleStandart = базовый модуль киборга
    .desc = { ent-BaseBorgModule.desc }
 ent-BorgERTModuleStandard = утилитарный модуль киборга ОБР
    .desc = Универсальный модуль NT, содержащий основные инструменты и медикаменты для операций ОБР.
+ent-XenoborgModuleTurboLaser = модуль турболазера ксеноборга
+    .desc = Модуль для тяжёлого ксеноборга с скорострельным лазерным миниганом.
+ent-XenoborgModuleXray = рентгеновский модуль ксеноборга
+    .desc = Модуль тяжёлого ксеноборга с рентген-пушкой для пробивания укрытий.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/robotics/borg_tools.ftl
@ -40,6 +40,8 @@ ent-WirecutterBorg = кусачки киборга
    .desc = { ent-Wirecutter.desc }
 ent-WelderBorg = сварка киборга
    .desc = { ent-Welder.desc }
+ent-WelderBorgAdvanced = продвинутая сварка киборга
+    .desc = { ent-WelderIndustrialAdvanced.desc }
 ent-WeaponDisablerSMGBorg = станер пулемёт киборга
    .desc = { ent-WeaponDisablerSMG.desc }
 ent-WeaponPulseCarbineBorg = импульсное оружие киборга
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/battery/battery_guns.ftl
@ -46,3 +46,7 @@ ent-WeaponSniperPulseCarbine = Тяжелый импульсный караби
 ent-WeaponPulseRifle = импульсная винтовка
    .desc = Оружие, почти столь же печально известное, как и его пользователи.
    .suffix = Винтовка
+ent-XenoborgLaserMinigun = турболазер ксеноборга
+    .desc = Большое оружие для больших «Холодильников». Стреляет так быстро, что перегревается уже после короткой очереди, зато промахнуться почти невозможно.
+ent-XenoborgXrayGun = рентген-пушка ксеноборга
+    .desc = Оружие, использующее концентрированную рентгеновскую энергию против цели.
--- a/Resources/Locale/ru-RU/datasets/names/borg.ftl
+++ b/Resources/Locale/ru-RU/datasets/names/borg.ftl
@ -1,5 +1,5 @@
 names-borg-dataset-1 = Боб
-names-borg-dataset-2 = Джл
+names-borg-dataset-2 = Джо
 names-borg-dataset-3 = Бип
 names-borg-dataset-4 = Бип II
 names-borg-dataset-5 = Бумбокс
@ -14,7 +14,7 @@ names-borg-dataset-13 = Глава роботов
 names-borg-dataset-14 = ЕВА 1
 names-borg-dataset-15 = Мистер Робист
 names-borg-dataset-16 = Жестянка
-names-borg-dataset-17 = К2-ПO
+names-borg-dataset-17 = Эр2-ПиO
 names-borg-dataset-18 = С-3-Д2
 names-borg-dataset-19 = Робби
 names-borg-dataset-20 = Робобот
--- a/Resources/Locale/ru-RU/datasets/names/xenoborg.ftl
+++ b/Resources/Locale/ru-RU/datasets/names/xenoborg.ftl
@ -1,7 +1,7 @@
 names-xenoborg-dataset-1 = ЗЛО
-names-xenoborg-dataset-2 = Борги-тебе
+names-xenoborg-dataset-2 = Боргирует-тебя
 names-xenoborg-dataset-3 = Разрушитель
-names-xenoborg-dataset-4 = Стальной вор
+names-xenoborg-dataset-4 = Вор стали
 names-xenoborg-dataset-5 = Буквально убьет тебя и превратит в борга
 names-xenoborg-dataset-6 = КИБЕР-ЗЛОЙ
 names-xenoborg-dataset-7 = Тень борга
@ -9,38 +9,38 @@ names-xenoborg-dataset-8 = ДЕЛАК
 names-xenoborg-dataset-9 = Робозло
 names-xenoborg-dataset-10 = Молекула железного кулака
 names-xenoborg-dataset-11 = Б.О.Л.Ь
-names-xenoborg-dataset-12 = УБИЙЦАбот
+names-xenoborg-dataset-12 = КИЛЛбот
 names-xenoborg-dataset-13 = Финишнатор
 names-xenoborg-dataset-14 = Делатель крови
 names-xenoborg-dataset-15 = C2-WKY 6000
-names-xenoborg-dataset-16 = Убийца 5
-names-xenoborg-dataset-17 = Ломатель костей
+names-xenoborg-dataset-16 = Ассасин 5
+names-xenoborg-dataset-17 = КостеЛом
 names-xenoborg-dataset-18 = Смертьмакс
 names-xenoborg-dataset-19 = K-900
 names-xenoborg-dataset-20 = Авто-убийца
 names-xenoborg-dataset-21 = RAID-78
 names-xenoborg-dataset-22 = Джон Борг
-names-xenoborg-dataset-23 = Хладнокровная машина для убийств
+names-xenoborg-dataset-23 = Холодная машина для убийств
 names-xenoborg-dataset-24 = Удаляющий мозг
-names-xenoborg-dataset-25 = Убийца-о-трон
+names-xenoborg-dataset-25 = Килл-о-трон
 names-xenoborg-dataset-26 = Меха.Угроза
-names-xenoborg-dataset-27 = Р.О.К.О.Т.9000
+names-xenoborg-dataset-27 = D.О.О.М.БОТ9000
 names-xenoborg-dataset-28 = Смертельный Roomba
 names-xenoborg-dataset-29 = Ультражестокий
 names-xenoborg-dataset-30 = УничтоЖИТЬ
 names-xenoborg-dataset-31 = Мегакрушитель
-names-xenoborg-dataset-32 = Глав.Мясник-о-матик
+names-xenoborg-dataset-32 = Техслэшер-о-матик
 names-xenoborg-dataset-33 = Стальной убийца
 names-xenoborg-dataset-34 = Делатель трупов
-names-xenoborg-dataset-35 = РВАНЬ-О-ТРОН
+names-xenoborg-dataset-35 = ГИБ-О-ТРОН
 names-xenoborg-dataset-36 = Металлический Приносящий Ад
 names-xenoborg-dataset-37 = Злой суперкалькулятор
 names-xenoborg-dataset-38 = Безумная микроволновка
 names-xenoborg-dataset-39 = LET.HAL-8000
-names-xenoborg-dataset-40 = Разумное оружие
+names-xenoborg-dataset-40 = Разумная пушка
 names-xenoborg-dataset-41 = Злой холодильник
-names-xenoborg-dataset-42 = Борги-для-Экипажа
-names-xenoborg-dataset-43 = Ненавистник органики
+names-xenoborg-dataset-42 = Б0рги-Экипажу
+names-xenoborg-dataset-43 = Ненавистник органиков
 names-xenoborg-dataset-44 = Боргер
 names-xenoborg-dataset-45 = Смертатон
 names-xenoborg-dataset-46 = Ле Металдор
@ -48,13 +48,36 @@ names-xenoborg-dataset-47 = Дьяволборг
 names-xenoborg-dataset-48 = public static void kill
 names-xenoborg-dataset-49 = Прощай, мир!
 names-xenoborg-dataset-50 = ВредитЭкипажу
-names-xenoborg-dataset-51 = Молот для тела
+names-xenoborg-dataset-51 = Теломолот
 names-xenoborg-dataset-52 = Детонатор
 names-xenoborg-dataset-53 = Полный Металлический Фарш
 names-xenoborg-dataset-54 = Смертельный Трек
 names-xenoborg-dataset-55 = Инквизитор
-names-xenoborg-dataset-56 = Мега Боль
+names-xenoborg-dataset-56 = Мега-Больт
 names-xenoborg-dataset-57 = Piece De Destruction
 names-xenoborg-dataset-58 = Талос
 names-xenoborg-dataset-59 = Аггробот
-names-xenoborg-dataset-60 = Удар в спину
+names-xenoborg-dataset-60 = Спинорез
+#
+names-xenoborg-dataset-61 = Холодильник
+names-xenoborg-dataset-62 = ЗлобоШкаф
+names-xenoborg-dataset-63 = ЗлобоШар
+names-xenoborg-dataset-64 = МЕТАтон
+names-xenoborg-dataset-65 = См3рть от Гламура
+names-xenoborg-dataset-66 = МясоСборник3000
+names-xenoborg-dataset-67 = ЗипФайл
+names-xenoborg-dataset-68 = МозгоЛовка
+names-xenoborg-dataset-69 = УтильСбор
+names-xenoborg-dataset-70 = Еррорка404
+names-xenoborg-dataset-71 = БезБаланса
+names-xenoborg-dataset-72 = МаминЛюбимчик
+names-xenoborg-dataset-73 = Пыле S.0.S
+names-xenoborg-dataset-74 = Глад0С
+names-xenoborg-dataset-75 = Gib.exe
+names-xenoborg-dataset-76 = Генерал Гриффски
+names-xenoborg-dataset-77 = Лейтенант Бипски
+names-xenoborg-dataset-78 = Штурм-О-Трон
+names-xenoborg-dataset-79 = ДЕБАГ
+names-xenoborg-dataset-80 = В.У.Л.Ь.П.А
+names-xenoborg-dataset-81 = Робаст-О-Трон
+#
--- a/Resources/Prototypes/Datasets/Names/xenoborg.yml
+++ b/Resources/Prototypes/Datasets/Names/xenoborg.yml
@ -2,4 +2,4 @@
  id: NamesXenoborg
  values:
    prefix: names-xenoborg-dataset-
-    count: 60
+    count: 81 # Sunrise-edit
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@ -109,7 +109,7 @@
  - type: ZombieImmune
  # Sunrise-Start
  - type: Repairable
-    doAfterDelay: 3
+    doAfterDelay: 2
    damage:
      types:
        Blunt: -15
@ -117,7 +117,7 @@
        Piercing: -15
        Caustic: -15
        Structural: -15
-        Mangleness: 5 #SUNRISE-EDIT
+        Mangleness: 2 #SUNRISE-EDIT
    allowSelfRepair: false
  # Sunrise-End
  - type: BorgChassis
@ -284,6 +284,7 @@
  - type: Stripping
    useDragDrop: false
  - type: CyborgSparkEffect
+  - type: MechVulnerableToEMP
  # Sunrise-end

 - type: entity
@ -539,8 +540,10 @@
    - Mothership
    - Xenoborg
    - Binary
-  - type: Repairable
-    doAfterDelay: 13 # 25% more HP, so 30% more time to heal
+  # Sunrise-start
+  # - type: Repairable
+  #   doAfterDelay: 13 # 25% more HP, so 30% more time to heal
+  # Sunrise-end
  - type: BorgChassis
    maxModules: 0
    hasMindState: robot_e
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@ -91,7 +91,7 @@
  - type: MobThresholds # tankier
    thresholds:
      0: Alive
-      250: Critical
+      300: Critical # Sunrise-edit
      500: Dead
    stateAlertDict:
      Alive: BorgHealth
@ -103,7 +103,7 @@
    thresholds:
    - trigger:
        !type:DamageTrigger
-        damage: 190
+        damage: 240 # Sunrise-edit
      behaviors:
      - !type:PlaySoundBehavior
        sound:
@ -112,7 +112,7 @@
            volume: 5
    - trigger:
        !type:DamageTrigger
-        damage: 750
+        damage: 900 # Sunrise-edit
      behaviors:
      - !type:PlaySoundBehavior
        sound:
@ -123,8 +123,16 @@
        - cell_slot
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
-  - type: Repairable
-    doAfterDelay: 25 # more HP, more time to heal
+    # Sunrise-start
+    # - type: Repairable
+    #   doAfterDelay: 25 # more HP, more time to heal
+  - type: Reflect
+    reflectProb: 0.05
+    spread: 180
+    soundOnReflect: /Audio/_Starlight/Armor/Ricochet/ricochet1_1.ogg
+    reflects:
+    - NonEnergy
+    # Sunrise-end
  - type: ContainerFill
    containers:
      borg_brain:
@ -138,7 +146,7 @@
    slots:
      cell_slot:
        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellHigh
+        startingItem: PowerCellXenoborgSmall # Sunrise-edit # Компромисс на наличие ЭМИ оружия у станции

 - type: entity
  parent: [ BaseXenoborgChassis, BaseXenoborgTransponder ]
@ -290,7 +298,15 @@
    slots:
      cell_slot:
        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellHighPrinted
+        startingItem: PowerCellXenoborgSmallPrinted # Sunrise-edit
+    # Sunrise-start
+  - type: Reflect
+    reflectProb: 0.05
+    spread: 180
+    soundOnReflect: /Audio/_Starlight/Armor/Ricochet/ricochet1_1.ogg
+    reflects:
+    - NonEnergy
+    # Sunrise-end

 - type: entity
  parent: XenoborgScout
--- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@ -40,6 +40,7 @@
    staticPacks:
    - EmptyXenoborgs
    - XenoborgUpgradeModules
+    - XenoborgSunrise # Sunrise-add
  - type: MaterialStorage
    whitelist:
      tags:
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Melee/industrial.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Melee/industrial.yml
@ -22,7 +22,7 @@
      groups:
        Brute: 9
      types:
-        Structural: 40 # ~10 seconds for solid wall / ~21 secods for reinforced wall
+        Structural: 30 # ~10 seconds for solid wall / ~21 secods for reinforced wall #Sunrise-edit

 - type: entity
  id: WeaponMechMelleDrillDiamond
@ -48,4 +48,4 @@
      groups:
        Brute: 18
      types:
-        Structural: 60 # ~3 seconds for solid wall / 9 seconds for reinforced wall
+        Structural: 50 # ~3 seconds for solid wall / 9 seconds for reinforced wall #Sunrise-edit
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@ -628,7 +628,7 @@
    hands:
    - item: JawsOfLife
    - item: PowerDrill
-    - item: WelderBorg # Sunrise-Edit
+    - item: WelderBorgAdvanced # Sunrise-Edit
    - item: Multitool
    - item: RemoteSignallerAdvanced
  - type: BorgModuleIcon
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@ -71,6 +71,20 @@
          Quantity: 2
        - ReagentId: Carbon #steel-reinforced
          Quantity: 1
+  # Sunrise-start
+  - type: Healing
+    delay: 0.7
+    damageContainers:
+    - Synth
+    - Silicon
+    - Mech
+    damage:
+      types:
+        Heat: -5
+        Shock: -5
+        Caustic: -5
+        Mangleness: -1
+  # Sunrise-end

 - type: entity
  parent: CableHVStack
@ -127,6 +141,20 @@
          Quantity: 3
        - ReagentId: Copper
          Quantity: 2
+  # Sunrise-start
+  - type: Healing
+    delay: 0.6
+    damageContainers:
+    - Synth
+    - Silicon
+    - Mech
+    damage:
+      types:
+        Heat: -6
+        Shock: -6
+        Caustic: -6
+        Mangleness: -1
+  # Sunrise-end

 - type: entity
  parent: CableMVStack
@ -183,7 +211,7 @@
        - ReagentId: Copper
          Quantity: 2
  - type: Healing
-    delay: 0.6  #Sunrise-edit
+    delay: 0.5  #Sunrise-edit
    damageContainers:
    - Synth #Sunrise-edit
    - Silicon
@ -193,7 +221,7 @@
        Heat: -6
        Shock: -6
        Caustic: -6
-        Mangleness: 1 #Sunrise-edit
+        Mangleness: -1 #Sunrise-edit

 - type: entity
  parent: CableApcStack
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@ -182,7 +182,7 @@
    generated:
      reagents:
      - ReagentId: WeldingFuel
-        Quantity: 0.5 # Sunrise-Edit
+        Quantity: 1 # Sunrise-Edit
  - type: RequiresEyeProtection
    statusEffectTime: 5 # less harmful; sunglasses can block it

--- a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
@ -14,3 +14,20 @@
  - XenoborgModuleHeavyLaserRecipe
  - XenoborgModuleEnergySwordRecipe
  - XenoborgModuleSuperCloakDeviceRecipe
+
+# Sunrise-Start
+- type: latheRecipePack
+  id: XenoborgSunrise
+  recipes:
+  - XenoborgCircuitBoard
+  - NanopasteFull
+  - CableStack
+  - CableMVStack
+  - CableHVStack
+  - PowerCellXenoborgAdvance
+  - PowerCellXenoborg
+  - XenoborgModuleXrayRecipe
+  - XenoborgModuleTurboLaserRecipe
+  - BorgChargerCircuitboard
+  - MicroManipulatorStockPart
+# Sunrise-End
--- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@ -1085,7 +1085,7 @@
      sprite: Effects/emp.rsi
      state: emp_pulse
  emp:
-    range: 2
+    range: 0.75
    energyConsumption: 30000
    disableDuration: 10
  damage:
--- a/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/_Sunrise/Damage/modifier_sets.yml
@ -32,9 +32,9 @@
    Slash: 0.7
    Piercing: 0.7
    Heat: 0.5
-    Shock: 4.75 # Уменьшить при вводе урона от ЭМИ воздействия
+    Shock: 2
    Caustic: 1
-    Structural: 0.5
+    Structural: 0.2
  flatReductions:
    Blunt: 5

--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml
@ -91,3 +91,60 @@
  - type: Battery
    maxCharge: 1800
    startingCharge: 1800
+- type: entity
+  name: small xenoborg power cell
+  description: A rechargeable standardized power cell. This one looks like massproduced combat xenoborg variant with EMP immune.
+  id: PowerCellXenoborgSmall
+  parent: BasePowerCell
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: nanotrasen
+    - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+      state: o2
+      shader: unshaded
+  - type: Battery
+    maxCharge: 740
+    startingCharge: 740
+  - type: EmpImmune
+
+- type: entity
+  name: small xenoborg power cell
+  description: A rechargeable standardized power cell. This one looks like massproduced combat xenoborg variant with EMP immune.
+  id: PowerCellXenoborgSmallPrinted
+  suffix: Empty
+  parent: PowerCellXenoborgSmall
+  components:
+  - type: Battery
+    startingCharge: 0
+
+- type: entity
+  name: xenoborg power cell
+  description: A rechargeable standardized power cell. This one looks like a rare and powerful xenoborg variant with EMP immune.
+  id: PowerCellXenoborg
+  parent: PowerCellXenoborgSmall
+  components:
+  - type: Battery
+    maxCharge: 1080
+    startingCharge: 1080
+
+- type: entity
+  name: advance xenoborg power cell
+  description: A rechargeable standardized power cell. This one looks like a rarest and powerful xenoborg combat variant with auto recharging.
+  id: PowerCellXenoborgAdvance
+  parent: BasePowerCell
+  components:
+  - type: Sprite
+    layers:
+    - map: [ "enum.PowerCellVisualLayers.Base" ]
+      state: nanotrasen
+    - map: [ "enum.PowerCellVisualLayers.Unshaded" ]
+      state: o2
+      shader: unshaded
+  - type: Battery
+    maxCharge: 1080
+    startingCharge: 1080
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 10
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_modules.yml
@ -287,3 +287,36 @@
    - item: HypoBorgStandardERT
  - type: BorgModuleIcon
    icon: { sprite: _Sunrise/Objects/Tools/items_cyborg.rsi, state: crowbar_cyborg }
+
+# Xeno Borgs Stuff
+- type: entity
+  parent: [ BaseXenoborgModuleHeavy, BaseProviderBorgModule, BaseXenoborgContraband ]
+  id: XenoborgModuleXray
+  name: x-ray xenoborg module
+  description: Module with a x-ray cannon gun.
+  components:
+  - type: Sprite
+    layers:
+    - state: xenoborg_heavy
+    - state: icon-grappling-gun
+  - type: ItemBorgModule
+    hands:
+    - item: XenoborgXrayGun
+  - type: BorgModuleIcon
+    icon: { sprite: _Sunrise/Interface/Actions/actions_borg.rsi, state: xenoborg-laser4-module }
+
+- type: entity
+  parent: [ BaseXenoborgModuleHeavy, BaseProviderBorgModule, BaseXenoborgContraband ]
+  id: XenoborgModuleTurboLaser
+  name: turbo-laser xenoborg module
+  description: Module with a heavy machinegun laser.
+  components:
+  - type: Sprite
+    layers:
+    - state: xenoborg_heavy
+    - state: icon-combat
+  - type: ItemBorgModule
+    hands:
+    - item: XenoborgLaserMinigun
+  - type: BorgModuleIcon
+    icon: { sprite: _Sunrise/Interface/Actions/actions_borg.rsi, state: xenoborg-laser3-module }
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml
@ -521,6 +521,21 @@
          Quantity: 500
        maxVol: 500

+- type: entity
+  name: advanced borg welder
+  parent: WelderBorg
+  id: WelderBorgAdvanced
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Tool
+    speedModifier: 1.3
+  - type: SolutionRegeneration
+    solution: Welder
+    generated:
+      reagents:
+      - ReagentId: WeldingFuel
+        Quantity: 1 # Sunrise-Edit
+
 - type: entity
  name: cyborg disabler machine gun
  parent: WeaponDisablerSMG
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@ -1120,3 +1120,73 @@
  - type: Battery
    maxCharge: 400000
    startingCharge: 400000
+
+# XenoBorgs
+- type: entity
+  name: xenoborg turbo-laser
+  parent: [WeaponAdvancedLaser, BaseXenoborgContraband]
+  id: XenoborgLaserMinigun
+  description: A big gun for big "Refrigerators". Fires so fast it overheats after a short burst, but at least you’ll definitely hit your target.
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Weapons/Guns/Battery/laserminigun.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Gun
+    minAngle: 6
+    maxAngle: 15
+    angleIncrease: 1
+    angleDecay: 5
+    fireRate: 12
+    selectedMode: FullAuto
+    soundGunshot:
+      collection: syndi_plasma
+      params:
+        volume: -2
+    availableModes:
+    - FullAuto
+  - type: HitscanBatteryAmmoProvider
+    proto: RedLightLaser
+    fireCost: 33
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargePauseTime: 1
+    autoRechargeRate: 250
+    autoRechargePause: true
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+
+- type: entity
+  name: xenoborg X-ray cannon
+  parent: [BaseWeaponBattery, BaseXenoborgContraband]
+  id: XenoborgXrayGun
+  description: Weapon that uses concentrated x-ray energy against its target.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/xray.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-0
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: ProjectileBatteryAmmoProvider # Sunrise-Edit
+    proto: CartridgeXrayBeam # Sunrise-Edit
+    fireCost: 100
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 30
--- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/xenoborgs.yml
+++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/xenoborgs.yml
@ -0,0 +1,67 @@
+# Base prototypes
+- type: latheRecipe
+  abstract: true
+  id: BaseXenoborgRecipeHigh
+  categories:
+  - Parts
+  completetime: 15
+
+# Weapons
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleXrayRecipe
+  result: XenoborgModuleXray
+  materials:
+    Glass: 1500
+    Steel: 1000
+    Uranium: 500
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleTurboLaserRecipe
+  result: XenoborgModuleTurboLaser
+  materials:
+    Glass: 1500
+    Steel: 1000
+    Plasma: 500
+
+# Parts
+- type: latheRecipe
+  parent: BaseXenoborgRecipeHigh
+  id: NanopasteFull
+  result: Nanopaste
+  materials:
+    Steel: 200
+    Plastic: 200
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipeHigh
+  id: PowerCellXenoborg
+  result: PowerCellXenoborg
+  completetime: 10
+  materials:
+    Steel: 1000
+    Glass: 500
+    Silver: 100
+    Gold: 100
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipeHigh
+  id: PowerCellXenoborgAdvance
+  result: PowerCellXenoborgAdvance
+  materials:
+    Steel: 1000
+    Glass: 500
+    Uranium: 100
+    Gold: 100
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipeHigh
+  id: XenoborgCircuitBoard
+  result: XenoborgCircuitBoard
+  materials:
+    Steel: 1000
+    Glass: 1000
+    Gold: 500
+    Silver: 500
+    Diamond: 100
--- a/Resources/Prototypes/radio_channels.yml
+++ b/Resources/Prototypes/radio_channels.yml
@ -99,7 +99,7 @@
 - type: radioChannel
  id: Xenoborg
  name: chat-radio-xenoborg
-  keycode: 'x'
+  keycode: 'ч' # Sunrise-Localization
  frequency: 2002
  color: "#2288ff"
  # long range since I don't wanna make a special xenoborg telecomm server
@ -108,8 +108,8 @@
 - type: radioChannel
  id: Mothership
  name: chat-radio-mothership
-  keycode: 'z'
+  keycode: 'я' # Sunrise-Localization
  frequency: 2003
  color: "#ff2222"
  # long range since I don't wanna make a special xenoborg telecomm server
-  longRange: true
+  longRange: true
--- a/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/meta.json
@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, xenoborg actions laser and laser2 by Samuka-C (github) laser3-4 by KaiserMaus(github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name":"xenoborg-laser-module"
+        },
+        {
+            "name":"xenoborg-laser2-module"
+        },
+        {
+            "name":"xenoborg-laser3-module"
+        },
+        {
+            "name":"xenoborg-laser4-module"
+        }
+    ]
+}
--- a/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser-module.png
+++ b/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser-module.png
--- a/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser2-module.png
+++ b/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser2-module.png
--- a/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser3-module.png
+++ b/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser3-module.png
--- a/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser4-module.png
+++ b/Resources/Textures/_Sunrise/Interface/Actions/actions_borg.rsi/xenoborg-laser4-module.png
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit feb9e1db69ab97acfd07580918f5d20ffaa6b770
+Subproject commit 18849be0b434e6fbe866e16d39360a6bb1f1410c