From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Thu, 11 Sep 2025 10:00:55 +0000 (+0200) Subject: fix chasmsystem resolve error (#40281) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8171589f56492fbc1537332750a86af52930ede8;p=space-station-14.git fix chasmsystem resolve error (#40281) --- diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs index af4a376bd0..1a0a31d4b1 100644 --- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs @@ -118,7 +118,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem private void OnGunActivate(EntityUid uid, GrapplingGunComponent component, ActivateInWorldEvent args) { - if (!Timing.IsFirstTimePredicted || args.Handled || !args.Complex || component.Projectile is not {} projectile) + if (!Timing.IsFirstTimePredicted || args.Handled || !args.Complex || component.Projectile is not { } projectile) return; _audio.PlayPredicted(component.CycleSound, uid, args.User); @@ -129,7 +129,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem component.Projectile = null; SetReeling(uid, component, false, args.User); - _gun.ChangeBasicEntityAmmoCount(uid, 1); + _gun.ChangeBasicEntityAmmoCount(uid, 1); args.Handled = true; } @@ -211,7 +211,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem /// True if hooked, false otherwise. public bool IsEntityHooked(Entity entity) { - if (!Resolve(entity, ref entity.Comp)) + if (!Resolve(entity, ref entity.Comp, false)) return false; foreach (var uid in entity.Comp.Relayed)