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

new-frontiers-14 · Apr 29, 2024 · 075435b · 075435b
2 parents 38f3a33 + 43fa11d
commit 075435b
Show file tree

Hide file tree

Showing 27 changed files with 7,028 additions and 5,914 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4323,3 +4323,35 @@ Entries:
       message: Shuttle console display UI now shows ship name and designation
   id: 4950
   time: '2024-04-27T19:07:30.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: 'Fixes the plasteel recipe to be lore accurate: Plasteel = Plasma + Steel'
+  id: 4951
+  time: '2024-04-27T23:46:34.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Updated conveyor belts sprites.
+  id: 4952
+  time: '2024-04-28T03:15:52.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Tweak
+      message: Rotated Bocakillo.
+  id: 4953
+  time: '2024-04-28T06:02:55.0000000+00:00'
+- author: ThatOneGoblin25
+  changes:
+    - type: Tweak
+      message: Updated and reworked the Spectre to current mapping guidelines.
+  id: 4954
+  time: '2024-04-29T03:06:00.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: >-
+        Added the new mail ship, the Mail Pod, available for the mail carrier in
+        the mail office.
+  id: 4955
+  time: '2024-04-29T03:07:21.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml