Merge remote-tracking branch 'upstream/master' into pr/671

new-frontiers-14 · Mar 18, 2024 · 6fc0831 · 6fc0831
2 parents 2282345 + 714d1c1
commit 6fc0831
Show file tree

Hide file tree

Showing 19 changed files with 11,759 additions and 2,308 deletions.
diff --git a/Content.Server/Construction/NodeEntities/BoardNodeEntity.cs b/Content.Server/Construction/NodeEntities/BoardNodeEntity.cs
@@ -31,7 +31,7 @@ public sealed partial class BoardNodeEntity : IGraphNodeEntity
 
         // Frontier - adds tabletop variants
         if (args.EntityManager.TryGetComponent(container.Owner, out ConstructionComponent? constructionComponent)
-            && constructionComponent.Graph == "GraphComputerTabletop"
+            && constructionComponent.Graph == "ComputerTabletop"
             && args.EntityManager.TryGetComponent(board, out ComputerTabletopBoardComponent? tabletopComputer))
         {
             return tabletopComputer.Prototype;

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3673,3 +3673,29 @@ Entries:
         degrading with excessive excavation.
   id: 4866
   time: '2024-03-11T23:31:50.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: Server Rules have been updated in relation to the station safezone.
+  id: 4867
+  time: '2024-03-14T22:47:33.0000000+00:00'
+- author: cite2000
+  changes:
+    - type: Add
+      message: NFSD medical ship "Whiskey"
+  id: 4868
+  time: '2024-03-16T21:53:36.0000000+00:00'
+- author: Cu1r
+  changes:
+    - type: Add
+      message: Added the UAC Canister to the scrapyard for purchase.
+  id: 4869
+  time: '2024-03-17T08:29:25.0000000+00:00'
+- author: Letholldus
+  changes:
+    - type: Fix
+      message: >-
+        Adjusts the price of the NC Hauler from 49,500 to 60,000 to cost what it
+        should.
+  id: 4870
+  time: '2024-03-17T10:21:37.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/Security/whiskey.yml b/Resources/Maps/_NF/Shuttles/Security/whiskey.yml