Bows & arrows (#19771)

2023-09-22 02:45:21 -07:00
parent 1ba1ab6d61
commit f8d194b117
51 changed files with 507 additions and 22 deletions
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -106,7 +106,8 @@ public sealed class ThrowingSystem : EntitySystem
            return;
        }

-        if (projectileQuery.HasComponent(uid))
+        // Allow throwing if this projectile only acts as a projectile when shot, otherwise disallow
+        if (projectileQuery.TryGetComponent(uid, out var proj) && !proj.OnlyCollideWhenShot)
            return;

        var comp = EnsureComp<ThrownItemComponent>(uid);