fix centcom, resave ruins (#1033)

* fix centcom, resave ruins * oops * oops №2
Rxup · Feb 7, 2025 · fb845a9 · fb845a9
1 parent 4f052ee
commit fb845a9
Show file tree

Hide file tree

Showing 6 changed files with 6,839 additions and 6,846 deletions.
diff --git a/Content.Server/Backmen/Blob/NPC/BlobPod/BlobPodSystem.cs b/Content.Server/Backmen/Blob/NPC/BlobPod/BlobPodSystem.cs
@@ -35,7 +35,7 @@ public sealed class BlobPodSystem : SharedBlobPodSystem
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly NPCSystem _npc = default!;
-    [Dependency] private readonly SharedMoverController _mover = default!;
+    //[Dependency] private readonly SharedMoverController _mover = default!;
 
     public override void Initialize()
     {
@@ -118,7 +118,7 @@ public bool Zombify(Entity<BlobPodComponent> ent, EntityUid target)
         if (HasComp<ActorComponent>(ent))
         {
             _npc.SleepNPC(target);
-            _mover.SetRelay(ent, target);
+            //_mover.SetRelay(ent, target);
         }
 
         return true;

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,