. (#420)

* centcom * coolbob * fix * fix2 * fix_tag_rebalance_ore * buffdragon * чёто на атмосянском * fix43 * rebalance * Update paper.yml # Conflicts: # Resources/Prototypes/_Wega/Entities/Objects/Misc/paper.yml * fix * armor * -isoly --------- Co-authored-by: liegend <2008.morozov.ri@gmail.com> Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
2026-06-09 10:06:49 +02:00 · 2026-05-29 02:39:06 +03:00
parent 765757c84a
commit 54bcf9033b
122 changed files with 1173 additions and 220 deletions
@@ -39,6 +39,7 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component
    public List<ProtoId<CargoMarketPrototype>> Markets = new()
    {
        "market",
+        "sec",
    };

    // TODO: Can probably dump this
@@ -35,6 +35,9 @@ public sealed partial class DragonRiftComponent : SharedDragonRiftComponent
    [ViewVariables(VVAccess.ReadWrite), DataField("spawnCooldown")]
    public float SpawnCooldown = 30f;

-    [ViewVariables(VVAccess.ReadWrite), DataField("spawn", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string SpawnPrototype = "MobCarpDragon";
+    [DataField(required: true)] // Corvax-Wega-Add
+    public Dictionary<EntProtoId, float> SpawnWeights = new(); // Corvax-Wega-Add
+
+    // [ViewVariables(VVAccess.ReadWrite), DataField("spawn", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))] Corvax-Wega-Change
+    // public string SpawnPrototype = "MobCarpDragon"; Corvax-Wega-Change
 }
@@ -13,6 +13,9 @@ using Content.Shared.Damage.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
+using Robust.Shared.Random; // Corvax-Wega-Add
+using Robust.Shared.Prototypes; // Corvax-Wega-Add
+using System.Linq; // Corvax-Wega-Add

 namespace Content.Server.Dragon;

@@ -27,6 +30,7 @@ public sealed class DragonRiftSystem : EntitySystem
    [Dependency] private readonly NavMapSystem _navMap = default!;
    [Dependency] private readonly NPCSystem _npc = default!;
    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Wega-Add

    public override void Initialize()
    {
@@ -88,7 +92,7 @@ public sealed class DragonRiftSystem : EntitySystem
            if (comp.SpawnAccumulator > comp.SpawnCooldown)
            {
                comp.SpawnAccumulator -= comp.SpawnCooldown;
-                var ent = Spawn(comp.SpawnPrototype, xform.Coordinates);
+                var ent = Spawn(GetWeightedRandom(comp.SpawnWeights), xform.Coordinates); // Corvax-Wega-Add

                // Update their look to match the leader.
                if (TryComp<RandomSpriteComponent>(comp.Dragon, out var randomSprite))
@@ -103,7 +107,23 @@ public sealed class DragonRiftSystem : EntitySystem
            }
        }
    }
+ // Corvax-Wega-Start
+    private EntProtoId GetWeightedRandom(Dictionary<EntProtoId, float> weights)
+    {
+        var current = 0f;
+        var totalWeight = weights.Values.Sum();
+        var randomValue = _random.NextFloat(0, totalWeight);

+        foreach (var (prototype, weight) in weights)
+        {
+            current += weight;
+            if (randomValue <= current)
+                return prototype;
+        }
+
+        return weights.Keys.First();
+    }
+ // Corvax-Wega-End
    private void OnExamined(EntityUid uid, DragonRiftComponent component, ExaminedEvent args)
    {
        args.PushMarkup(Loc.GetString("carp-rift-examine", ("percentage", MathF.Round(component.Accumulator / component.MaxAccumulator * 100))));
@@ -81,6 +81,7 @@ public sealed partial class CargoOrderConsoleComponent : Component
    public List<ProtoId<CargoMarketPrototype>> AllowedGroups = new()
    {
        "market",
+        "sec",
        "SalvageJobReward2",
        "SalvageJobReward3",
        "SalvageJobRewardMAX",
@@ -1,2 +0,0 @@
-ent-ConstructionBag = строительная сумка
-    .desc = Строительная сумка, удобна для переноски строительных материалов.
@@ -227,4 +227,7 @@ tactical-interface-ambuzol-name = 5 таблеток Амбузола
 tactical-interface-ambuzol-desc = Стабильный способ излечить от зомби вируса.

 tactical-interface-ambuzol-plus-name = Таблетка Амбузола плюс
-tactical-interface-ambuzol-plus-desc = Иммунитет от зомби.
+tactical-interface-ambuzol-plus-desc = Иммунитет от зомби.
+
+tactical-interface-bluesheild-name = энергощит "Синий Щит"
+tactical-interface-bluesheild-desc = Специальный щит, который генерирует твердый поток энергии при помощи встроенного проектора, который отражает любые снаряды.
@@ -0,0 +1,13 @@
+reva-cash-name = Кредиты
+reva-cash-desc = Пачка 10000 кредитов, убеди главу или купите что-нибудь.
+
+reva-powerlink-name = Поглотитель энергии
+
+reva-boxkey = Коробка с ключами связи синдиката
+
+reva-tactkik-flame-name = Элитный тактический желет
+reva-tactkik-name = Тактический желет
+
+reva-emag-name = ЕМАГ
+reva-jaws-name = Челюсти жизни синдиката
+reva-kids-name = Боевая аптечка
@@ -0,0 +1,2 @@
+spellbook-staff-boxecore-name = Коробка с аномальными ядрами
+spellbook-staff-boxecore-description = Коробка со всеми ядрами аномалий, который были подвержены коллапсу
@@ -0,0 +1,2 @@
+ent-ActionActivateBluespaceLifeline = Блюспейс коридор
+    .desc = Активирует имплант Блюспейс коридор, телепортируя вас далеко-далеко от станции. Вернуться назад не получится.
@@ -1,3 +1,5 @@
 ent-BoxHugEmpty = { ent-BoxHug }
    .desc = { ent-BoxHug.desc }
-    .suffix = Пустой
+    .suffix = Пустой
+ent-BoxCore = коробка с ядрами аномалий
+    .desc = Коробка полная волшебства и безумия ( и чутка науки ).
@@ -0,0 +1,9 @@
+ent-MobCarpHoloDragon = { ent-MobCarpHolo }
+    .desc = { ent-MobCarpHolo.desc }
+    .suffix = ВыводокДракона
+ent-MobCarpRainbowDragon = { ent-MobCarpRainbow }
+    .desc = { ent-MobCarpRainbow.desc }
+    .suffix = ВыводокДракона
+ent-MobSharkDragon = { ent-MobShark }
+    .desc = { ent-MobShark.desc }
+    .suffix = ВыводокДракона
@@ -0,0 +1,4 @@
+ent-ConstructionBag = строительная сумка
+    .desc = Строительная сумка, удобна для переноски строительных материалов.
+ent-TechDiskBag = сумка для техноличных дисков
+    .desc = Тканевая сумка для хранения очень большого количества дисков с печати и удобной продажи.
@@ -0,0 +1,3 @@
+ent-BluseSpaceImplanter = имплантер "Блюспейс коридор"
+    .desc = Компактный одноразовый шприц, специально разработанный для введения подкожных имплантов. Игла покрыта анестетиком.
+    .suffix = Блюспейс спасатель
@@ -0,0 +1,2 @@
+ent-BluespaceLifelineImplant = имплант "Блюспейс коридор"
+    .desc = Телепортирует тело носителя на ЦентКом при активации. Вернуться назад не получится.
@@ -5,4 +5,10 @@ ent-CombatRCDExperimental = экспериментальное боевое РС
    .suffix = ОБР и Адмены
 ent-HandheldGPSBasicOff = { ent-HandheldGPSBasic }
    .desc = { ent-HandheldGPSBasic.desc }
-    .suffix = Выключен
+    .suffix = Выключен
+ent-AccessConfiguratorCargo = конфигуратор доступа снабжения
+    .desc = Инструмент настройки доступов для квартимейстера, позволяющий настраивать доступ у всех дверей и консолей под доступом снабжения.
+ent-AccessConfiguratorSci = конфигуратор доступа научного отдела
+    .desc = Инструмент настройки доступов для научного руководителя, позволяющий настраивать доступ у всех дверей и консолей под доступом научного отдела.
+ent-AccessConfiguratorAllAccses = настроенный конфигуратор доступа
+    .desc = Конфигуратор доступа со встроенной картой, имеющая все необходимые доступы.
@@ -1,2 +1,8 @@
 ent-HolyWaterGrenade = свято-очистительная граната
-    .desc = Специальная граната для борьбы с нечестью, выпускающая большое облако пены святой воды.
+    .desc = Специальная граната для борьбы с нечестью, выпускающая большое облако пены святой воды.
+ent-GrenadeFlashBangProject = { ent-GrenadeFlashBang }
+    .desc = { ent-GrenadeFlashBang.desc }
+ent-TearGasGrenadeProject = { ent-TearGasGrenade }
+    .desc = { ent-TearGasGrenade.desc }
+ent-GrenadeStingerProject = { ent-GrenadeStinger }
+    .desc = { ent-GrenadeStinger.desc }
@@ -28,4 +28,10 @@ ent-WeaponIonCarabine = ионный карабин
    .suffix = Винтовка
 ent-WeaponEnergyPulsar = энергетический карабин "Пульсар"
    .desc = Энергетический карабин огромной мощности. Способен самозаряжаться с крайне долгим интервалом.
+    .suffix = Винтовка
+ent-WeaponPulseShotgun = импульсный дробовик
+    .desc = Завершенный прототип энергетического дробовика, само наличие даного оружия делает сотрудника "большой шишкой".
+    .suffix = Дробовик
+ent-WeaponPulseSniper = импульсная снайперская винтовка
+    .desc = Импульсныая винтовка с очень низким показателем скоростельности засчет убойности поподания. Один выстрел - один почти готовый труп.
    .suffix = Винтовка
@@ -6,7 +6,7 @@
  product: CrateArmorySMG
  cost: 9000
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec

 - type: cargoProduct
  id: ArmoryShotgun
@@ -16,7 +16,7 @@
  product: CrateArmoryShotgun
  cost: 7000
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec

 - type: cargoProduct
  id: SecurityRiot
@@ -26,7 +26,7 @@
  product: CrateSecurityRiot
  cost: 7500
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec

 - type: cargoProduct
  id: TrackingImplant
@@ -46,7 +46,7 @@
  product: CrateTrainingBombs
  cost: 3000
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec

 - type: cargoProduct
  id: ArmoryLaser
@@ -56,7 +56,7 @@
  product: CrateArmoryLaser
  cost: 4800
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec

 - type: cargoProduct
  id: ArmoryPistol
@@ -66,7 +66,7 @@
  product: CrateArmoryPistols
  cost: 5200
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec

 - type: cargoProduct
  id: ArmoryRifle
@@ -76,4 +76,4 @@
  product: CrateArmoryRifle
  cost: 8000
  category: cargoproduct-category-name-armory
-  group: market
+  group: sec
@@ -6,7 +6,7 @@
  product: CrateSecurityArmor
  cost: 1250
  category: cargoproduct-category-name-security
-  group: market
+  group: sec

 - type: cargoProduct
  id: SecurityHelmet
@@ -16,7 +16,7 @@
  product: CrateSecurityHelmet
  cost: 550
  category: cargoproduct-category-name-security
-  group: market
+  group: sec

 - type: cargoProduct
  id: SecurityNonLethal
@@ -56,7 +56,7 @@
  product: CrateSecurityBiosuit
  cost: 1600
  category: cargoproduct-category-name-security
-  group: market
+  group: sec

 - type: cargoProduct
  id: SecurityBarrier
@@ -66,7 +66,7 @@
  product: DeployableBarrier
  cost: 1000
  category: cargoproduct-category-name-security
-  group: market
+  group: sec

 - type: cargoProduct
  id: SecurityNonlethalThrowables
@@ -197,7 +197,7 @@
  product: CrateVendingMachineRestockSecTechFilled
  cost: 2200
  category: cargoproduct-category-name-security
-  group: market
+  group: sec

 - type: cargoProduct
  id: CrateVendingMachineRestockSeeds
@@ -92,6 +92,7 @@
        - id: SalvageJobBoardComputerCircuitboard
        - id: MailTeleporterMachineCircuitboard
        - id: FundingAllocationComputerCircuitboard # Corvax-Wega
+        - id: LavalandShuttleComputerCircuitboard # Corvax-Wega

 - type: entity
  parent: BoxStamps
@@ -16,7 +16,7 @@
      prob: 0.02
    - id: PrinterDocFlatpack # Corvax-Printer
    - id: FundingAllocationComputerFlatpack # Corvax-Wega
-    - id: LavalandShuttleComputerCircuitboard # Corvax-Wega-Lavaland
+    - id: AccessConfiguratorCargo # Corvax-Wega

 - type: entity
  id: LockerQuarterMasterFilled
@@ -293,6 +293,7 @@
    - id: DoorRemoteResearch
    - id: HandTeleporter
    - id: RubberStampRd
+    - id: AccessConfiguratorSci # Corvax-Wega
    - id: PlushieLizardJobResearchdirector
      prob: 0.02

@@ -8,7 +8,7 @@
      sprite: Corvax/Clothing/Hands/Gloves/kim.rsi
    - type: Clothing
      sprite: Corvax/Clothing/Hands/Gloves/kim.rsi
-    - type: Insulated
+    # - type: Insulated # Corvax-Wega-Add

 - type: entity
  parent: ClothingHandsBase
@@ -351,9 +351,6 @@
  - type: GroupExamine
  # Corvax-Wega-Blood-Cult-Start
  - type: BloodShieldActivaeble
-  - type: ClothingSpeedModifier 
-    walkModifier: 1
-    sprintModifier: 1
  - type: HeldSpeedModifier
  # Corvax-Wega-Blood-Cult-End

@@ -26,6 +26,7 @@
    implants:
    - MindShieldImplant
    - DeathRattleImplantCentcomm
+    - BluespaceLifelineImplant # Corvax-Wega-Add

 ## Death Squad

@@ -484,9 +484,9 @@
  - type: EdibleMatter 
    canBeEaten: false 
  - type: WirelessNetworkConnection
-    range: 20000
+    range: 200
  - type: DeviceLinkSource
-    range: 20000
+    range: 200
    ports:
      - OrderSender
  - type: ChangeableCargoAccount
@@ -75,6 +75,7 @@
          Arsenal: { color: "#dc373b" }
          Experimental: { color: "#9a6ef0" }
          CivilianServices: { color: "#7ecd48" }
+          Biochemical: { color: "#449ae6" } # Corvax-Wega-Add

      enum.TechDiskVisuals.Tier:
        t2_marks:
@@ -781,13 +781,7 @@
    - item: Multitool
    - item: RemoteSignallerAdvanced
 # Corvax-Wega-Robot-Start
-    - item: SprayPainter
-    - hand:
-        emptyRepresentative: SprayPainterAmmo
-        emptyLabel: borg-slot-spray-painter-ammo-empty
-        whitelist:
-          components:
-          - SprayPainterAmmo
+    - item: SprayPainterBorg
 # Corvax-Wega-Robot-End
  - type: BorgModuleIcon
    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-tools-module }
@@ -812,14 +806,14 @@
  - type: ItemBorgModule
    hands:
    - hand:
-        emptyRepresentative: BorgModuleConstructionMaterialPlaceholder
+        emptyRepresentative: ConstrukAndBattery # Corvax-Wega-add
        emptyLabel: borg-slot-construction-empty
        whitelist:
          tags:
          - ConstructionMaterial
          - PowerCell # Corvax-Wega-robots
    - hand:
-        emptyRepresentative: BorgModuleConstructionMaterialPlaceholder
+        emptyRepresentative: ConstrukAndBattery # Corvax-Wega-Add
        emptyLabel: borg-slot-construction-empty
        whitelist:
          tags:
@@ -1309,6 +1303,7 @@
        whitelist:
          tags:
          - ConstructionMaterial
+          - PowerCell # Corvax-Wega-Add
          - CableCoil # Corvax-Wega-Robot
 # Corvax-Wega-Start
    # - hand:
@@ -336,6 +336,7 @@
    sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
  - type: Gun
    selectedMode: SemiAuto
+    fireRate: 1.5 # Corvax-Wega-Add
    availableModes:
    - SemiAuto
    soundGunshot:
@@ -385,7 +386,7 @@
    # Corvax-Wega-gun-end
  - type: Gun
    selectedMode: SemiAuto
-    fireRate: 3
+    fireRate: 2 # Corvax-Wega-Change 3
    availableModes:
      - SemiAuto
      - FullAuto
@@ -399,7 +400,7 @@
    startingCharge: 5000
 # Corvax-Wega-gun-start
  - type: EmpResistance
-    strengthMultiplier: 0
+    strengthMultiplier: 0.5
 # Corvax-Wega-gun-end

 - type: entity
@@ -433,7 +434,10 @@
    maxAngle: -32
    # Corvax-Wega-gun-end
  - type: Gun
-    fireRate: 1.5
+    fireRate: 3 # Corvax-Wega-Chagne 1.5
+    availableModes:
+      - SemiAuto
+      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
  - type: BatteryAmmoProvider
@@ -892,6 +892,7 @@
      state: generic_panel_open
  - type: CargoOrderConsole
    removeLimitAccess: [ "Quartermaster" ]
+    allowedGroups: [ "market","SalvageJobReward2","SalvageJobReward3", "SalvageJobRewardMAX"]
  - type: ActiveRadio
    channels:
    - Supply
@@ -1047,6 +1048,7 @@
    announcementChannel: Security
    removeLimitAccess: [ "HeadOfSecurity" ]
    # mode: SendToPrimary # Corvax-Wega
+    allowedGroups: [ "market", "sec", "SalvageJobReward2","SalvageJobReward3", "SalvageJobRewardMAX"]
  - type: ActiveRadio
    channels:
    - Security
@@ -11,7 +11,7 @@
    layers:
    - state: core
    - state: pulse
-      map: ["decay"]
+      # map: ["decay"] Corvax-Wega-Change
  - type: Appearance
  - type: GenericVisualizer
    visuals:
@@ -54,8 +54,6 @@
  - type: IgnitionSource
    temperature: 700
    ignited: true
-  - type: CoreTempChange
-    tempChangePerSecond: 5
  - type: Gun
    fireRate: 0.75
    soundGunshot:
@@ -81,8 +79,6 @@
    energy: 10
    color: "#1e070e"
    castShadows: false
-  - type: RadiationSource
-    intensity: 0.5
  - type: MeleeThrowOnHit
  - type: MeleeWeapon
    attackRate: 0.5
@@ -114,8 +110,6 @@
    energy: 2.7
    color: "#befaff"
    castShadows: false
-  - type: CoreTempChange
-    tempChangePerSecond: -5
  - type: Gun
    fireRate: 0.75
    soundGunshot:
@@ -142,27 +136,32 @@
    energy: 3.5
    color: "#cb5b7e"
    castShadows: false
-  # - type: Healing
-  #   damageContainers:
-  #   - Biological
-  #   damage:
-  #     groups: # these are all split across multiple types
-  #       Brute: -150
-  #       Burn: -150
-  #       Toxin: -150
-  #   bloodlossModifier: -20
-  #   delay: 1
-  #   selfHealPenaltyMultiplier: 0
-  #   healingBeginSound:
-  #     path: "/Audio/Items/Medical/ointment_begin.ogg"
-  #     params:
-  #       volume: 1.0
-  #       variation: 0.125
-  #   healingEndSound:
-  #     path: "/Audio/Items/Medical/ointment_end.ogg"
-  #     params:
-  #       volume: 1.0
-  #       variation: 0.125
+  - type: Healing
+    damageContainers:
+    - Biological
+    damage:
+      types: # these are all split across multiple types
+        Blunt: -200
+        Piercing: -200
+        Slash: -200
+        Heat: -200
+        Cold: -200
+        Shock: -200
+        Poison: -150
+        Radiation: -200
+    bloodlossModifier: -20
+    delay: 1
+    selfHealPenaltyMultiplier: 0
+    healingBeginSound:
+      path: "/Audio/Items/Medical/ointment_begin.ogg"
+      params:
+        volume: 1.0
+        variation: 0.125
+    healingEndSound:
+      path: "/Audio/Items/Medical/ointment_end.ogg"
+      params:
+        volume: 1.0
+        variation: 0.125

 - type: entity
  parent: BaseAnomalyCore
@@ -257,7 +256,7 @@
  - type: Item
    size: Ginormous
    shape:
-    - 0,0,19,9
+    - 0,0,0,0
  - type: Storage
    maxItemSize: Huge
    grid:
@@ -6,6 +6,11 @@
    mode: SnapgridCenter
  components:
  - type: DragonRift
+    spawnWeights:
+      MobCarpDragon: 0.59
+      MobSharkDragon: 0.2
+      MobCarpHoloDragon: 0.2
+      MobCarpRainbowDragon: 0.01
  - type: Transform
    anchored: true
  - type: Physics
@@ -23,6 +23,7 @@
  - SignallerAdvanced
  - DeviceQuantumSpinInverter
  - DeviceDesynchronizer
+  - TechDiskBag # Corvax-Wega-Add
  - ClothingBackpackHarmpack

 - type: latheRecipePack
@@ -136,10 +136,11 @@
  cost: 10000 # Corvax-Wega-Edit 5000
  recipeUnlocks:
  - ClothingBackpackElectropack
+# Corvax-Wega-start
  - SecurityPlating
  - ArmorBossterSuitModule
  - EMPShieldSuitModule
-
+# Corvax-Wega-End

 # Tier 2

@@ -55,6 +55,7 @@
  cost: 5000
  recipeUnlocks:
  - TechDiskComputerCircuitboard
+  - TechDiskBag # Corvax-Wega-Add

 - type: technology
  id: MagnetsTech
@@ -193,6 +193,8 @@
    - WeaponIndustrialFanPlasmaCutter # Corvax-Wega-Lavaland
    - BorgModuleAdvancedMining
    - SalvageExpeditionsComputerCircuitboard # Corvax-Cringe
+  technologyPrerequisites: # Corvax-Wega-Add
+  - SalvageEquipment # Corvax-Wega-add

 # Tier 3

@@ -14,7 +14,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  id: CBURNGear
@@ -14,7 +14,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  id: DeathSquadGear
@@ -15,7 +15,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  parent: ERTLeaderGearEVA
@@ -107,7 +107,7 @@
    components:
    - type: BibleUser #Lets them heal with bibles
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  parent: ERTChaplainGearEVA
@@ -203,7 +203,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  parent: ERTEngineerGearEVA
@@ -309,7 +309,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  parent: ERTSecurityGearEVA
@@ -404,7 +404,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  parent: ERTMedicalGearEVA
@@ -482,7 +482,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  parent: ERTJanitorGearEVA
@@ -14,7 +14,7 @@
  - CentralCommand
  special:
  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
+    implants: [ MindShieldImplant, DeathRattleImplantCentcomm, BluespaceLifelineImplant ] # Corvax-Wega-Add

 - type: startingGear
  id: CentcommGear
@@ -20,3 +20,20 @@
    icon: { sprite: _Wega/Interface/Actions/action_demon.rsi, state: "instant_regeneration" }
  - type: InstantAction
    event: !type:DamageOnActionEvent
+
+- type: entity
+  parent: BaseSuicideAction
+  id: ActionActivateBluespaceLifeline
+  name: Activate Bluespace Lifeline
+  description: Activates your bluespace lifeline implant, teleporting you far-far away from this station. You won't be able to come back.
+  components:
+  - type: Action
+    checkCanInteract: false
+    checkConsciousness: false
+    itemIconStyle: BigAction
+    priority: -20
+    icon:
+      sprite: _Wega/Effects/bluespace_lifeline.rsi
+      state: bluespace_lifeline
+  - type: InstantAction
+    event: !type:ActivateImplantEvent
@@ -0,0 +1,3 @@
+- type: cargoMarket
+  id: sec
+
@@ -24,4 +24,38 @@
  - type: Tag
    tags:
    - BoxCardboard
-    - BoxHug
+    - BoxHug
+    
+- type: entity
+  parent: BoxCardboard
+  id: BoxCore
+  name: box with core
+  description: A special box for sensitive people.
+  components:
+  - type: Sprite
+    layers:
+    - state: box_hug
+    - state: heart
+  - type: Item
+    heldPrefix: hug
+  - type: Tag
+    tags:
+    - BoxCardboard
+    - BoxHug
+  - type: StorageFill
+    contents:
+      - id: AnomalyCorePyroclastic
+      - id: AnomalyCoreGravity
+      - id: AnomalyCoreIce
+      - id: AnomalyCoreFlesh
+      - id: AnomalyCoreLiquid
+      - id: AnomalyCoreRock
+      - id: AnomalyCoreBluespace
+      - id: AnomalyCoreElectricity
+      - id: AnomalyCoreFlora
+      - id: AnomalyCoreShadow
+      - id: AnomalyCoreTech
+  - type: Storage
+    maxItemSize: Ginormous
+    grid:
+    - 0,0,3,3
@@ -307,6 +307,21 @@
  categories:
  - ERTEquipment

+- type: listing
+  id: ERTBlueSheildSheild
+  name: tactical-interface-bluesheild-name
+  description: tactical-interface-bluesheild-desc
+  productEntity: BlueSheildSheild
+  cost:
+    TacticalResource: 5
+  categories:
+  - ERTEquipmentPro
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - CBURNTacticalInterface
+
 - type: listing
  id: ERTPortableRechargerPro
  name: tactical-interface-portable-recharger-pro-name
@@ -1,6 +1,6 @@
 - type: listing
  id: RevolitionMagazineMedkitCombatFilled
-  name: ent-MedkitCombatFilled
+  name: reva-kids-name
  description: uplink-combat-medkit-desc
  productEntity: MedkitCombatFilled
  cost:
@@ -8,19 +8,19 @@
  categories:
  - RevolutionSupport

- type: listing
-  id: RevolitionMagazineChemistryBottleNocturine
-  name: ent-ChemistryBottleNocturine
-  description: uplink-nocturine-chemistry-bottle-desc
-  productEntity: ChemistryBottleNocturine
-  cost:
-    HelpfulResource: 1
-  categories:
-  - RevolutionSupport
+# - type: listing
+  # id: RevolitionMagazineChemistryBottleNocturine
+  # name: ent-ChemistryBottleNocturine
+  # description: uplink-nocturine-chemistry-bottle-desc
+  # productEntity: ChemistryBottleNocturine
+  # cost:
+    # HelpfulResource: 1
+  # categories:
+  # - RevolutionSupport

 - type: listing
  id: RevolitionMagazineSyndicateJawsOfLife
-  name: ent-SyndicateJawsOfLife
+  name: reva-jaws-name
  description: uplink-syndicate-jaws-of-life-desc
  productEntity: SyndicateJawsOfLife
  cost:
@@ -28,41 +28,41 @@
  categories:
  - RevolutionSupport

- type: listing
-  id: RevolitionMagazineAgentIDCard
-  name: ent-AgentIDCard
-  description: uplink-agent-id-card-desc
-  productEntity: AgentIDCard
-  cost:
-    HelpfulResource: 1
-  categories:
-  - RevolutionSupport
+# - type: listing
+  # id: RevolitionMagazineAgentIDCard
+  # name: ent-AgentIDCard
+  # description: uplink-agent-id-card-desc
+  # productEntity: AgentIDCard
+  # cost:
+    # HelpfulResource: 1
+  # categories:
+  # - RevolutionSupport

- type: listing
-  id: RevolitionMagazineClothingOuterHardsuitCarp
-  name: ent-ClothingOuterHardsuitCarp
-  description: uplink-hardsuit-carp-desc
-  productEntity: ClothingOuterHardsuitCarp
-  cost:
-    HelpfulResource: 1
-  categories:
-  - RevolutionSupport
+# - type: listing
+  # id: RevolitionMagazineClothingOuterHardsuitCarp
+  # name: ent-ClothingOuterHardsuitCarp
+  # description: uplink-hardsuit-carp-desc
+  # productEntity: ClothingOuterHardsuitCarp
+  # cost:
+    # HelpfulResource: 1
+  # categories:
+  # - RevolutionSupport

- type: listing
-  id: RevolitionMagazineClothingShoesChameleonNoSlips
-  name: ent-ClothingShoesChameleonNoSlips
-  description: uplink-clothing-no-slips-shoes-desc
-  productEntity: ClothingShoesChameleonNoSlips
-  cost:
-    HelpfulResource: 1
-  categories:
-  - RevolutionSupport
+# - type: listing
+  # id: RevolitionMagazineClothingShoesChameleonNoSlips
+  # name: ent-ClothingShoesChameleonNoSlips
+  # description: uplink-clothing-no-slips-shoes-desc
+  # productEntity: ClothingShoesChameleonNoSlips
+  # cost:
+    # HelpfulResource: 1
+  # categories:
+  # - RevolutionSupport

 - type: listing
  id: RevolitionMagazineBriefcaseSyndieLobbyingBundleFilled
-  name: ent-BriefcaseSyndieLobbyingBundleFilled
-  description: uplink-bribe-desc
-  productEntity: BriefcaseSyndieLobbyingBundleFilled
+  name: reva-cash-name
+  description: reva-cash-desc
+  productEntity: SpaceCash10000
  cost:
    HelpfulResource: 1
  categories:
@@ -78,20 +78,30 @@
  categories:
  - RevolutionSupport

+# - type: listing
+  # id: RevolitionMagazineHypopen
+  # name: uplink-hypopen-name
+  # description: uplink-hypopen-desc
+  # icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
+  # productEntity: HypopenBox
+  # cost:
+    # HelpfulResource: 1
+  # categories:
+  # - RevolutionSupport
+
 - type: listing
-  id: RevolitionMagazineHypopen
-  name: uplink-hypopen-name
-  description: uplink-hypopen-desc
-  icon: { sprite: /Textures/Objects/Misc/pens.rsi, state: pen }
-  productEntity: HypopenBox
+  id: RevolitionMagazineOuterVestWebElite
+  name: reva-tactkik-flame-name
+  description: uplink-clothing-outer-vest-web-elite-desc
+  productEntity: ClothingOuterVestWebElite
  cost:
-    HelpfulResource: 1
+    HelpfulResource: 2
  categories:
  - RevolutionSupport

 - type: listing
  id: RevolitionMagazineOuterVestWeb
-  name: ent-ClothingOuterVestWeb
+  name: reva-tactkik-name
  description: uplink-clothing-outer-vest-web-desc
  productEntity: ClothingOuterVestWeb
  cost:
@@ -99,19 +109,19 @@
  categories:
  - RevolutionSupport

- type: listing
-  id: RevolitionMagazineCrateFunSyndicateSegway
-  name: ent-CrateFunSyndicateSegway
-  description: uplink-syndicate-segway-crate-desc
-  productEntity: CrateFunSyndicateSegway
-  cost:
-    HelpfulResource: 2
-  categories:
-  - RevolutionSupport
+# - type: listing
+  # id: RevolitionMagazineCrateFunSyndicateSegway
+  # name: ent-CrateFunSyndicateSegway
+  # description: uplink-syndicate-segway-crate-desc
+  # productEntity: CrateFunSyndicateSegway
+  # cost:
+    # HelpfulResource: 2
+  # categories:
+  # - RevolutionSupport

 - type: listing
  id: RevolitionMagazineEncryptionKeySyndie
-  name: ent-EncryptionKeySyndie
+  name: reva-boxkey
  description: uplink-encryption-key-desc
  productEntity: BoxEncryptionKeySyndie
  cost:
@@ -121,7 +131,7 @@

 - type: listing
  id: RevolitionMagazineEmag
-  name: ent-Emag
+  name: reva-emag-name
  description: uplink-emag-desc
  productEntity: Emag
  cost:
@@ -142,7 +152,7 @@

 - type: listing
  id: RevolitionMagazinePowerSink
-  name: ent-PowerSink
+  name: reva-powerlink-name
  description: uplink-power-sink-desc
  productEntity: PowerSink
  cost:
@@ -152,7 +162,7 @@

 - type: listing
  id: RevolitionMagazineClothingHeadHatCatEars
-  name: ent-ClothingHeadHatCatEars
+  name: uplink-cat-ears-name
  description: uplink-cat-ears-desc
  productEntity: ClothingHeadHatCatEars
  cost:
@@ -0,0 +1,16 @@
+- type: listing
+  id: SpellbookBoxCore
+  name: spellbook-staff-boxecore-name
+  description: spellbook-staff-boxecore-description
+  productEntity: BoxCore
+  icon:
+    sprite: Structures/Specific/Anomalies/Cores/pyro_core.rsi
+    state: core
+  cost:
+    WizCoin: 3
+  categories:
+  - SpellbookEquipment
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
@@ -0,0 +1,16 @@
+- type: entity
+  parent: Acidifier
+  id: BluespaceLifeline
+  name: bluespace lifeline
+  description: Teleports your body to save your life!
+  components:
+  - type: Sprite
+    sprite: /Textures/_Wega/Effects/bluespace_lifeline.rsi
+    noRot: true
+    layers:
+    - state: bluespace_lifeline
+  - type: EmitSoundOnSpawn
+    sound: 
+      path: /Audio/Effects/tesla_consume.ogg
+      params:
+        variation: 0.3
@@ -0,0 +1,80 @@
+- type: entity
+  id: MobSharkDragon
+  suffix: DragonBrood
+  parent: MobShark
+  components:
+    - type: GhostRole
+      allowMovement: true
+      allowSpeech: true
+      makeSentient: true
+      name: ghost-role-information-sentient-carp-name
+      description: ghost-role-information-sentient-carp-description
+      rules: ghost-role-information-space-dragon-summoned-carp-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonistFlock
+    - type: GhostTakeoverAvailable
+    - type: HTN
+      rootTask:
+        task: DragonCarpCompound
+    - type: Flammable
+      damage:
+       types: {}
+    - type: Temperature
+    - type: TemperatureDamage
+      heatDamageThreshold: 1200
+    - type: FriendlyFaction # Corvax-Wega-Friendly
+      faction: Dragon # Corvax-Wega-Friendly
+      
+- type: entity
+  id: MobCarpRainbowDragon
+  suffix: DragonBrood
+  parent: MobCarpRainbow
+  components:
+    - type: GhostRole
+      allowMovement: true
+      allowSpeech: true
+      makeSentient: true
+      name: ghost-role-information-sentient-carp-name
+      description: ghost-role-information-sentient-carp-description
+      rules: ghost-role-information-space-dragon-summoned-carp-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonistFlock
+    - type: GhostTakeoverAvailable
+    - type: HTN
+      rootTask:
+        task: DragonCarpCompound
+    - type: Flammable
+      damage:
+       types: {}
+    - type: Temperature
+    - type: TemperatureDamage
+      heatDamageThreshold: 1200
+    - type: FriendlyFaction # Corvax-Wega-Friendly
+      faction: Dragon # Corvax-Wega-Friendly
+      
+- type: entity
+  id: MobCarpHoloDragon
+  suffix: DragonBrood
+  parent: MobCarpHolo
+  components:
+    - type: GhostRole
+      allowMovement: true
+      allowSpeech: true
+      makeSentient: true
+      name: ghost-role-information-sentient-carp-name
+      description: ghost-role-information-sentient-carp-description
+      rules: ghost-role-information-space-dragon-summoned-carp-rules
+      mindRoles:
+      - MindRoleGhostRoleTeamAntagonistFlock
+    - type: GhostTakeoverAvailable
+    - type: HTN
+      rootTask:
+        task: DragonCarpCompound
+    - type: Flammable
+      damage:
+       types: {}
+    - type: Temperature
+    - type: TemperatureDamage
+      heatDamageThreshold: 1200
+    - type: FriendlyFaction # Corvax-Wega-Friendly
+      faction: Dragon # Corvax-Wega-Friendly
@@ -1,3 +1,11 @@
+- type: entity
+  id: BluseSpaceImplanter
+  name: bluespase implanter
+  parent: BaseImplantOnlyImplanter
+  components:
+  - type: Implanter
+    implant: BluespaceLifelineImplant
+
 - type: entity
  id: LoyaltyImplanter
  name: loyalty implanter
@@ -126,8 +126,13 @@
        Blunt: 0
    angle: 10
  - type: Flash
+    flashOnUse: false
  - type: RevolutionaryConverter
  - type: Tag
    tags:
    - Book
    - RevShop
+  - type: LimitedCharges
+    maxCharges: 1
+  - type: AutoRecharge
+    rechargeDuration: 30
@@ -10,6 +10,34 @@
  - type: Item # Corvax-Wega-Surgery
    size: Tiny # Corvax-Wega-Surgery

+- type: entity
+  parent: BaseSubdermalImplant
+  id: BluespaceLifelineImplant
+  name: bluespace lifeline implant
+  description: Teleports the hosts body to Central Command on activation. They will not be able to return.
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Medical/Surgery/implants.rsi
+    state: nt
+  - type: SubdermalImplant
+    permanent: true
+    implantAction: ActionActivateBluespaceLifeline
+  - type: TriggerOnMobstateChange
+    mobState:
+    - Dead
+  - type: TriggerOnActivateImplant
+  - type: AddComponentsOnTrigger # make them embed into the target, but only when activated so that they can't be metagamed
+    targetUser: true
+    components:
+    - type: TimedDespawn
+      lifetime: 0
+  - type: SpawnOnTrigger
+    proto: BluespaceLifeline
+    predicted: true
+  - type: Tag
+    tags:
+    - SubdermalImplant
+
 - type: entity
  parent: BaseSubdermalImplant
  id: LoyaltyImplant
@@ -17,4 +45,4 @@
  description: This implant grants access to the Centcomm channel without a headset. Only authorized for Centcomm employees.
  categories: [ HideSpawnMenu ]
  components:
-  - type: MindControlImplant
+  - type: MindControlImplant
@@ -122,3 +122,36 @@
    sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi
    state: cash-icon
    
+- type: entity
+  parent: BaseItem
+  id: ConstrukAndBattery
+  name: ConstrukAndCabel
+  categories: [ HideSpawnMenu ]
+  description: CashIcon
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi
+    state: generic_materials_battery
+
+- type: entity
+  parent: BaseItem
+  id: BolaIcon
+  name: bolo-icon
+  categories: [ HideSpawnMenu ]
+  description: CashIcon
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi
+    state: bolo-icon
+
+- type: entity
+  parent: BaseItem
+  id: GrenIcon
+  name: bgren-icon
+  categories: [ HideSpawnMenu ]
+  description: CashIcon
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi
+    state: gren-icon
+
@@ -126,7 +126,7 @@
 # SEC Granader
 - type: entity
  name: hand grenade gun
-  parent: BaseStorageItem
+  parent: BaseItem
  id: WeaponHandGranadeGun
  description: Load granade for optimal results.
  components:
@@ -134,16 +134,8 @@
    sprite: _Wega/Objects/Weapons/Guns/Battery/borggun.rsi
    layers:
    - state: icon
-  - type: Storage
-    maxItemSize: Normal
-    grid:
-    - 0,0,0,1
-    - 1,0,0,0
-    whitelist:
-      tags:
-      - HandGrenade
  - type: Gun
-    fireRate: 2
+    fireRate: 0.5
    selectedMode: SemiAuto
    availableModes:
    - SemiAuto
@@ -151,15 +143,26 @@
      path: /Audio/Effects/thunk.ogg
    soundEmpty:
      path: /Audio/Items/hiss.ogg
-    clumsyProof: true
-  - type: ContainerAmmoProvider
-    container: storagebase
-  - type: Item
-    size: Large
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-        ents: []
+  - type: Appearance
+  - type: BatteryAmmoProvider
+    proto: GrenadeStingerProject
+    fireCost: 500
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: BatterySelfRecharger
+    autoRechargeRate: 25
+    autoRechargePauseTime: 20
+  - type: AmmoCounter
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: GrenadeStingerProject
+      fireCost: 500
+    - proto: GrenadeFlashBangProject
+      fireCost: 250
+    - proto: TearGasGrenadeProject
+      fireCost: 500
+

 - type: entity
  name: box granade
@@ -172,13 +175,9 @@
      - state: box_of_doom # Corvax-Resprite
      - state: flashbang
  - type: Storage
+    maxItemSize: Normal
    grid:
    - 0,0,4,3
-  - type: StorageFill
-    contents:
-      - id: GrenadeStinger
-      - id: TearGasGrenade
-      - id: GrenadeFlashBang

 # SEC Sheild
 - type: entity
@@ -140,6 +140,7 @@
        whitelist:
          tags:
          - ConstructionMaterial
+          - PowerCell
          - CableCoil
    - hand:
        emptyRepresentative: ScientistIcon # Corvax-Wega-Robot
@@ -889,19 +890,25 @@
    - item: WeaponHandGranadeGun
    - hand:
        emptyLabel: borg-slot-granade-empty
-        emptyRepresentative: ModularGrenade
+        emptyRepresentative: GrenIcon
        whitelist:
          tags:
          - HandGrenade
          - Payload
          - VoiceTrigger
-    - item: BoxBorgGranade
+          components:
+          - PayloadCase
+          - PayloadTrigger
    - hand:
-        emptyLabel: borg-slot-cabeldet-empty
-        emptyRepresentative: CableDetStack
+        emptyLabel: borg-slot-granade-empty
+        emptyRepresentative: BolaIcon
        whitelist:
          tags:
-          - Payload
+          - CableCoil
+          - Bola
+          components:
+          - Ensnaring
+    - item: BoxBorgGranade
  - type: BorgModuleIcon
    icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: grenade-module }

@@ -1103,6 +1110,7 @@
  - type: ItemBorgModule
    hands:
    - item: RCDCombatRecharging
+    - item: AccessConfiguratorAllAccses
    - item: BorgGeneratorMaterialRod
    - item: BorgGeneratorTile
    - item: BorgGeneratorMaterialSteal
@@ -27,4 +27,30 @@
      tags:
        - ConstructionMaterial
  - type: Dumpable
+  
+- type: entity
+  parent: BaseStorageItem
+  id: TechDiskBag
+  name: technology disk bag
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Devices/bag_diski.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    storedRotation: -90
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - belt
+  - type: Storage
+    grid:
+    - 0,0,19,9
+    maxItemSize: Normal
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      components:
+        - TechnologyDisk
+  - type: Dumpable
  - type: MagnetPickup
@@ -98,4 +98,99 @@
  # Corvax-Wega-Lavaland-start
  - type: HandheldGpsUi
    broadcastEnabled: false
-  # Corvax-Wega-Lavaland-end
+  # Corvax-Wega-Lavaland-end
+  
+- type: entity
+  parent: AccessConfigurator
+  id: AccessConfiguratorCargo
+  name: cargo access configurator
+  description: A modified access configurator used by the cargo.
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,0,1
+  - type: Sprite
+    sprite: _Wega/Objects/Tools/cargo_access_configurator.rsi
+  - type: Clothing
+    sprite: _Wega/Objects/Tools/cargo_access_configurator.rsi
+  - type: AccessOverrider
+    showPrivilegedId: false
+    accessLevels:
+    - Cargo
+    - Salvage
+    - Quartermaster
+    privilegedIdSlot:
+      name: id-card-console-privileged-id
+      startingItem: QuartermasterIDCard
+      ejectSound: /Audio/Machines/id_swipe.ogg
+      insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+      ejectOnBreak: true
+      disableEject: true
+      swap: false
+      whitelist:
+        components:
+        - IdCard
+    denialSound:
+      path: /Audio/Machines/custom_deny.ogg
+    doAfter: 0.5
+
+- type: entity
+  parent: AccessConfigurator
+  id: AccessConfiguratorSci
+  name: scie access configurator
+  description: A modified access configurator used by the cargo.
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,0,1
+  - type: Sprite
+    sprite: _Wega/Objects/Tools/sci_access_configurator.rsi
+  - type: Clothing
+    sprite: _Wega/Objects/Tools/sci_access_configurator.rsi
+  - type: AccessOverrider
+    showPrivilegedId: false
+    accessLevels:
+    - Research
+    privilegedIdSlot:
+      name: id-card-console-privileged-id
+      startingItem: ResearchIDCard
+      ejectSound: /Audio/Machines/id_swipe.ogg
+      insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+      ejectOnBreak: true
+      disableEject: true
+      swap: false
+      whitelist:
+        components:
+        - IdCard
+    denialSound:
+      path: /Audio/Machines/custom_deny.ogg
+    doAfter: 0.5
+    
+- type: entity
+  parent: AccessConfigurator
+  id: AccessConfiguratorAllAccses
+  name: borg access configurator
+  description: A modified access configurator used by the cargo.
+  components:
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,0,1
+  - type: AccessOverrider
+    showPrivilegedId: false
+    privilegedIdSlot:
+      name: id-card-console-privileged-id
+      startingItem: CaptainIDCard
+      ejectSound: /Audio/Machines/id_swipe.ogg
+      insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+      ejectOnBreak: true
+      disableEject: true
+      swap: false
+      whitelist:
+        components:
+        - IdCard
+    denialSound:
+      path: /Audio/Machines/custom_deny.ogg
+    doAfter: 0.5
@@ -15,4 +15,25 @@
    solution:
      reagents:
      - ReagentId: Holywater
-        Quantity: 75
+        Quantity: 75
+        
+- type: entity
+  parent: GrenadeStinger
+  id: GrenadeStingerProject
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TriggerOnSpawn
+  
+- type: entity
+  parent: TearGasGrenade
+  id: TearGasGrenadeProject
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TriggerOnSpawn
+  
+- type: entity
+  parent: GrenadeFlashBang
+  id: GrenadeFlashBangProject
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: TriggerOnSpawn
@@ -351,4 +351,41 @@
  - type: BatterySelfRecharger
    autoRechargeRate: 35
  - type: Item
-    size: Large
+    size: Large
+    
+- type: entity
+  name: pulse shotgun
+  parent: BaseWeaponBattery
+  id: WeaponPulseShotgun
+  description: The final prototype of the energy shotgun, specially designed for death squads. Devoid of firing modes, but more deadly.
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Weapons/Guns/Battery/pulseshotgun.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.GunVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: false
+  - type: Gun
+    fireRate: 1.5
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: Wieldable
+    unwieldOnUse: false
+  - type: BatteryAmmoProvider
+    proto: BulletPulseSpread
+    fireCost: 100
+  - type: Item
+    size: Large
+    sprite: _Wega/Objects/Weapons/Guns/Battery/inhands_64.rsi
+    heldPrefix: pulse
+  - type: GunRequiresWield
+  - type: Battery
+    maxCharge: 1000
+    startingCharge: 1000
+  - type: Appearance
@@ -91,3 +91,59 @@
    radius: 1.5
    energy: 4.6
    color: "#ffffff"
+
+- type: entity
+  name: pulse bolt
+  id: BulletPulse
+  parent: BaseBullet
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Reflective
+    reflective:
+    - Energy
+  - type: FlyBySound
+    sound:
+      collection: EnergyMiss
+      params:
+        volume: 5
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
+    layers:
+    - state: omnilaser
+      shader: unshaded
+  - type: Physics
+  - type: Ammo
+  - type: Projectile
+    impactEffect: BulletImpactEffectDisabler
+    damage:
+      types:
+        Heat: 21
+
+- type: entity
+  id: BulletPulseSpread
+  categories: [ HideSpawnMenu ]
+  parent: BulletPulse
+  components:
+  - type: ProjectileSpread
+    proto: BulletPulse
+    count: 6
+    spread: 10
+    
+- type: entity
+  parent: BasicHitscan
+  id: PulseSniper
+  components:
+  - type: HitscanBasicDamage
+    damage:
+      types:
+        Heat: 90
+  - type: HitscanBasicVisuals
+    muzzleFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: muzzle_blue
+    travelFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: beam_blue
+    impactFlash:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+      state: impact_blue
@@ -49,3 +49,39 @@
  - type: Appearance
  - type: StaticPrice
    price: 5000
+
+- type: entity
+  name: pulse sniper
+  parent: BaseWeaponBattery
+  id: WeaponPulseSniper
+  description: A high tech energy sniper favoured by the NT-ERT operatives.
+  components:
+  - type: Sprite
+    sprite: _Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: _Wega/Objects/Weapons/Guns/Battery/pulse_sniper.rsi
+  - type: Gun
+    selectedMode: SemiAuto
+    fireRate: 0.5
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/_Wega/Weapons/Guns/Gunshots/laser_sniper.ogg
+  - type: BatteryAmmoProvider
+    proto: PulseSniper
+    fireCost: 1500
+  - type: Battery
+    maxCharge: 7500
+    startingCharge: 7500
+  - type: Wieldable
+  - type: GunRequiresWield
+  - type: CursorOffsetRequiresWield
+  - type: EyeCursorOffset
+    maxOffset: 3
+    pvsIncrease: 0.3
@@ -29,7 +29,7 @@
    sprite: _Wega/Objects/Weapons/Throwable/cult_bola.rsi
    state: icon
  - type: Item
-    size: Normal
+    size: Small
    shape:
    - 0,0,0,1
  - type: DamageOnLand
@@ -132,4 +132,7 @@
        sound:
          collection: MetalBreak
      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+        acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Bola 
@@ -11,8 +11,8 @@
      air:
        volume: 1500
        moles:
-          Oxygen: 609.26 # oxygen
-          NitrousOxide: 2160.1 # N2O
+          Oxygen: 1938.56 # oxygen
+          NitrousOxide: 830.8 # N2O
        temperature: 293.15
    - type: Destructible
      thresholds:
@@ -8,9 +8,9 @@
    WallRockChromite: WallRockChromiteTin
    WallRockSand: WallRockSandTin
    WallRockSnow: WallRockSnowTin
-  maxCount: 20
-  minGroupSize: 4
-  maxGroupSize: 8
+  maxCount: 30
+  minGroupSize: 10
+  maxGroupSize: 15
  radius: 4

 - type: biomeMarkerLayer
@@ -21,9 +21,9 @@
    WallRockBasalt: WallRockBasaltLavalandQuartz
    WallRockChromite: WallRockChromiteQuartz
    WallRockSnow: WallRockSnowQuartz
-  maxCount: 20
-  minGroupSize: 4
-  maxGroupSize: 8
+  maxCount: 30
+  minGroupSize: 10
+  maxGroupSize: 15
  radius: 4

 - type: biomeMarkerLayer
@@ -35,9 +35,9 @@
    WallRockChromite: WallRockChromiteCoal
    WallRockSand: WallRockSandCoal
    WallRockSnow: WallRockSnowCoal
-  maxCount: 20
-  minGroupSize: 4
-  maxGroupSize: 6
+  maxCount: 30
+  minGroupSize: 8
+  maxGroupSize: 12
  radius: 4

 # Medium value
@@ -51,9 +51,9 @@
    WallRockChromite: WallRockChromiteGold
    WallRockSand: WallRockSandGold
    WallRockSnow: WallRockSnowGold
-  maxCount: 10
-  minGroupSize: 2
-  maxGroupSize: 5
+  maxCount: 20
+  minGroupSize: 5
+  maxGroupSize: 10
  radius: 4

 # Silver
@@ -66,9 +66,9 @@
    WallRockChromite: WallRockChromiteSilver
    WallRockSand: WallRockSandSilver
    WallRockSnow: WallRockSnowSilver
-  maxCount: 10
-  minGroupSize: 2
-  maxGroupSize: 5
+  maxCount: 20
+  minGroupSize: 5
+  maxGroupSize: 10
  radius: 4

 # High value
@@ -82,9 +82,9 @@
    WallRockChromite: WallRockChromitePlasma
    WallRockSand: WallRockSandPlasma
    WallRockSnow: WallRockSnowPlasma
-  maxCount: 6
-  minGroupSize: 3
-  maxGroupSize: 5
+  maxCount: 12
+  minGroupSize: 4
+  maxGroupSize: 8
  radius: 4

 # Uranium
@@ -97,9 +97,9 @@
    WallRockChromite: WallRockChromiteUranium
    WallRockSand: WallRockSandUranium
    WallRockSnow: WallRockSnowUranium
-  maxCount: 7
-  minGroupSize: 2
-  maxGroupSize: 4
+  maxCount: 15
+  minGroupSize: 4
+  maxGroupSize: 8
  radius: 4

 - type: biomeMarkerLayer
@@ -111,7 +111,7 @@
    WallRockChromite: WallRockChromiteDiamond
    WallRockSand: WallRockSandDiamond
    WallRockSnow: WallRockSnowDiamond
-  maxCount: 3
+  maxCount: 6
  minGroupSize: 1
  maxGroupSize: 2
  radius: 4
@@ -114,19 +114,19 @@
        cellularReturnType: Distance2
      # As I can see, it works much better than I could have imagined.
      entityWeights:
-        WallRockBasalt: 0.947
-        WallRockBasaltLavalandTin: 0.019
-        WallRockBasaltLavalandCoal: 0.0095
-        WallRockBasaltLavalandQuartz: 0.0095
-        WallRockBasaltLavalandPlasma: 0.0095
-        WallRockBasaltLavalandSilver: 0.0054
-        WallRockBasaltLavalandGold: 0.0034
-        WallRockBasaltLavalandUranium: 0.00135
-        WallRockBasaltLavalandDiamond: 0.00135
-        WallRockBasaltLavalandBananium: 0.00108
-        WallRockBasaltLavalandGems: 0.00081
-        WallRockBasaltLavalandGibtonite: 0.00027
-        WallRockBasaltLavalandMagmite: 0.00027
+        WallRockBasalt: 0.647
+        WallRockBasaltLavalandTin: 0.04
+        WallRockBasaltLavalandCoal: 0.019
+        WallRockBasaltLavalandQuartz: 0.019
+        WallRockBasaltLavalandPlasma: 0.0098
+        WallRockBasaltLavalandSilver: 0.0098
+        WallRockBasaltLavalandGold: 0.0098
+        WallRockBasaltLavalandUranium: 0.00535
+        WallRockBasaltLavalandBananium: 0.00508
+        WallRockBasaltLavalandGems: 0.0015
+        WallRockBasaltLavalandMagmite: 0.0015
+        WallRockBasaltLavalandDiamond: 0.001
+        WallRockBasaltLavalandGibtonite: 0.0005
    - !type:BiomeDummyLayer
      id: Loot
    # Fill basalt
@@ -36,4 +36,14 @@
  completetime: 5
  materials:
    Steel: 500
-    Plastic: 300
+    Plastic: 300
+    
+- type: latheRecipe
+  id: TechDiskBag
+  result: TechDiskBag
+  categories:
+  - Clothing
+  completetime: 5
+  materials:
+    Cloth: 300
+    Durathread: 100
@@ -28,6 +28,8 @@
  - BorgModuleLethal
  - PortableRechargerBag
  - PortableRechargerTurbo
+  technologyPrerequisites:
+  - WeaponizedLaserManipulation

 - type: technology
  id: AdvancedFlash
@@ -40,4 +42,6 @@
  cost: 7500
  recipeUnlocks:
  - ClothingHeadHelmetFlash
-  - ClothingNeckFlashNeck
+  - ClothingNeckFlashNeck
+  technologyPrerequisites:
+  - SpecialMeans
@@ -145,6 +145,8 @@
  - Bonesaw
  - ScalpelLaser
  - BorgModuleSurgery
+  technologyPrerequisites:
+  - SurgicalTools

 - type: technology
  id: LauncherSyringe
@@ -53,3 +53,5 @@
    - StorageLargeSuitModule
    - JetpackSuitModule
    - ConstructorSuitModule
+  technologyPrerequisites:
+  - IndustrialModifier
@@ -19,7 +19,7 @@
    jumpsuit: ClothingUniformJumpsuitColorBrown
    back: ClothingBackpackDuffelCBURN
    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingERTHud
    ears: ClothingHeadsetAltCentCom
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitCBURNLeader
@@ -5,7 +5,7 @@
    back: ClothingBackpackERTLeader
    shoes: ClothingShoesBootsCombatFilled
    head: ClothingHeadHatERTLeaderBeret
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingERTHud
    neck: ClothingNeckMantleERTLeader
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterArmorBasicSlim
@@ -30,7 +30,7 @@
    back: ClothingBackpackERTLeader
    shoes: ClothingShoesBootsMagCombat
    head: ClothingHeadHatERTLeaderBeret
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingERTHud
    neck: ClothingNeckMantleERTLeader
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitERTLeader
@@ -54,7 +54,7 @@
    back: ClothingBackpackERTLeader
    shoes: ClothingShoesBootsMagCombat
    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingERTHud
    neck: ClothingNeckMantleERTLeader
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitERTLeader
@@ -78,7 +78,7 @@
    back: ClothingBackpackERTLeader
    shoes: ClothingShoesBootsMagCombat
    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
+    eyes: ClothingERTHud
    neck: ClothingNeckMantleERTLeader
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitERTLeader
@@ -518,3 +518,5 @@
 - type: Tag
  id: OrganicBrain

+- type: Tag
+  id: Bola
@@ -79,6 +79,7 @@
    - Android
  - type: ShowAccessReaderSettings
  - type: MagbootsImplant
+  - type: ThermalSight
 # Corvax-Wega-end

  # Visual
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BombasterDS",
+    "states": [
+        {
+            "name": "bluespace_lifeline",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe, inhand sprites by  lzk228(discord 455630609641897984), mod trofey by gw360 (<@500744677352407051>)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
@@ -18,12 +18,21 @@
    },
 	{
      "name": "generic_materials"
+    },
+	{
+      "name": "generic_materials_battery"
    },
 	{
      "name": "musical-icon"
    },
 	{
      "name": "cabel-icon"
+    },
+	{
+      "name": "bolo-icon"
+    },
+	{
+      "name": "gren-icon"
    },
 	{
      "name": "generic_materials_cabel"
@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Color-swap of the network configurator made by 20kdc (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "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,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
@@ -0,0 +1,62 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Color-swap of the network configurator made by 20kdc (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "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,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14, (as a reference) pulse version by @texttipo",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "pulse-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pulse-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
--- a/Show More
+++ b/Show More