diff --git a/Content.Shared/CCVar/CCVars.Movement.cs b/Content.Shared/CCVar/CCVars.Movement.cs index 39b9836c40..37e355b032 100644 --- a/Content.Shared/CCVar/CCVars.Movement.cs +++ b/Content.Shared/CCVar/CCVars.Movement.cs @@ -25,14 +25,14 @@ public sealed partial class CCVars /// [CVarControl(AdminFlags.VarEdit)] public static readonly CVarDef MovementPushingVelocityProduct = - CVarDef.Create("movement.pushing_velocity_product", -1f, CVar.SERVER | CVar.REPLICATED); + CVarDef.Create("movement.pushing_velocity_product", -9999f, CVar.SERVER | CVar.REPLICATED); /// /// Cap for how much an entity can be pushed per second. /// [CVarControl(AdminFlags.VarEdit)] public static readonly CVarDef MovementPushingCap = - CVarDef.Create("movement.pushing_cap", 100f, CVar.SERVER | CVar.REPLICATED); + CVarDef.Create("movement.pushing_cap", 25f, CVar.SERVER | CVar.REPLICATED); /// /// Minimum pushing impulse per tick. If the value is below this it rounds to 0. @@ -40,7 +40,7 @@ public sealed partial class CCVars /// [CVarControl(AdminFlags.VarEdit)] public static readonly CVarDef MovementMinimumPush = - CVarDef.Create("movement.minimum_push", 0.1f, CVar.SERVER | CVar.REPLICATED); + CVarDef.Create("movement.minimum_push", 0f, CVar.SERVER | CVar.REPLICATED); // Really this just exists because hot reloading is cooked on rider. /// @@ -48,7 +48,7 @@ public sealed partial class CCVars /// [CVarControl(AdminFlags.VarEdit)] public static readonly CVarDef MovementPenetrationCap = - CVarDef.Create("movement.penetration_cap", 0.3f, CVar.SERVER | CVar.REPLICATED); + CVarDef.Create("movement.penetration_cap", 0.5f, CVar.SERVER | CVar.REPLICATED); /// /// Based on the mass difference multiplies the push amount by this proportionally. diff --git a/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs b/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs index bcc1fd6d04..fab9552271 100644 --- a/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs +++ b/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs @@ -284,6 +284,7 @@ public abstract class SharedMobCollisionSystem : EntitySystem mobMovement *= modifier; var speedReduction = 1f - entity.Comp1.MinimumSpeedModifier; + speedReduction /= _penCap / penDepth; var speedModifier = Math.Clamp( 1f - speedReduction * modifier, entity.Comp1.MinimumSpeedModifier, 1f);