Merge to stable

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -1,10 +1,7 @@
 using System.Linq;
 using Content.Client.Gameplay;
-using Content.Shared.CombatMode;
 using Content.Shared.Effects;
-using Content.Shared.Hands.Components;
-using Content.Shared.Mobs.Components;
-using Content.Shared.StatusEffect;
+using Content.Shared.Physics; // Starlight-edit™
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Components;
 using Content.Shared.Weapons.Melee.Events;
@@ -16,7 +13,10 @@
 using Robust.Client.State;
 using Robust.Shared.Input;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components; // Starlight-edit™
+using Robust.Shared.Physics.Systems; // Starlight-edit™
 using Robust.Shared.Player;
+using Robust.Shared.Physics; // Starlight-edit™
 
 namespace Content.Client.Weapons.Melee;
 
@@ -30,6 +30,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly InputSystem _inputSystem = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
     [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!; // Starlight-edit™
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
@@ -154,11 +155,53 @@ public override void Update(float frameTime)
 
     protected override bool InRange(EntityUid user, EntityUid target, float range, ICommonSession? session)
     {
-        var xform = Transform(target);
-        var targetCoordinates = xform.Coordinates;
-        var targetLocalAngle = xform.LocalRotation;
+        // Client-side unobstructed check. // Starlight-edit™
+        var targetXform = Transform(target); // Starlight-edit™
+        if (Interaction.InRangeUnobstructed(user, target, targetXform.Coordinates, targetXform.LocalRotation, range, overlapCheck: false)) // Starlight-edit™
+            return true; // Starlight-edit™
 
-        return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false);
+        // Fallback for same-tile obstructions  // Starlight-edit-begin™
+        var userXform = Transform(user);
+
+        var userPos = TransformSystem.GetWorldPosition(userXform);
+        var targetPos = TransformSystem.GetWorldPosition(targetXform);
+        var delta = targetPos - userPos;
+        var distance = delta.Length();
+
+        if (distance > range)
+            return false;
+
+        // If distance is near-zero, it's a point-blank attack. The path is definitionally "unobstructed"
+        if (distance < 0.001f)
+            return true;
+
+        var mapId = userXform.MapID;
+        if (mapId == MapId.Nullspace)
+            return false;
+
+        var dir = delta.Normalized();
+        const int attackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
+
+        var ray = new CollisionRay(userPos, dir, attackMask);
+        var rayCastResults = _physics.IntersectRay(mapId, ray, distance, user, false).ToList();
+
+        if (!rayCastResults.Any() || rayCastResults.First().HitEntity == target)
+            return true;
+
+        var hitEntity = rayCastResults.First().HitEntity;
+
+        if (targetXform.GridUid is not { } gridUid || !TryComp<MapGridComponent>(gridUid, out var grid))
+            return false;
+
+        var hitXform = Transform(hitEntity);
+        if (hitXform.GridUid != gridUid)
+            return false;
+
+        var targetTile = _map.CoordinatesToTile(gridUid, grid, targetXform.Coordinates);
+        var hitTile = _map.CoordinatesToTile(gridUid, grid, hitXform.Coordinates);
+
+        // If the first obstruction is on the same tile as the target, allow the attack
+        return targetTile == hitTile; // Starlight-edit-end™
     }
 
     protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
@@ -212,14 +255,21 @@ private void ClientLightAttack(EntityUid attacker, MapCoordinates mousePos, Enti
         if (mousePos.MapId != attackerPos.MapId || (attackerPos.Position - mousePos.Position).Length() > meleeComponent.Range)
             return;
 
+        // Find the entity directly under the cursor
         EntityUid? target = null;
-
         if (_stateManager.CurrentState is GameplayStateBase screen)
             target = screen.GetClickedEntity(mousePos);
 
-        // Don't light-attack if interaction will be handling this instead
-        if (Interaction.CombatModeCanHandInteract(attacker, target))
-            return;
+        // If no entity was clicked (a "miss"), we still want to play the swing animation. // Starlight-edit-begin™
+        // To do this, we target the grid entity itself. The server will should interpret
+        // an attack on a non-damageable grid as a miss
+        if (target == null)
+        {
+            if (MapManager.TryFindGridAt(mousePos, out var gridUid, out _))
+                target = gridUid;
+            else
+                target = _map.GetMapOrInvalid(mousePos.MapId);
+        } // Starlight-edit-end™
 
         RaisePredictiveEvent(new LightAttackEvent(GetNetEntity(target), GetNetEntity(weaponUid), GetNetCoordinates(coordinates)));
     }
@@ -233,4 +283,4 @@ private void OnMeleeLunge(MeleeLungeEvent ev)
         if (Exists(ent) && Exists(entWeapon))
             DoLunge(ent, entWeapon, ev.Angle, ev.LocalPos, ev.Animation);
     }
-}
+}

Content.Server/Dragon/Components/DragonComponent.cs

@@ -59,6 +59,10 @@ public sealed partial class DragonComponent : Component
                 Params = AudioParams.Default.WithVolume(3f),
             };
 
