Merge branch 'new-frontiers-14:master' into master

new-frontiers-14 · Mar 2, 2024 · dcf431d · dcf431d
2 parents 3fa5d80 + 1725dd1
commit dcf431d
Show file tree

Hide file tree

Showing 4 changed files with 402 additions and 263 deletions.
diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
@@ -12,6 +12,7 @@ namespace Content.Server.Info;
 [AdminCommand(AdminFlags.Admin)]
 public sealed class ShowRulesCommand : IConsoleCommand
 {
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
     public string Command => "showrules";
     public string Description => "Opens the rules popup for the specified player.";
     public string Help => "showrules <username> [seconds]";
@@ -63,4 +64,28 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         var player = IoCManager.Resolve<IPlayerManager>().GetSessionByUserId(located.UserId);
         netManager.ServerSendMessage(message, player.ConnectedClient);
     }
+
+    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("<username>"));
+        }
+
+        if (args.Length == 2)
+        {
+            var durations = new CompletionOption[]
+            {
+                new("300", Loc.GetString("5 minutes")),
+                new("600", Loc.GetString("10 minutes")),
+                new("1200", Loc.GetString("20 minutes")),
+            };
+
+            return CompletionResult.FromHintOptions(durations, Loc.GetString("[seconds]"));
+        }
+
+        return CompletionResult.Empty;
+    }
 }
diff --git a/Resources/Maps/_NF/Shuttles/placebo.yml b/Resources/Maps/_NF/Shuttles/placebo.yml
@@ -207,7 +207,7 @@ entities:
       pos: -1.5,6.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -696.4527
+      secondsUntilStateChange: -938.6825
       state: Opening
 - proto: AirlockEngineering
   entities:
@@ -226,7 +226,7 @@ entities:
       pos: -0.5,1.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1006.3181
+      secondsUntilStateChange: -1248.5479
       state: Opening
   - uid: 12
     components:
@@ -466,6 +466,33 @@ entities:
     - type: Transform
       pos: 3.5,2.5
       parent: 1
+- proto: CableHV
+  entities:
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
 - proto: CableMV
   entities:
   - uid: 198
@@ -518,6 +545,14 @@ entities:
     - type: Transform
       pos: -3.5,5.5
       parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
 - proto: CarpetBlack
   entities:
   - uid: 17
@@ -740,6 +775,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,4.5
       parent: 1
+    - type: Door
+      secondsUntilStateChange: -234.06322
+      state: Closing
     - type: DeviceNetwork
       deviceLists:
       - 234
@@ -1778,8 +1816,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,6.5
       parent: 1
-    - type: Thruster
-      enabled: True
   - uid: 134
     components:
     - type: Transform