Merge remote-tracking branch 'upstream/master' into nfsd-station

new-frontiers-14 · Jan 22, 2024 · 5431dc1 · 5431dc1
2 parents 6530f18 + 1906d07
commit 5431dc1
Show file tree

Hide file tree

Showing 26 changed files with 2,524 additions and 987 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -2870,3 +2870,17 @@ Entries:
       message: Altered the SLI ships to bring them into line with mapping standards
   id: 4753
   time: '2024-01-18T23:24:51.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: >-
+        Added the McDelivery to the McCargo on ship shipyard, now you can do
+        your fast food delivery with your very own fast food delivery ship.
+  id: 4754
+  time: '2024-01-21T18:52:29.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Added plasteel arming sword!
+  id: 4755
+  time: '2024-01-22T12:14:42.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml