Merge remote-tracking branch 'refs/remotes/wizards/master'

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml

Content.Client/Lobby/LobbyState.cs

@@ -176,7 +176,7 @@ public override void FrameUpdate(FrameEventArgs e)
                 return;
             }
 
-            Lobby!.StationTime.Text =  Loc.GetString("lobby-state-player-status-round-not-started");
+            Lobby!.StationTime.Text = Loc.GetString("lobby-state-player-status-round-not-started");
             string text;
 
             if (_gameTicker.Paused)
@@ -196,6 +196,10 @@ public override void FrameUpdate(FrameEventArgs e)
                 {
                     text = Loc.GetString(seconds < -5 ? "lobby-state-right-now-question" : "lobby-state-right-now-confirmation");
                 }
+                else if (difference.TotalHours >= 1)
+                {
+                    text = $"{Math.Floor(difference.TotalHours)}:{difference.Minutes:D2}:{difference.Seconds:D2}";
+                }
                 else
                 {
                     text = $"{difference.Minutes}:{difference.Seconds:D2}";

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -64,6 +64,8 @@ public sealed class PostMapInitTest
             "Reach",
             "Train",
             "Oasis",
+            "Cog",
+            "Amber"
             "Cog",
 			"SunriseBox",
 			"SunriseDelta",

Resources/Changelog/Changelog.yml

@@ -1,25 +1,4 @@
 Entries:
-- author: Cojoke-dot
-  changes:
-  - message: Devouring bodies now reduces bleed for Space Dragons.
-    type: Tweak
-  id: 7172
-  time: '2024-08-20T10:57:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29661
-- author: cranberriez
-  changes:
-  - message: Added Discord webhook error logging!
-    type: Tweak
-  id: 7173
-  time: '2024-08-20T21:12:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30835
-- author: Repo
-  changes:
-  - message: Added copy to clipboard button for connection failure UI.
-    type: Add
-  id: 7174
-  time: '2024-08-20T21:31:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30760
 - author: Lank
   changes:
   - message: Removed the shock collar and associated thief objective.
@@ -3910,3 +3889,24 @@
   id: 7671
   time: '2024-12-01T22:09:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33602
+- author: JIPDawg
+  changes:
+  - message: Some Antag ghost roles now show their correct rules.
+    type: Fix
+  id: 7672
+  time: '2024-12-02T19:43:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/32457
+- author: Southbridge, Flipsie27
+  changes:
+  - message: 'Added a new low-mid pop map: Amber Station'
+    type: Add
+  id: 7673
+  time: '2024-12-03T02:24:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33441
+- author: CheddaCheez
+  changes:
+  - message: Added recipes for Nachos, Cheesy Nachos, and Cuban Nachos.
+    type: Add
+  id: 7674
+  time: '2024-12-03T02:59:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33637

Resources/Locale/en-US/_strings/ghost/roles/ghost-role-component.ftl

@@ -186,7 +186,7 @@ ghost-role-information-nukeop-rules = You are a [color=red][bold]Team Antagonist
 
 ghost-role-information-loneop-name = Lone Operative
 ghost-role-information-loneop-description = You are a lone nuclear operative. Destroy the station!
-ghost-role-information-loneop-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other nuclear operatives. Covert syndicate agents are not guaranteed to help you.
+ghost-role-information-loneop-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color]. Covert syndicate agents are not guaranteed to help you.
 
 ghost-role-information-behonker-name = Behonker
 ghost-role-information-behonker-description = You are an antagonist, bring death and honks to those who do not follow the honkmother.
@@ -234,11 +234,9 @@ ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]T
 
 ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent
 ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them.
-ghost-role-information-syndicate-monkey-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
 
 ghost-role-information-syndicate-kobold-reinforcement-name = Syndicate Kobold Agent
 ghost-role-information-syndicate-kobold-reinforcement-description = Someone needs reinforcements. You, a trained kobold, will help them.
-ghost-role-information-syndicate-kobold-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the agent who summoned you.
 
 ghost-role-information-syndicate-cyborg-assault-name = Syndicate Assault Cyborg
 ghost-role-information-syndicate-cyborg-saboteur-name = Syndicate Saboteur Cyborg
@@ -256,7 +254,7 @@ ghost-role-information-medical-description = You are a medical professional, but
 ghost-role-information-cargo-name = Cargo
 ghost-role-information-cargo-description = You are part of a logistics mission, but seem to have found yourself in a strange situation...
 
-ghost-role-information-engineering-name = Engineering 
+ghost-role-information-engineering-name = Engineering
 ghost-role-information-engineering-description = You are on an engineering job, but seem to have found yourself in a strange situation...
 
 ghost-role-information-science-name = Science