+        //starlight
+        [DataField]
+        public string NoRiftDeathEffect = "EffectFlashDragonDisappear";
+
         /// <summary>
         /// NPC faction to re-add after being zombified.
         /// Prevents zombie dragon from being attacked by its own carp.

Content.Server/Dragon/DragonSystem.cs

@@ -1,3 +1,4 @@
+using Content.Server.Body.Systems;
 using Content.Server.Objectives.Components;
 using Content.Server.Objectives.Systems;
 using Content.Server.Popups;
@@ -30,6 +31,7 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly BodySystem _body = default!; //starlight
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -97,12 +99,14 @@ public override void Update(float frameTime)
             if (!_mobState.IsDead(uid))
                 comp.RiftAccumulator += frameTime;
 
-            // Delete it, naughty dragon!
-            if (comp.RiftAccumulator >= comp.RiftMaxAccumulator)
+            //starlight start
+            if (comp.RiftAccumulator >= comp.RiftMaxAccumulator && !_mobState.IsDead(uid)) // dragon has no rifts and has surpassed the timer
             {
-                Roar(uid, comp);
-                QueueDel(uid);
+                var xform = Transform(uid);
+                Spawn(comp.NoRiftDeathEffect, _transform.GetMapCoordinates(uid, xform: xform));
+                _body.GibBody(uid, gibOrgans: false); // REND HIS FLESH!!!!!!!!!!!!!
             }
+            //starlight end
         }
     }
 

Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs

@@ -36,7 +36,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
     private static readonly Gauge NukeopsCount = Metrics.CreateGauge( // Startlight
         "nukie_count",
         "Number of all nukies Win/Loses Count.",
-        Enum.GetNames<WinType>());
+        ["results"]);
 
     [Dependency] private readonly AntagSelectionSystem _antag = default!;
     [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;

Content.Server/Materials/MaterialReclaimerSystem.cs

@@ -25,6 +25,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared._Starlight.Materials;
 using Content.Shared.Humanoid;
 
 namespace Content.Server.Materials;
@@ -186,20 +187,29 @@ public override void Reclaim(EntityUid uid,
 
         SpawnMaterialsFromComposition(uid, item, completion * component.Efficiency, xform: xform);
 
+        //Starlight
+        var ev = new RecyclerTryGibEvent(item);
+        RaiseLocalEvent(uid, ref ev);
+        //Starlight
         if (CanGib(uid, item, component))
         {
             var logImpact = HasComp<HumanoidAppearanceComponent>(item) ? LogImpact.Extreme : LogImpact.Medium;
             _adminLogger.Add(LogType.Gib, logImpact, $"{ToPrettyString(item):victim} was gibbed by {ToPrettyString(uid):entity} ");
             SpawnChemicalsFromComposition(uid, item, completion, false, component, xform);
-            _body.GibBody(item, true);
+            //Starlight
+            if (!ev.Handled)
+                _body.GibBody(item, true);
+            //Starlight
             _appearance.SetData(uid, RecyclerVisuals.Bloody, true);
         }
         else
         {
             SpawnChemicalsFromComposition(uid, item, completion, true, component, xform);
         }
-
-        QueueDel(item);
+        //Starlight
+        if (!ev.Handled)
+            QueueDel(item);
+        //Starlight
     }
 
     private void SpawnMaterialsFromComposition(EntityUid reclaimer,

Content.Server/VentCraw/VentCrawTubeSystem.cs

@@ -87,7 +87,7 @@ private void TryEnter(EntityUid uid, EntityUid user, VentCrawlerComponent crawle
             var args = new DoAfterArgs(EntityManager, user, crawler.EnterDelay, new EnterVentDoAfterEvent(), user, uid, user)
             {
                 BreakOnMove = true,
-                BreakOnDamage = false
+                BreakOnDamage = true // STARLIGHT
             };
 
             _doAfterSystem.TryStartDoAfter(args);

Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

@@ -1,15 +1,19 @@
+using System.Linq; // Starlight-edit™
+using System.Numerics; // Starlight-edit™
 using Content.Server.Chat.Systems;
 using Content.Server.Movement.Systems;
 using Content.Shared.Damage.Events;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Effects;
+using Content.Shared.Physics; // Starlight-edit™
 using Content.Shared.Speech.Components;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
-using System.Linq;
-using System.Numerics;
+using Robust.Shared.Physics; // Starlight-edit™
+using Robust.Shared.Physics.Systems; // Starlight-edit™
 
 namespace Content.Server.Weapons.Melee;
 
@@ -19,6 +23,8 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!; // Starlight-edit™
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!; // Starlight-edit™
 
     public override void Initialize()
     {
@@ -50,7 +56,7 @@ protected override bool ArcRaySuccessful(EntityUid targetUid,
         ICommonSession? session)
     {
         // Originally the client didn't predict damage effects so you'd intuit some level of how far
-        // in the future you'd need to predict, but then there was a lot of complaining like "why would you add artifical delay" as if ping is a choice.
+        // in the future you'd need to predict, but then there was a lot of complaining like "why would you add artificial delay" as if ping is a choice.
         // Now damage effects are predicted but for wide attacks it differs significantly from client and server so your game could be lying to you on hits.
         // This isn't fair in the slightest because it makes ping a huge advantage and this would be a hidden system.
         // Now the client tells us what they hit and we validate if it's plausible.
@@ -71,16 +77,64 @@ protected override bool ArcRaySuccessful(EntityUid targetUid,
 
     protected override bool InRange(EntityUid user, EntityUid target, float range, ICommonSession? session)
     {
-        EntityCoordinates targetCoordinates;
-        Angle targetLocalAngle;
-
+        // Server-side unobstructed check with lag compensation
         if (session is { } pSession)
         {
-            (targetCoordinates, targetLocalAngle) = _lag.GetCoordinatesAngle(target, pSession);
-            return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false);
+            var (targetCoordinates, targetLocalAngle) = _lag.GetCoordinatesAngle(target, pSession); // Starlight-edit-begin™
+            if (Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false))
+                return true;
         }
+        else
+        {
+            // Fallback for when no session is provided
+            var targetXformSimple = Transform(target);
+            if (Interaction.InRangeUnobstructed(user, target, targetXformSimple.Coordinates, targetXformSimple.LocalRotation, range, overlapCheck: false))
+                return true; // Starlight-edit-end™
+        }
+
+        // Fallback for same-tile obstructions // Starlight-edit-begin™
+        var userXform = Transform(user);
+        var targetXform = Transform(target);
+
+        var userPos = TransformSystem.GetWorldPosition(userXform);
+        var targetPos = TransformSystem.GetWorldPosition(targetXform);
+        var delta = targetPos - userPos;
+        var distance = delta.Length();
+
+        if (distance > range)
+            return false;
+
+        // If distance is near-zero, it's a point-blank attack. The path is definitionally "unobstructed"
+        if (distance < 0.001f)
+            return true;
+
+        var mapId = userXform.MapID;
+        if (mapId == MapId.Nullspace)
+            return false;
+
+        var dir = delta.Normalized();
+        const int attackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque);
+
+        var ray = new CollisionRay(userPos, dir, attackMask);
+        var rayCastResults = _physics.IntersectRay(mapId, ray, distance, user, false).ToList();
+
+        if (!rayCastResults.Any() || rayCastResults.First().HitEntity == target)
+            return true;
+
+        var hitEntity = rayCastResults.First().HitEntity;
+
+        if (targetXform.GridUid is not { } gridUid || !TryComp<MapGridComponent>(gridUid, out var grid))
+            return false;
+
+        var hitXform = Transform(hitEntity);
+        if (hitXform.GridUid != gridUid)
+            return false;
+
+        var targetTile = _map.CoordinatesToTile(gridUid, grid, targetXform.Coordinates);
+        var hitTile = _map.CoordinatesToTile(gridUid, grid, hitXform.Coordinates);
 
-        return Interaction.InRangeUnobstructed(user, target, range);
+        // If the first obstruction is on the same tile as the target, allow the attack
+        return targetTile == hitTile; // Starlight-edit-end™
     }
 
     protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
@@ -113,10 +167,10 @@ private void OnSpeechHit(EntityUid owner, MeleeSpeechComponent comp, MeleeHitEve
             return;
         }
 
-        if (comp.Battlecry != null)//If the battlecry is set to empty, doesn't speak
+        if (comp.Battlecry != null) //If the battlecry is set to empty, doesn't speak
         {
             _chat.TrySendInGameICMessage(args.User, comp.Battlecry, InGameICChatType.Speak, true, true, checkRadioPrefix: false);  //Speech that isn't sent to chat or adminlogs
         }
 
     }
-}
+}

