Merge branch 'new-frontiers-14:master' into Sec-Energy-Shield

new-frontiers-14 · Jul 18, 2023 · 3279352 · 3279352
2 parents 0eb81de + 5669be9
commit 3279352
Show file tree

Hide file tree

Showing 46 changed files with 2,651 additions and 1,274 deletions.
diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -48,5 +48,8 @@ public sealed class ShuttleComponent : Component
         /// </summary>
         [DataField("linearDamping"), ViewVariables(VVAccess.ReadWrite)]
         public float LinearDamping = 0.05f;
+
+        [DataField("angularDamping"), ViewVariables(VVAccess.ReadWrite)]
+        public float AngularDamping = 0.05f;
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -305,7 +305,7 @@ private void UpdateHyperspace(float frameTime)
                         {
                             _physics.SetLinearDamping(body, shuttle.LinearDamping);
                         }
-                        _physics.SetAngularDamping(body, ShuttleAngularDamping);
+                        _physics.SetAngularDamping(body, shuttle.AngularDamping);
                     }
 
                     MapId mapId;

diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -44,8 +44,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
 
     public const float TileMassMultiplier = 0.5f;
 
-    public const float ShuttleAngularDamping = 0.05f;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -153,7 +151,7 @@ private void Enable(EntityUid uid, PhysicsComponent component, ShuttleComponent
         _physics.SetBodyStatus(component, BodyStatus.InAir);
         _physics.SetFixedRotation(uid, false, manager: manager, body: component);
         _physics.SetLinearDamping(component, shuttle.LinearDamping);
-        _physics.SetAngularDamping(component, ShuttleAngularDamping);
+        _physics.SetAngularDamping(component, shuttle.AngularDamping);
     }
 
     private void Disable(EntityUid uid, PhysicsComponent component)

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -210,7 +210,7 @@ public static readonly CVarDef<bool>
         /// If roles should be restricted based on time.
         /// </summary>
         public static readonly CVarDef<bool>
-            GameRoleTimers = CVarDef.Create("game.role_timers", false, CVar.SERVER | CVar.REPLICATED);
+            GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED);
 
         /// <summary>
         ///     Whether a random position offset will be applied to the station on roundstart.

diff --git a/Resources/Locale/en-US/_NF/reagents/foods.ftl b/Resources/Locale/en-US/_NF/reagents/foods.ftl
@@ -0,0 +1 @@
+reagent-name-flaverol = Flaverol
diff --git a/Resources/Maps/cargodepot.yml b/Resources/Maps/cargodepot.yml
@@ -52,6 +52,7 @@ entities:
     - type: OccluderTree
     - type: Shuttle
       linearDamping: 10000
+      angularDamping: 10000
     - nextUpdate: 9845.535748
       type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier

diff --git a/Resources/Maps/frontier.yml b/Resources/Maps/frontier.yml
@@ -152,6 +152,7 @@ entities:
       type: Fixtures
     - type: OccluderTree
     - linearDamping: 10000
+      angularDamping: 10000
       type: Shuttle
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier