Merge branch 'master' into Dispatch-POI-holopad-update

new-frontiers-14 · Feb 2, 2025 · bf5ba18 · bf5ba18
2 parents 92704cc + b83b8b4
commit bf5ba18
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -72,7 +72,7 @@
 - all:
   - changed-files:
     - any-glob-to-any-file: "**/*.yml"
-    - all-globs-to-all-files:
+    - all-globs-to-any-file:
       - "!Resources/Maps/_NF/**/*.yml"
       - "!Resources/Prototypes/Maps/_NF/**/*.yml"
 

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -6826,3 +6826,9 @@ Entries:
       message: Changed cotton bread recipes to use the oven.
   id: 5717
   time: '2025-02-02T21:57:16.0000000+00:00'
+- author: the-hivequeen
+  changes:
+    - type: Add
+      message: Added BRB sign to the service techfab.
+  id: 5718
+  time: '2025-02-02T22:14:56.0000000+00:00'
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -159,6 +159,7 @@
       - FireExtinguisher
       - WetFloorSign
       - DeskBell
+      - BrbSign
     dynamicRecipes:
     # Shared lathe recipes
     ## Advanced tools

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -114,3 +114,10 @@
   completetime: 2
   materials:
     Steel: 200
+
+- type: latheRecipe
+  id: BrbSign
+  result: BrbSign
+  parent: BaseServiceItemsRecipe
+  materials:
+    Cardboard: 200