Content.Server/build.json

@@ -1,7 +1 @@
-{
-    "engine_version":  "237.1.0",
-    "fork_id":  "Starlight",
-    "version":  "1732131340",
-    "hash":  "6F1003C28A8F84306ABD1ABCDA61E9572C86C5ECAE83268314F1573FBCD30A11",
-    "download":  "https://ss14-starlight.online/builds/1732131340/SS14.Client.zip"
-}
+{}

Content.Shared/Materials/MaterialReclaimerComponent.cs

@@ -1,4 +1,5 @@
-using Content.Shared.Whitelist;
+using Content.Shared.Damage;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -123,6 +124,11 @@ public sealed partial class MaterialReclaimerComponent : Component
     /// </remarks>
     [DataField, AutoNetworkedField]
     public int ItemsProcessed;
+
+    //Starlight
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier EmagDamage = new() { DamageDict = { ["Blunt"] = 350 } };
+    //Starlight
 }
 
 [NetSerializable, Serializable]

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

@@ -39,6 +39,7 @@
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Shared.VentCraw;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
@@ -145,6 +146,10 @@ private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
         if (ent != GetEntity(msg.Gun))
             return;
 
+        if (TryComp(user, out VentCrawlerComponent? crawlerComp) //🌟Starlight🌟
+            && crawlerComp.InTube == true)
+            return;
+
         gun.ShootCoordinates = GetCoordinates(msg.Coordinates);
         gun.Target = GetEntity(msg.Target);
         AttemptShoot(user.Value, ent, gun);