bugfix

Content.Client/Weapons/Ranged/Systems/GunSystem.Hybrid.cs

@@ -0,0 +1,28 @@
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Events;
+
+namespace Content.Client.Weapons.Ranged.Systems;
+
+public sealed partial class GunSystem
+{
+    private void InitializeHybrid()
+    {
+        SubscribeLocalEvent<HybridAmmoProviderComponent, UpdateAmmoCounterEvent>(OnHybridUpdateAmmo);
+        SubscribeLocalEvent<HybridAmmoProviderComponent, AmmoCounterControlEvent>(OnHybridControl);
+    }
+
+    private void OnHybridUpdateAmmo(EntityUid uid, HybridAmmoProviderComponent component, UpdateAmmoCounterEvent args)
+    {
+        if (args.Control is DefaultStatusControl control)
+        {
+            var ev = new GetAmmoCountEvent();
+            RaiseLocalEvent(uid, ref ev, false);
+            control.Update(ev.Count, ev.Capacity);
+        }
+    }
+
+    private void OnHybridControl(EntityUid uid, HybridAmmoProviderComponent component, AmmoCounterControlEvent args)
+    {
+        args.Control = new DefaultStatusControl();
+    }
+}

Content.Client/Weapons/Ranged/Systems/GunSystem.cs

@@ -116,6 +116,7 @@ public override void Initialize()
 
         InitializeMagazineVisuals();
         InitializeSpentAmmo();
+        InitializeHybrid();
     }
 
     private void OnUpdateClientAmmo(EntityUid uid, AmmoCounterComponent ammoComp, ref UpdateClientAmmoEvent args)

Content.Server/Weapons/Ranged/Systems/GunSystem.Hybrid.cs

@@ -0,0 +1,125 @@
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Power.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Content.Server.Power.Components;
+
+namespace Content.Server.Weapons.Ranged.Systems;
+
+public sealed partial class GunSystem
+{
+    private void InitializeHybrid()
+    {
+        SubscribeLocalEvent<HybridAmmoProviderComponent, TakeAmmoEvent>(OnHybridTakeAmmo);
+        SubscribeLocalEvent<HybridAmmoProviderComponent, GetAmmoCountEvent>(OnHybridGetAmmoCount);
+        SubscribeLocalEvent<HybridAmmoProviderComponent, EntInsertedIntoContainerMessage>(OnHybridMagazineInsert);
+        SubscribeLocalEvent<HybridAmmoProviderComponent, EntRemovedFromContainerMessage>(OnHybridMagazineRemove);
+    }
+
+    private void OnHybridMagazineInsert(EntityUid uid, HybridAmmoProviderComponent component, EntInsertedIntoContainerMessage args)
+    {
+        if (component.MagazineSlot != args.Container.ID)
+            return;
+        UpdateAmmoCount(uid);
+    }
+
+    private void OnHybridMagazineRemove(EntityUid uid, HybridAmmoProviderComponent component, EntRemovedFromContainerMessage args)
+    {
+        if (component.MagazineSlot != args.Container.ID)
+            return;
+        UpdateAmmoCount(uid);
+    }
+
+    private void OnHybridTakeAmmo(EntityUid uid, HybridAmmoProviderComponent component, TakeAmmoEvent args)
+    {
+        // 1. Получаем магазин из слота
+        var magazineEntity = GetMagazineEntity(uid);
+        if (magazineEntity == null)
+        {
+            args.Reason = Loc.GetString("gun-no-magazine");
+            return;
+        }
+
+        // 2. Проверяем патроны (BallisticAmmoProvider)
+        if (!TryComp<BallisticAmmoProviderComponent>(magazineEntity.Value, out var ballistic))
+        {
+            args.Reason = Loc.GetString("gun-no-ammo");
+            return;
+        }
+
+        // Получаем текущее количество патронов
+        var currentCount = GetBallisticShots(ballistic);
+        if (currentCount <= 0)
+        {
+            args.Reason = Loc.GetString("gun-no-ammo");
+            return;
+        }
+
+        // 3. Проверяем энергию (BatteryComponent)
+        if (!TryComp<BatteryComponent>(magazineEntity.Value, out var battery))
+        {
+            args.Reason = Loc.GetString("gun-no-battery");
+            return;
+        }
+        if (battery.CurrentCharge < component.FireCost)
+        {
+            args.Reason = Loc.GetString("gun-not-enough-energy");
+            return;
+        }
+
+        // 4. Тратим патрон: удаляем последний патрон из контейнера или уменьшаем UnspawnedCount
+        if (ballistic.Entities.Count > 0)
+        {
+            var lastEntity = ballistic.Entities[^1];
+            ballistic.Entities.RemoveAt(ballistic.Entities.Count - 1);
+            Containers.Remove(lastEntity, ballistic.Container);
+            QueueDel(lastEntity); // Удаляем сущность патрона (гильза не нужна)
+        }
+        else if (ballistic.UnspawnedCount > 0)
+        {
+            ballistic.UnspawnedCount--;
+        }
+        else
+        {
+            args.Reason = Loc.GetString("gun-no-ammo");
+            return;
+        }
+
+        // 5. Тратим энергию
+        _battery.UseCharge(magazineEntity.Value, component.FireCost);
+
+        // 6. Создаём снаряд в координатах выстрела
+        var fromCoordinates = args.Coordinates;
+        var mapCoords = fromCoordinates.ToMap(EntityManager, TransformSystem);
+        var projectile = Spawn(component.Prototype, mapCoords);
+
+        // 7. Добавляем снаряд в список для выстрела (основной GunSystem обработает его)
+        args.Ammo.Add((projectile, EnsureShootable(projectile)));
+
+        // 8. Обновляем счётчик на клиенте
+        Dirty(magazineEntity.Value, ballistic);
+        UpdateAmmoCount(uid);
+    }
+
+    private void OnHybridGetAmmoCount(EntityUid uid, HybridAmmoProviderComponent component, ref GetAmmoCountEvent args)
+    {
+        var magazineEntity = GetMagazineEntity(uid);
+        if (magazineEntity != null && TryComp<BallisticAmmoProviderComponent>(magazineEntity.Value, out var ballistic))
+        {
+            args.Count = GetBallisticShots(ballistic);
+            args.Capacity = ballistic.Capacity;
+        }
+        else
+        {
+            args.Count = 0;
+            args.Capacity = 0;
+        }
+    }
+
+    private int GetBallisticShots(BallisticAmmoProviderComponent component)
+    {
+        return component.UnspawnedCount + component.Entities.Count;
+    }
+}

