Xeno spitter fixes (#18573)

* Xeno spitter fixes

- Require hands for pickup compounds
- Ranged combat can force movement to ignore LOS checks if ranged wants better LOS.

* Also spirates

IDK how this worked before but TryGetGun shouldn't care about combatmode.

* 1 more
This commit is contained in:
metalgearsloth
2023-08-03 07:34:54 +10:00
committed by GitHub
parent 8d5a354592
commit 868f3298e5
7 changed files with 31 additions and 7 deletions

View File

@@ -126,8 +126,11 @@ public abstract partial class SharedGunSystem : EntitySystem
var user = args.SenderSession.AttachedEntity;
if (user == null ||
!_combatMode.IsInCombatMode(user) ||
!TryGetGun(user.Value, out var ent, out var gun))
{
return;
}
if (ent != msg.Gun)
return;
@@ -165,9 +168,6 @@ public abstract partial class SharedGunSystem : EntitySystem
gunEntity = default;
gunComp = null;
if (!_combatMode.IsInCombatMode(entity))
return false;
if (EntityManager.TryGetComponent(entity, out HandsComponent? hands) &&
hands.ActiveHandEntity is { } held &&
TryComp(held, out GunComponent? gun))