Apply Fixes

Fansana · Oct 27, 2024 · 29b9284 · 29b9284
1 parent e9c1be0
commit 29b9284
Show file tree

Hide file tree

Showing 5 changed files with 625 additions and 649 deletions.
diff --git a/Content.Server/FloofStation/TheDarkSystem.cs b/Content.Server/FloofStation/TheDarkSystem.cs
@@ -24,16 +24,13 @@ private void SetupTheDark(RoundStartingEvent ev)
         _mapManager.AddUninitializedMap(mapId);
 
         if (!_loader.TryLoad(mapId, "/Maps/Floof/hideout.yml", out var uids))
-        {
             return;
-        }
 
         foreach (var id in uids)
         {
-            EnsureComp<ArrivalsSourceComponent>(id);
             EnsureComp<PreventPilotComponent>(id);
         }
 
         _mapManager.DoMapInitialize(mapId);
     }
-}
+}
diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
@@ -69,8 +69,6 @@ private void OnGetVerbs(EntityUid uid, PortalComponent component, GetVerbsEvent<
 
                 var ent = link.LinkedEntities.First();
                 TeleportEntity(uid, args.User, Transform(ent).Coordinates, ent, false);
-                if (TryComp<EtherealComponent>(args.User, out var ethereal)) // Floofstation Edit
-                    RemComp(uid, ethereal);
                 if (TryComp<PortalTimeoutComponent>(args.User, out var timeout)) // Floofstation Edit
                     RemCompDeferred(args.User, timeout);
             },