juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crawling Fixes 2: Salvage Nerf (NPCs can shoot downed targets) (#39085)

Browse Source 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-07-20 14:23:25 -07:00
committed by GitHub
parent 8e5d70716d
commit 391dfe4f4a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
View File

@@ -205,7 +205,7 @@ public sealed partial class NPCCombatSystem
return;
}
_gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
_gun.AttemptShoot(uid, gunUid, gun, targetCordinates, comp.Target);
}
}
}

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

@@ -207,11 +207,12 @@ public abstract partial class SharedGunSystem : EntitySystem
/// <summary>
/// Attempts to shoot at the target coordinates. Resets the shot counter after every shot.
/// </summary>
public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates)
public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates, EntityUid? target = null)
{
gun.ShootCoordinates = toCoordinates;
AttemptShoot(user, gunUid, gun);
gun.ShotCounter = 0;
gun.Target = target;
DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
}