diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index 0f7535d5699..10e31d81c53 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -1,8 +1,8 @@ using Content.Server.Administration.Logs; using Content.Server.Effects; using Content.Server.Weapons.Ranged.Systems; +using Content.Shared._CorvaxNext.Penetration; using Content.Shared.Camera; -using Content.Shared.Corvax.Penetration; using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.Projectiles; @@ -73,6 +73,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St _sharedCameraRecoil.KickCamera(target, direction); } + // Corvax-Next-Penetration if (component.PenetrationScore > 0 && _penetratableQuery.TryGetComponent(target, out var penetratable) && _random.Next(component.PenetrationScore + penetratable.StoppingPower) >= penetratable.StoppingPower) diff --git a/Content.Shared/Projectiles/ProjectileComponent.cs b/Content.Shared/Projectiles/ProjectileComponent.cs index 8cbe54fce3e..d2fdc3ece2b 100644 --- a/Content.Shared/Projectiles/ProjectileComponent.cs +++ b/Content.Shared/Projectiles/ProjectileComponent.cs @@ -74,6 +74,7 @@ public sealed partial class ProjectileComponent : Component [DataField] public bool DamagedEntity; + // Corvax-Next-Penetration [DataField] public int PenetrationScore; } diff --git a/Content.Shared/Corvax/Penetration/PenetratableComponent.cs b/Content.Shared/_CorvaxNext/Penetration/PenetratableComponent.cs similarity index 64% rename from Content.Shared/Corvax/Penetration/PenetratableComponent.cs rename to Content.Shared/_CorvaxNext/Penetration/PenetratableComponent.cs index 72d275050a7..607a57b7553 100644 --- a/Content.Shared/Corvax/Penetration/PenetratableComponent.cs +++ b/Content.Shared/_CorvaxNext/Penetration/PenetratableComponent.cs @@ -1,10 +1,10 @@ using Robust.Shared.GameStates; -namespace Content.Shared.Corvax.Penetration; +namespace Content.Shared._CorvaxNext.Penetration; [RegisterComponent, NetworkedComponent] public sealed partial class PenetratableComponent : Component { - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField] public int StoppingPower; }