Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Revert "Фиксы полетов аванпоста" #305

Merged
merged 1 commit into from
Jun 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions Content.Shared/Corvax/Physics/FrictionRemoverSystem.cs
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
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);
// }
//}
// Пока не придумаем как закрепить станцию - не работает.
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 0f; // Frontier
public const float DefaultWeightlessFrictionNoInput = 0.2f;
public const float DefaultWeightlessModifier = 0.7f;
public const float DefaultWeightlessAcceleration = 1f;

Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/anomalouslab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/arena.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/beacon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/cargodepot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/caseyscasino.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/courthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/cove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/grifty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/lodge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/lpbravo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/nfsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/tinnia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 999999
linearDamping: 999999
fixedRotation: False
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_NF/POI/trade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ entities:
version: 6
- type: Broadphase
- type: Physics
bodyStatus: OnGround
bodyStatus: InAir
angularDamping: 0.05
linearDamping: 0.05
fixedRotation: False
Expand Down
Loading