Merge branch 'master' into propros

DeltaV-Station · Sep 28, 2024 · 20d502d · 20d502d
2 parents 553a60a + daa0737
commit 20d502d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml
@@ -530,8 +530,8 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
-      angularDamping: 10000
-      linearDamping: 10000
+      angularDamping: 0.05
+      linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
     - type: Fixtures
@@ -11356,9 +11356,6 @@ entities:
           - 0
         chunkSize: 4
     - type: OccluderTree
-    - type: Shuttle
-      angularDamping: 10000
-      linearDamping: 10000
     - type: GridPathfinding
     - type: RadiationGridResistance
     - type: BecomesStation

diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml
@@ -712,16 +712,13 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
-      angularDamping: 10000
-      linearDamping: 10000
+      angularDamping: 0.05
+      linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
     - type: Fixtures
       fixtures: {}
     - type: OccluderTree
-    - type: Shuttle
-      angularDamping: 10000
-      linearDamping: 10000
     - type: GridPathfinding
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier

diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml
@@ -516,16 +516,13 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
-      angularDamping: 10000
-      linearDamping: 10000
+      angularDamping: 0.05
+      linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
     - type: Fixtures
       fixtures: {}
     - type: OccluderTree
-    - type: Shuttle
-      angularDamping: 10000
-      linearDamping: 10000
     - type: GridPathfinding
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier

diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml
@@ -601,8 +601,8 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
-      angularDamping: 10000
-      linearDamping: 10000
+      angularDamping: 0.05
+      linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
     - type: Fixtures
@@ -12847,9 +12847,6 @@ entities:
     - type: BecomesStation
       id: Tortuga
     - type: OccluderTree
-    - type: Shuttle
-      angularDamping: 10000
-      linearDamping: 10000
     - type: GridPathfinding
     - type: RadiationGridResistance
     - type: GasTileOverlay