Content.Server/Weapons/Ranged/Systems/GunSystem.cs

@@ -65,6 +65,7 @@ public override void Initialize()
         SubscribeLocalEvent<BallisticAmmoProviderComponent, PriceCalculationEvent>(OnBallisticPrice);
         Subs.CVar(_config, PerformanceCVars.GunPredictionAabbEnlargement, v => _lagCompAabbEnlargement = v, true);
         Subs.CVar(_config, PerformanceCVars.GunPredictionHitscanSearchPadding, v => _lagCompHitscanSearchPadding = v, true);
+        InitializeHybrid();
     }
 
     private void OnBallisticPrice(EntityUid uid, BallisticAmmoProviderComponent component, ref PriceCalculationEvent args)
@@ -170,11 +171,7 @@ void MarkPredicted(EntityUid uid)
                     if (!cartridge.Spent)
                     {
                         var uid = Spawn(cartridge.Prototype, fromEnt);
-                        // #Misfits Add: применяем бонус к снаряду
-                        ApplyBonusDamageToProjectile(uid, gunUid);
-                        base.ShootOrThrow(uid, mapDirection, gunVelocity, gun, gunUid, user);
-                        shotProjectiles.Add(uid);
-                        MarkPredicted(uid);
+                        CreateAndFireProjectiles(uid, cartridge);
 
                         RaiseLocalEvent(ent!.Value, new AmmoShotEvent()
                         {
@@ -192,24 +189,26 @@ void MarkPredicted(EntityUid uid)
                         Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
                     }
 
+                    // Something like ballistic might want to leave it in the container still
                     if (!cartridge.DeleteOnSpawn && !Containers.IsEntityInContainer(ent!.Value))
                         EjectCartridge(ent.Value, angle);
 
                     Dirty(ent!.Value, cartridge);
                     break;
-
+                // Ammo shoots itself
                 case AmmoComponent newAmmo:
                     if (ent == null)
                         break;
                     // #Sirius Change: используем обновлённую функцию с бонусом
                     CreateAndFireProjectiles(ent.Value, newAmmo);
-                    break;
 
+                    break;
                 case HitscanPrototype hitscan:
                     if (TryResolveGunHitscan(gunUid, out var resolvedHitscan))
                         hitscan = resolvedHitscan;
 
                     EntityUid? lastHit = null;
+
                     var from = fromMap;
                     var fromEffect = GetShotEffectCoordinates(fromMap);
                     var dir = mapDirection.Normalized();
@@ -236,6 +235,7 @@ void MarkPredicted(EntityUid uid)
                             }
 
                             lastHit = hit;
+
                             FireEffects(fromEffect, distance, dir.Normalized().ToAngle(), hitscan, hit, userSession);
 
                             var ev = new HitScanReflectAttemptEvent(user, gunUid, hitscan.Reflective, dir, false);
@@ -382,7 +382,6 @@ void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp)
         return shotProjectiles;
     }
 
