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:
@@ -2,6 +2,7 @@ using System.Numerics;
|
||||
using Content.Client.Items;
|
||||
using Content.Client.Weapons.Ranged.Components;
|
||||
using Content.Shared.Camera;
|
||||
using Content.Shared.CombatMode;
|
||||
using Content.Shared.Spawners.Components;
|
||||
using Content.Shared.Weapons.Ranged;
|
||||
using Content.Shared.Weapons.Ranged.Components;
|
||||
@@ -126,7 +127,7 @@ public sealed partial class GunSystem : SharedGunSystem
|
||||
|
||||
var entityNull = _player.LocalPlayer?.ControlledEntity;
|
||||
|
||||
if (entityNull == null)
|
||||
if (entityNull == null || !TryComp<CombatModeComponent>(entityNull, out var combat) || !combat.IsInCombatMode)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user