tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dead mobs can no longer shoot guns (#19020)

Browse Source 
* dead shooting hotfix

* dead shooting hotfix weh

* AttemptShoot check

* actionblocker check

---------

Co-authored-by: Errant <35878406+errant@users.noreply.github.com>
This commit is contained in:
Errant
2023-08-21 18:27:08 +00:00
committed by GitHub
parent 109222e5d5
commit cf68d38aaf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Content.Shared.ActionBlocker;
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.Administration.Logs; using Content.Shared.Administration.Logs;
using Content.Shared.Audio; using Content.Shared.Audio;
@@ -33,6 +34,7 @@ namespace Content.Shared.Weapons.Ranged.Systems;
public abstract partial class SharedGunSystem : EntitySystem public abstract partial class SharedGunSystem : EntitySystem
{ {
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
[Dependency] protected readonly IGameTiming Timing = default!; [Dependency] protected readonly IGameTiming Timing = default!;
[Dependency] protected readonly IMapManager MapManager = default!; [Dependency] protected readonly IMapManager MapManager = default!;
[Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly INetManager _netManager = default!;
@@ -208,7 +210,8 @@ public abstract partial class SharedGunSystem : EntitySystem
private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun) private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
{ {
if (gun.FireRate <= 0f) if (gun.FireRate <= 0f ||
!_actionBlockerSystem.CanUseHeldEntity(user))
return; return;
var toCoordinates = gun.ShootCoordinates; var toCoordinates = gun.ShootCoordinates;