diff --git a/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs b/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs index 7b02f290f99..983fb987d63 100644 --- a/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs +++ b/Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs @@ -1,26 +1,25 @@ -//using Robust.Shared.Physics; -//using Robust.Shared.Physics.Components; -//using Robust.Shared.Physics.Systems; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Components; +using Robust.Shared.Physics.Systems; -//namespace Content.Shared.SimpleStation14.Physics; +namespace Content.Shared.SimpleStation14.Physics; -//public sealed class FrictionRemoverSystem : EntitySystem -//{ -// [Dependency] private readonly SharedPhysicsSystem _physics = default!; +public sealed class FrictionRemoverSystem : EntitySystem +{ + [Dependency] private readonly SharedPhysicsSystem _physics = default!; -// public override void Initialize() -// { -// base.Initialize(); + public override void Initialize() + { + base.Initialize(); -// SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening); -// } + SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening); + } -// private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args) -// { -// _physics.SetAngularDamping(component, 0, false); -// _physics.SetLinearDamping(component, 0); -// } -//} -// Пока не придумаем как закрепить станцию - не работает. + private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args) + { + _physics.SetAngularDamping(component, 0, false); + _physics.SetLinearDamping(component, 0); + } +} diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index e85199dcc49..425fbd7510c 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component // Weightless public const float DefaultMinimumFrictionSpeed = 0.005f; public const float DefaultWeightlessFriction = 1f; - public const float DefaultWeightlessFrictionNoInput = 0.2f; + public const float DefaultWeightlessFrictionNoInput = 0f; // Frontier public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; diff --git a/Resources/Maps/_NF/POI/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml index bdfb9c67dd7..f021dfb2d94 100644 --- a/Resources/Maps/_NF/POI/anomalouslab.yml +++ b/Resources/Maps/_NF/POI/anomalouslab.yml @@ -81,7 +81,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml index dd766269233..bd0a2f5b9c4 100644 --- a/Resources/Maps/_NF/POI/arena.yml +++ b/Resources/Maps/_NF/POI/arena.yml @@ -125,7 +125,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/beacon.yml b/Resources/Maps/_NF/POI/beacon.yml index e0de1831924..4a57f8d86ac 100644 --- a/Resources/Maps/_NF/POI/beacon.yml +++ b/Resources/Maps/_NF/POI/beacon.yml @@ -74,7 +74,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/cargodepot.yml b/Resources/Maps/_NF/POI/cargodepot.yml index 60f55812f82..e172aa4b31f 100644 --- a/Resources/Maps/_NF/POI/cargodepot.yml +++ b/Resources/Maps/_NF/POI/cargodepot.yml @@ -49,7 +49,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/caseyscasino.yml b/Resources/Maps/_NF/POI/caseyscasino.yml index 74cdb76fd7e..bb12cbacdd0 100644 --- a/Resources/Maps/_NF/POI/caseyscasino.yml +++ b/Resources/Maps/_NF/POI/caseyscasino.yml @@ -46,7 +46,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/courthouse.yml b/Resources/Maps/_NF/POI/courthouse.yml index a6306ec8e35..81ad3900f80 100644 --- a/Resources/Maps/_NF/POI/courthouse.yml +++ b/Resources/Maps/_NF/POI/courthouse.yml @@ -76,7 +76,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index 00654063fa1..ab5b49d6201 100644 --- a/Resources/Maps/_NF/POI/cove.yml +++ b/Resources/Maps/_NF/POI/cove.yml @@ -88,7 +88,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml index 30fa6025378..012b9b6e35b 100644 --- a/Resources/Maps/_NF/POI/grifty.yml +++ b/Resources/Maps/_NF/POI/grifty.yml @@ -40,7 +40,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index b7d23484907..fdaf55ea2ba 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -93,7 +93,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/lpbravo.yml b/Resources/Maps/_NF/POI/lpbravo.yml index f8923bf3237..1165b397d55 100644 --- a/Resources/Maps/_NF/POI/lpbravo.yml +++ b/Resources/Maps/_NF/POI/lpbravo.yml @@ -47,7 +47,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml index 3974f8072b0..1dd5c1220bc 100644 --- a/Resources/Maps/_NF/POI/nfsd.yml +++ b/Resources/Maps/_NF/POI/nfsd.yml @@ -90,7 +90,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/tinnia.yml b/Resources/Maps/_NF/POI/tinnia.yml index 92151d416a5..5b24b3d4912 100644 --- a/Resources/Maps/_NF/POI/tinnia.yml +++ b/Resources/Maps/_NF/POI/tinnia.yml @@ -69,7 +69,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 999999 linearDamping: 999999 fixedRotation: False diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index 730b908429a..d525031cadc 100644 --- a/Resources/Maps/_NF/POI/trade.yml +++ b/Resources/Maps/_NF/POI/trade.yml @@ -163,7 +163,7 @@ entities: version: 6 - type: Broadphase - type: Physics - bodyStatus: InAir + bodyStatus: OnGround angularDamping: 0.05 linearDamping: 0.05 fixedRotation: False