Revert "Merge remote-tracking branch 'Upstream/LamiaSystem' into upst…

…ream-merge-7-21-2024" This reverts commit b75f57c, reversing changes made to 7f56480.
SS14-Classic · Jul 22, 2024 · c8c65df · c8c65df
1 parent b75f57c
commit c8c65df
Show file tree

Hide file tree

Showing 224 changed files with 549 additions and 2,166 deletions.
diff --git a/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs b/Content.Client/DeltaV/Lamiae/ClientLamiaVisuals.cs
diff --git a/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs b/Content.Client/DeltaV/Lamiae/LamiaSegmentVisualsComponent.cs
diff --git a/Content.Server/DeltaV/Lamiae/LamiaSystem.cs b/Content.Server/DeltaV/Lamiae/LamiaSystem.cs
diff --git a/Content.Server/Teleportation/PortalSystem.cs b/Content.Server/Teleportation/PortalSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Ghost;
 using Content.Shared.Mind.Components;

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -203,13 +203,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                             if (!rayCastResults.Any())
                                 break;
 
-                            var raycastEvent = new HitScanAfterRayCastEvent(rayCastResults);
-                            RaiseLocalEvent(lastUser, ref raycastEvent);
-
-                            if (raycastEvent.RayCastResults == null)
-                                break;
-
-                            var result = raycastEvent.RayCastResults[0];
+                            var result = rayCastResults[0];
                             var hit = result.HitEntity;
                             lastHit = hit;