Requests

space-syndicate · Nov 11, 2024 · 3e9c1c1 · 3e9c1c1
1 parent c47fb5f
commit 3e9c1c1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/Content.Server/_CorvaxNext/Teleporter/SyndicateTeleporterComponent.cs b/Content.Server/_CorvaxNext/Teleporter/SyndicateTeleporterComponent.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Physics;
+
 namespace Content.Server._CorvaxNext.Teleporter;
 
 [RegisterComponent]
@@ -8,4 +10,7 @@ public sealed partial class SyndicateTeleporterComponent : Component
 
     [DataField]
     public int TeleportationRangeLength = 4;
+
+    [DataField]
+    public CollisionGroup CollisionGroup = CollisionGroup.MobMask;
 }
diff --git a/Content.Server/_CorvaxNext/Teleporter/SyndicateTeleporterSystem.cs b/Content.Server/_CorvaxNext/Teleporter/SyndicateTeleporterSystem.cs
@@ -18,15 +18,14 @@ public sealed class SyndicateTeleporterSystem : EntitySystem
     [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    [ValidatePrototypeId<EntityPrototype>]
-    private const string TeleportEffectPrototype = "TeleportEffect";
+    private static readonly EntProtoId TeleportEffectPrototype = "TeleportEffect";
 
     public override void Initialize()
     {
         SubscribeLocalEvent<SyndicateTeleporterComponent, UseInHandEvent>(OnUseInHand);
     }
 
-    private void OnUseInHand(EntityUid entity, SyndicateTeleporterComponent teleproter, UseInHandEvent e)
+    private void OnUseInHand(Entity<SyndicateTeleporterComponent> teleproter, ref UseInHandEvent e)
     {
         if (e.Handled)
             return;
@@ -37,15 +36,15 @@ private void OnUseInHand(EntityUid entity, SyndicateTeleporterComponent teleprot
 
         List<EntityCoordinates> safeCoordinates = [];
 
-        for (var i = 0; i <= teleproter.TeleportationRangeLength; i++)
+        for (var i = 0; i <= teleproter.Comp.TeleportationRangeLength; i++)
         {
-            var offset = (teleproter.TeleportationRangeStart + i) * direction;
+            var offset = (teleproter.Comp.TeleportationRangeStart + i) * direction;
 
             var coordinates = transform.Coordinates.Offset(offset).SnapToGrid(EntityManager, _map);
 
             var tile = coordinates.GetTileRef(EntityManager, _map);
 
-            if (tile is not null && _turf.IsTileBlocked(tile.Value, CollisionGroup.MobMask))
+            if (tile is not null && _turf.IsTileBlocked(tile.Value, teleproter.Comp.CollisionGroup))
                 continue;
 
             safeCoordinates.Add(coordinates);
@@ -55,7 +54,7 @@ private void OnUseInHand(EntityUid entity, SyndicateTeleporterComponent teleprot
 
         if (safeCoordinates.Count < 1)
         {
-            var offset = (teleproter.TeleportationRangeStart + _random.NextFloat(teleproter.TeleportationRangeLength)) * direction;
+            var offset = (teleproter.Comp.TeleportationRangeStart + _random.NextFloat(teleproter.Comp.TeleportationRangeLength)) * direction;
 
             resultCoordinates = transform.Coordinates.Offset(offset);
         }

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -2104,16 +2104,3 @@
     whitelist:
     - Chef
     - Mime
-
-# Corvax-Next-Teleporter-Start
-- type: listing
-  id: UplinkTeleporter
-  name: uplink-syndicate-teleporter-name
-  description: uplink-syndicate-teleporter-desc
-  icon: { sprite: _CorvaxNext/Objects/Devices/syndicate_teleporter.rsi, state: icon }
-  productEntity: SyndicateTeleporter
-  cost:
-    Telecrystal: 12
-  categories:
-  - UplinkDisruption
-# Corvax-Next-Teleporter-End
diff --git a/Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml b/Resources/Prototypes/_CorvaxNext/Catalog/uplink_catalog.yml
@@ -0,0 +1,10 @@
+- type: listing
+  id: UplinkTeleporter
+  name: uplink-syndicate-teleporter-name
+  description: uplink-syndicate-teleporter-desc
+  icon: { sprite: _CorvaxNext/Objects/Devices/syndicate_teleporter.rsi, state: icon }
+  productEntity: SyndicateTeleporter
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkDisruption