oops №2

Rxup · Feb 7, 2025 · 53dc289 · 53dc289
1 parent d997dd6
commit 53dc289
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.Teleport.cs b/Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.Teleport.cs
@@ -67,7 +67,7 @@ private void Teleport(EntityUid uid, ShadowkinTeleportPowerComponent component,
             return;
 
         if(!_interaction.InRangeUnobstructed(args.Performer, args.Target, 0,
-               CollisionGroup.TeleportLayer,
+               CollisionGroup.Opaque,
                predicate: (ent) => _tagSystem.HasTag(ent, "Structure"),
                popup:true))
             return;

diff --git a/Content.Shared/Backmen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Backmen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
@@ -113,7 +113,7 @@ public bool CanUsePsionicAbilities(EntityUid performer, EntityCoordinates target
             return false;
 
         if(!_interaction.InRangeUnobstructed(performer, target, 0,
-               CollisionGroup.TeleportLayer,
+               CollisionGroup.Opaque,
                predicate: (ent) => _tagSystem.HasTag(ent, "Structure"),
                popup:true))
             return false;

diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
@@ -88,7 +88,7 @@ public enum CollisionGroup
     ThrownItem = Impassable | HighImpassable | BulletImpassable | BlobImpassable,
     WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     BlobTileLayer = Opaque | BlobImpassable | BulletImpassable, // backmen: blob
-    TeleportLayer = Opaque, //backmen: teleport(psionic, shadowkin)
+    //TeleportLayer = Opaque, //backmen: teleport(psionic, shadowkin)
     GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     HalfWallLayer = MidImpassable | LowImpassable,
 

diff --git a/Resources/Maps/Corvax/Ruins/corvax_ussp_asteroid.yml b/Resources/Maps/Corvax/Ruins/corvax_ussp_asteroid.yml
@@ -11916,7 +11916,7 @@ entities:
           - LowImpassable
           layer:
           - BulletImpassable
-          - TeleportLayer
+          - Opaque
           density: 50
           hard: True
           restitution: 0
@@ -11970,7 +11970,7 @@ entities:
           - LowImpassable
           layer:
           - BulletImpassable
-          - TeleportLayer
+          - Opaque
           density: 50
           hard: True
           restitution: 0
@@ -12003,7 +12003,7 @@ entities:
           - LowImpassable
           layer:
           - BulletImpassable
-          - TeleportLayer
+          - Opaque
           density: 50
           hard: True
           restitution: 0
@@ -12036,7 +12036,7 @@ entities:
           - LowImpassable
           layer:
           - BulletImpassable
-          - TeleportLayer
+          - Opaque
           density: 50
           hard: True
           restitution: 0
@@ -13108,7 +13108,7 @@ entities:
           - LowImpassable
           layer:
           - BulletImpassable
-          - TeleportLayer
+          - Opaque
           density: 350
           hard: True
           restitution: 0
@@ -13154,7 +13154,7 @@ entities:
           - LowImpassable
           layer:
           - BulletImpassable
-          - TeleportLayer
+          - Opaque
           density: 350
           hard: True
           restitution: 0