Fulton fixes (#20102)

diff --git a/Content.Server/Salvage/FultonSystem.cs b/Content.Server/Salvage/FultonSystem.cs
index 23145cc1a8e03319a877d04cfc61d46215d96c56..60e1d3b47251d9845546b7b0eb1898be1f3d2fcc 100644 (file)
--- a/Content.Server/Salvage/FultonSystem.cs
+++ b/Content.Server/Salvage/FultonSystem.cs
@@ -66,7 +66,7 @@ public sealed class FultonSystem : SharedFultonSystem
             RaiseNetworkEvent(new FultonAnimationMessage()
             {
                 Entity = GetNetEntity(uid, metadata),
-                Coordinates = GetNetCoordinates(oldCoords, metadata),
+                Coordinates = GetNetCoordinates(oldCoords),
             });
         }
 

diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index 3ddd42f2b7d9c396ec9f6a72779d55307598382f..6814bbb3c76cf8f863238e3154fcccbe2039fc1f 100644 (file)
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -60,6 +60,9 @@ public abstract partial class SharedFultonSystem : EntitySystem
 
     private void OnFultonedGetVerbs(EntityUid uid, FultonedComponent component, GetVerbsEvent<InteractionVerb> args)
     {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
         args.Verbs.Add(new InteractionVerb()
         {
             Text = Loc.GetString("fulton-remove"),