Implement shoot over segment

Simple-Station · Jun 24, 2024 · 84edee0 · 84edee0
1 parent de23fec
commit 84edee0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs b/Content.Shared/SegmentedEntity/SegmentedEntitySystem.cs
@@ -41,7 +41,6 @@ public override void Initialize()
             SubscribeLocalEvent<SegmentedEntityComponent, DidEquipEvent>(OnDidEquipEvent);
             SubscribeLocalEvent<SegmentedEntityComponent, DidUnequipEvent>(OnDidUnequipEvent);
             SubscribeLocalEvent<SegmentedEntitySegmentComponent, GetExplosionResistanceEvent>(OnSnekBoom);
-            SubscribeLocalEvent<SegmentedEntitySegmentComponent, PreventCollideEvent>(PreventShootSelf);
             SubscribeLocalEvent<SegmentedEntitySegmentComponent, DamageChangedEvent>(HandleDamageTransfer);
             SubscribeLocalEvent<SegmentedEntitySegmentComponent, DamageModifyEvent>(HandleSegmentDamage);
             SubscribeLocalEvent<SegmentedEntitySegmentComponent, SegmentSpawnedEvent>(OnSegmentSpawned);
@@ -265,16 +264,6 @@ private void OnDidUnequipEvent(EntityUid equipee, SegmentedEntityComponent compo
             }
         }
 
-        private void PreventShootSelf(EntityUid uid, SegmentedEntitySegmentComponent component, ref PreventCollideEvent args)
-        {
-            if (!TryComp<ProjectileComponent>(args.OtherEntity, out var projectileComponent)) return;
-
-            if (projectileComponent.Shooter == component.Lamia)
-            {
-                args.Cancelled = true;
-            }
-        }
-
         private void OnShootHitscan(EntityUid uid, SegmentedEntityComponent component, ref HitScanAfterRayCastEvent args)
         {
             if (args.RayCastResults == null) return;

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Species/lamia.yml
@@ -33,6 +33,8 @@
   - type: Tag
     tags:
     - HideContextMenu
+  - type: RequireProjectileTarget
+    active: True
 
 - type: entity
   id: LamiaSegment