-
     private bool TryGetHitscanResult(
         MapCoordinates from,
         Vector2 direction,

Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs

@@ -13,7 +13,7 @@ public partial class AmmoComponent : Component, IShootable
 {
     // Muzzle flash stored on ammo because if we swap a gun to whatever we may want to override it.
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("muzzleFlash", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    [ViewVariables(VVAccess.ReadWrite), DataField("muzzleFlash", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string? MuzzleFlash = "MuzzleFlashEffect";
 }
 

Content.Shared/Weapons/Ranged/Components/HybridAmmoProviderComponent.cs

@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class HybridAmmoProviderComponent : Component
+{
+    [DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string Prototype = default!;
+
+    [DataField("capacity"), AutoNetworkedField]
+    public int Capacity = 10;
+
+    [DataField("count"), AutoNetworkedField]
+    public int Count = 10;
+
+    [DataField("fireCost")]
+    public float FireCost = 100f;
+
+    // Ссылка на батарею (если null, используем свой uid)
+    [DataField("battery")]
+    public EntityUid? BatteryEntity;
+
+    // Ссылка на слот магазина (для автоматической загрузки патронов)
+    [DataField("magazineSlot")]
+    public string? MagazineSlot;
+}

Resources/Maps/N14/SunnyvaleSurface.yml

@@ -1146355,13 +1146355,6 @@ entities:
     - type: Transform
       pos: 150.5,181.5
       parent: 1
-- proto: N14ContractBadgeBronze
-  entities:
-  - uid: 154397
-    components:
-    - type: Transform
-      pos: 117.60662,9.527673
-      parent: 1
 - proto: N14ControlTerminalButton
   entities:
   - uid: 154398

Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/powerarmor.yml

@@ -32,17 +32,22 @@
   - type: N14PowerArmor
     requiresProficiency: false
   - type: PowerArmorIntegrity
-    maxIntegrity: 450          
-    brokenBleedthroughRatio: 1.0  
-    disableServosLock: true      
-  - type: Armor 
+    disableServosLock: true
+  - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.60
-        Slash: 0.60
-        Piercing: 0.60
-        Heat: 0.60
-        Radiation: 0.60
+        Blunt: 0.45
+        Slash: 0.45
+        Piercing: 0.45
+        Heat: 0.3
+        Caustic: 0.65
+        Radiation: 0.8
+      flatReductions:  #sirius change
+        Blunt: 5
+        Slash: 5
+        Piercing: 5
+        Heat: 8
+        Caustic: 2
   - type: ClothingSpeedModifier # #Misfits Tweak - standalone 35% slowdown, no fusion core required
     walkModifier: 0.70
     sprintModifier: 0.70

Resources/Prototypes/_Misfits/Entities/Objects/Misc/campfire_fuel.yml

@@ -8,7 +8,7 @@
   parent: BaseItem
   components:
   - type: Sprite
-    sprite: Objects/Materials/materials.rsi
+    sprite: _Nuclear14/Objects/Misc/materials.rsi
     state: firewood # #Misfits Fix - Natural/wood.rsi does not exist; wood state in materials.rsi used instead
   - type: Item
     size: Normal

Resources/Prototypes/_Misfits/Roles/Jobs/NCR/ncr_heavy_trooper.yml

@@ -46,14 +46,10 @@
     shoes: N14ClothingBootsCombatFilled
     ears: N14ClothingHeadsetNCR               # NCR radio earpiece
     belt: ClothingBeltNCR
-    pocket1: N14WeaponMinigun                 # #Misfits Tweak - downgraded to minigun again -bill
     pocket2: RadioHandheld
     id: N14IDNCRDogtagWS                      # Specialist-tier dogtag
   innerClothingSkirt: N14ClothingOfficerUniformNCRDesert
   satchel: N14ClothingBackpackSatchelNCRFilled
-  storage:
-    back:
-    - N14MagazineMinigun5mm                   # extra 5mm box -bill
 
 - type: playTimeTracker
   id: NCRHeavyTrooper