From 91eacde9ba01c1ad4a7308119aad1b39baf39172 Mon Sep 17 00:00:00 2001 From: TrylobyteWasTaken Date: Fri, 13 Mar 2026 22:57:49 -0400 Subject: [PATCH] Gun Fix :cl: - tweak: Shuttle speed is now capped at 50m/s instead of 75, owing to Hardlight having a smaller 'play area' than Frontier or Monolith. - fix: Weapons fired while moving will now obey physics. - fix: Mining Pulser projectile speed has been increased so you can't shoot yourself with them. --- Content.Server/Shuttles/Components/ShuttleComponent.cs | 2 +- Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs | 2 +- .../Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs index 36a0b5f13b0..bd7335c5317 100644 --- a/Content.Server/Shuttles/Components/ShuttleComponent.cs +++ b/Content.Server/Shuttles/Components/ShuttleComponent.cs @@ -20,7 +20,7 @@ public sealed partial class ShuttleComponent : Component /// Maximum velocity assuming TWR is BaseMaxVelocityTWR. /// [ViewVariables(VVAccess.ReadWrite)] - public float BaseMaxLinearVelocity = 75f; // Mono + public float BaseMaxLinearVelocity = 50f; // Mono public const float MaxAngularVelocity = 4f; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 17e9ed82bd5..cbb2d88549f 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -545,7 +545,7 @@ public virtual void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gu var physics = _physQuery.CompOrNull(uid) ?? EnsureComp(uid); Physics.SetBodyStatus(uid, physics, BodyStatus.InAir); - var targetVelocity = gunVelocity + direction.Normalized() * speed; + var targetVelocity = -gunVelocity + direction.Normalized() * speed; Physics.SetLinearVelocity(uid, targetVelocity, body: physics); // Mono if (offset != 0f) diff --git a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml index adb7d60ec4d..c5c6dea8d0a 100644 --- a/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml +++ b/Resources/Prototypes/_Mono/Entities/SpaceArtillery/SpaceArtillery/Energy/launcher.yml @@ -331,7 +331,7 @@ - type: FireControlRotate - type: Gun fireRate: 4.0 - projectileSpeed: 40 + projectileSpeed: 55 minAngle: 0 maxAngle: 5 soundGunshot: