Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs
+++ b/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs
@@ -90,7 +90,7 @@ public sealed partial class GunSystem

    private void OnSpeedLoaderAfterInteract(EntityUid uid, SpeedLoaderComponent component, AfterInteractEvent args)
    {
-        if (args.Handled) return;
+        if (args.Handled || !args.CanReach) return;

        if (args.Target == null)
        {