Merge branch 'master' into NT-Meteor

new-frontiers-14 · Oct 22, 2024 · c28966f · c28966f
2 parents 775e398 + 33258e8
commit c28966f
Show file tree

Hide file tree

Showing 41 changed files with 1,204 additions and 765 deletions.
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
@@ -249,9 +249,21 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
 
                 if (showReason && !haveMinOverallTime && !bypassAllowed)
                 {
+                    // Frontier: panic bunker message, print minutes/hours depending on how much time left.
+                    double minutesNeeded = minOverallMinutes - (overallTime?.TimeSpent.TotalMinutes ?? 0.0);
+                    string reason;
+                    if (minutesNeeded > 60)
+                    {
+                        reason = Loc.GetString("panic-bunker-account-reason-nf-overall-hours", ("hours", $"{minOverallMinutes / 60.0:F1}"), ("timeLeft", $"{minutesNeeded / 60.0:F1}"));
+                    }
+                    else
+                    {
+                        reason = Loc.GetString("panic-bunker-account-reason-nf-overall-minutes", ("hours", $"{minOverallMinutes / 60.0:F1}"), ("timeLeft", $"{minutesNeeded:F0}"));
+                    }
                     return (ConnectionDenyReason.Panic,
-                        Loc.GetString("panic-bunker-account-denied-reason",
-                            ("reason", Loc.GetString("panic-bunker-account-reason-overall", ("minutes", minOverallMinutes)))), null);
+                        Loc.GetString("panic-bunker-account-denied-reason-nf",
+                            ("reason", reason)), null);
+                    // End Frontier
                 }
 
                 if (!validAccountAge || !haveMinOverallTime && !bypassAllowed)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4819,3 +4819,15 @@ Entries:
         already present on the device.
   id: 5438
   time: '2024-10-20T19:33:09.0000000+00:00'
+- author: MisterMecky
+  changes:
+    - type: Fix
+      message: Duffelbags once again slow their wearer's sprint speed by 10%.
+  id: 5439
+  time: '2024-10-21T21:44:53.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Fix
+      message: 'Fixed Hunter power issues. Brought up to spec. '
+  id: 5440
+  time: '2024-10-22T05:03:37.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/connection-messages.ftl b/Resources/Locale/en-US/_NF/connection-messages.ftl
@@ -0,0 +1,10 @@
+panic-bunker-account-denied-reason-nf =
+    This server is in panic bunker mode, often enabled as a precaution against raids.
+    New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later.
+    Reason: "{$reason}"
+panic-bunker-account-reason-nf-overall-hours =
+    Your overall playtime on the server must be greater than {$hours} hours.
+    You need {$timeLeft} more hours to meet this requirement.
+panic-bunker-account-reason-nf-overall-minutes =
+    Your overall playtime on the server must be greater than {$hours} hours.
+    You need {$timeLeft} more minutes to meet this requirement.
diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -38,6 +38,7 @@ guide-entry-shipyard-ceres = Ceres
 guide-entry-shipyard-chisel = Chisel
 guide-entry-shipyard-comet = Comet
 guide-entry-shipyard-construct = Construct
+guide-entry-shipyard-eagle = Eagle
 guide-entry-shipyard-garden = Garden
 guide-entry-shipyard-gasbender = Gasbender
 guide-entry-shipyard-gourd = Gourd
@@ -56,6 +57,7 @@ guide-entry-shipyard-mccargo = McCargo
 guide-entry-shipyard-mcdelivery = McDelivery
 guide-entry-shipyard-meteor = Meteor
 guide-entry-shipyard-pathfinder = Pathfinder
+guide-entry-shipyard-phoenix = Phoenix
 guide-entry-shipyard-pioneer = Pioneer
 guide-entry-shipyard-placebo = Placebo
 guide-entry-shipyard-prospector = Prospector

diff --git a/Resources/Locale/en-US/_NF/lathe/recipes.ftl b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
@@ -21,4 +21,7 @@ lathe-recipe-NFFoodBoxPizza-name  = pizza box (empty)
 lathe-recipe-NFFoodBoxDonutEmpty-name  = donut box (empty)
 lathe-recipe-NFFoodBoxNuggetEmpty-name = chicken nuggets (empty)
 lathe-recipe-NFFoodContainerEggEmpty-name  = egg carton (empty)
-lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
+lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
+
+# Plastic
+lathe-recipe-NFFoodBoxSushi-name = sushi tray (empty)