From ac66224a3a6c16ebe4375fc21916c90971ea64fb Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 13 Sep 2023 18:01:22 +1000
Subject: [PATCH] Fulton fixes (#20102)

---
 Content.Server/Salvage/FultonSystem.cs              | 2 +-
 Content.Shared/Salvage/Fulton/SharedFultonSystem.cs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Salvage/FultonSystem.cs b/Content.Server/Salvage/FultonSystem.cs
index 23145cc1a8..60e1d3b472 100644
--- 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 3ddd42f2b7..6814bbb3c7 100644
--- 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"),